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/bounce | |
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/bounce/bounce.pro | 4 | ||||
-rw-r--r-- | noncore/games/bounce/kbounce.cpp | 3 | ||||
-rw-r--r-- | noncore/games/bounce/kbounce.h | 3 | ||||
-rw-r--r-- | noncore/games/bounce/main.cpp | 9 | ||||
-rw-r--r-- | noncore/games/bounce/opie-bounce.control | 2 |
5 files changed, 8 insertions, 13 deletions
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro index 338daf6..75e4a6b 100644 --- a/noncore/games/bounce/bounce.pro +++ b/noncore/games/bounce/bounce.pro | |||
@@ -1,12 +1,10 @@ | |||
1 | TEMPLATE= app | ||
2 | #CONFIG = qt warn_on debug | 1 | #CONFIG = qt warn_on debug |
3 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release quick-app |
4 | HEADERS = game.h kbounce.h | 3 | HEADERS = game.h kbounce.h |
5 | SOURCES = game.cpp kbounce.cpp main.cpp | 4 | SOURCES = game.cpp kbounce.cpp main.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include | 5 | INCLUDEPATH+= $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe | 7 | LIBS += -lqpe |
9 | DESTDIR = $(OPIEDIR)/bin | ||
10 | TARGET = bounce | 8 | TARGET = bounce |
11 | 9 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/bounce/kbounce.cpp b/noncore/games/bounce/kbounce.cpp index 50f4ef6..211f0ff 100644 --- a/noncore/games/bounce/kbounce.cpp +++ b/noncore/games/bounce/kbounce.cpp | |||
@@ -18,25 +18,26 @@ | |||
18 | 18 | ||
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qtimer.h> | 20 | #include <qtimer.h> |
21 | #include <qlcdnumber.h> | 21 | #include <qlcdnumber.h> |
22 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
23 | #include <qmainwindow.h> | 23 | #include <qmainwindow.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | 25 | ||
26 | #include "kbounce.h" | 26 | #include "kbounce.h" |
27 | #include "game.h" | 27 | #include "game.h" |
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | 29 | ||
30 | KJezzball::KJezzball() : QMainWindow(0), m_gameWidget( 0 ) | 30 | KJezzball::KJezzball(QWidget *p, const char* n, WFlags f) |
31 | : QMainWindow(p,n,f), m_gameWidget( 0 ) | ||
31 | { | 32 | { |
32 | setCaption(tr("Bounce")); | 33 | setCaption(tr("Bounce")); |
33 | // setup variables | 34 | // setup variables |
34 | m_game.level = 1; | 35 | m_game.level = 1; |
35 | m_game.score = 0; | 36 | m_game.score = 0; |
36 | m_state = Idle; | 37 | m_state = Idle; |
37 | 38 | ||
38 | 39 | ||
39 | menu = menuBar(); | 40 | menu = menuBar(); |
40 | game = new QPopupMenu; | 41 | game = new QPopupMenu; |
41 | game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N ); | 42 | game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N ); |
42 | game->insertItem(tr("&Pause game"), this, SLOT(pauseGame()), Key_P ); | 43 | game->insertItem(tr("&Pause game"), this, SLOT(pauseGame()), Key_P ); |
diff --git a/noncore/games/bounce/kbounce.h b/noncore/games/bounce/kbounce.h index de41710..c59109f 100644 --- a/noncore/games/bounce/kbounce.h +++ b/noncore/games/bounce/kbounce.h | |||
@@ -23,25 +23,26 @@ | |||
23 | #include <qmenubar.h> | 23 | #include <qmenubar.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | 25 | ||
26 | class JezzGame; | 26 | class JezzGame; |
27 | class QLCDNumber; | 27 | class QLCDNumber; |
28 | class QGridLayout; | 28 | class QGridLayout; |
29 | 29 | ||
30 | class KJezzball : public QMainWindow | 30 | class KJezzball : public QMainWindow |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | KJezzball(); | 35 | static QString appName() { return QString::fromLatin1("bounce"); } |
36 | KJezzball(QWidget *, const char*, WFlags ); | ||
36 | 37 | ||
37 | public slots: | 38 | public slots: |
38 | void newGame(); | 39 | void newGame(); |
39 | void pauseGame(); | 40 | void pauseGame(); |
40 | void closeGame(); | 41 | void closeGame(); |
41 | void about(); | 42 | void about(); |
42 | 43 | ||
43 | protected slots: | 44 | protected slots: |
44 | void died(); | 45 | void died(); |
45 | void newPercent( int percent ); | 46 | void newPercent( int percent ); |
46 | void second(); | 47 | void second(); |
47 | void switchLevel(); | 48 | void switchLevel(); |
diff --git a/noncore/games/bounce/main.cpp b/noncore/games/bounce/main.cpp index a6b7c1a..9ea86a6 100644 --- a/noncore/games/bounce/main.cpp +++ b/noncore/games/bounce/main.cpp | |||
@@ -9,21 +9,16 @@ | |||
9 | * This program is distributed in the hope that it will be useful, | 9 | * This program is distributed in the hope that it will be useful, |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | * Library General Public License for more details. | 12 | * Library General Public License for more details. |
13 | * | 13 | * |
14 | * You should have received a copy of the GNU Library General Public | 14 | * You should have received a copy of the GNU Library General Public |
15 | * License along with this program; if not, write to the Free | 15 | * License along with this program; if not, write to the Free |
16 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 16 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | #include "kbounce.h" | 20 | #include "kbounce.h" |
21 | #include <opie/oapplicationfactory.h> | ||
21 | 22 | ||
22 | int main(int argc, char **argv) | 23 | OPIE_EXPORT_APP( OApplicationFactory<KJezzball> ) |
23 | { | ||
24 | QPEApplication a( argc, argv ); | ||
25 | KJezzball *top = new KJezzball; | ||
26 | a.showMainWidget(top); | ||
27 | 24 | ||
28 | return a.exec(); | ||
29 | } | ||
diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control index 8b3fdb9..bfe85d3 100644 --- a/noncore/games/bounce/opie-bounce.control +++ b/noncore/games/bounce/opie-bounce.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-bounce | 1 | Package: opie-bounce |
2 | Files: bin/bounce apps/Games/bounce.desktop pics/bounce/*.png | 2 | Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png |
3 | Version: 0.6-$SUB_VERSION | 3 | Version: 0.6-$SUB_VERSION |
4 | Depends: task-opie-minimal | 4 | Depends: task-opie-minimal |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 7 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: bounce | 10 | Description: bounce |
11 | A JezzGame like game for Qtopia. | 11 | A JezzGame like game for Qtopia. |