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/qasteroids | |
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/qasteroids/main.cpp | 13 | ||||
-rw-r--r-- | noncore/games/qasteroids/opie-qasteroids.control | 2 | ||||
-rw-r--r-- | noncore/games/qasteroids/qasteroids.pro | 6 | ||||
-rw-r--r-- | noncore/games/qasteroids/toplevel.cpp | 7 | ||||
-rw-r--r-- | noncore/games/qasteroids/toplevel.h | 4 |
5 files changed, 14 insertions, 18 deletions
diff --git a/noncore/games/qasteroids/main.cpp b/noncore/games/qasteroids/main.cpp index 7d1682c..c762990 100644 --- a/noncore/games/qasteroids/main.cpp +++ b/noncore/games/qasteroids/main.cpp | |||
@@ -18,19 +18,10 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "toplevel.h" | 21 | #include "toplevel.h" |
22 | 22 | ||
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 | { | ||
27 | QPEApplication app( argc, argv ); | ||
28 | |||
29 | QPEApplication::grabKeyboard(); | ||
30 | |||
31 | KAstTopLevel *mainWidget = new KAstTopLevel(); | ||
32 | app.showMainWidget( mainWidget ); | ||
33 | |||
34 | app.exec(); | ||
35 | } | ||
36 | 26 | ||
27 | OPIE_EXPORT_APP( OApplicationFactory<KAstTopLevel> ) | ||
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control index 25a49b4..8764578 100644 --- a/noncore/games/qasteroids/opie-qasteroids.control +++ b/noncore/games/qasteroids/opie-qasteroids.control | |||
@@ -1,8 +1,8 @@ | |||
1 | Package: opie-qasteroids | 1 | Package: opie-qasteroids |
2 | Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/* | 2 | Files: plugins/application/libqasteroids.so* bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Martin Jones <mjones@trolltech.com> | 5 | Maintainer: Martin Jones <mjones@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
8 | Description: Game: shoot the asteroids | 8 | Description: Game: shoot the asteroids |
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro index 1a3a8d5..aafc701 100644 --- a/noncore/games/qasteroids/qasteroids.pro +++ b/noncore/games/qasteroids/qasteroids.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = ledmeter.h sprites.h toplevel.h view.h | 2 | HEADERS = ledmeter.h sprites.h toplevel.h view.h |
5 | SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp | 3 | SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp |
6 | TARGET = qasteroids | 4 | TARGET = qasteroids |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | 8 | ||
9 | |||
10 | |||
11 | include ( $(OPIEDIR)/include.pro ) | 11 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp index 71daf60..c4fea89 100644 --- a/noncore/games/qasteroids/toplevel.cpp +++ b/noncore/games/qasteroids/toplevel.cpp | |||
@@ -81,16 +81,19 @@ const char *soundDefaults[] = | |||
81 | "Explosion.wav", | 81 | "Explosion.wav", |
82 | "ploop.wav", | 82 | "ploop.wav", |
83 | 0 | 83 | 0 |
84 | }; | 84 | }; |
85 | 85 | ||
86 | 86 | ||
87 | KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name ) | 87 | KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name, WFlags fl ) |
88 | : QMainWindow( parent, _name ) | 88 | : QMainWindow( parent, _name, fl ) |
89 | { | 89 | { |
90 | setCaption( tr("Asteroids") ); | 90 | setCaption( tr("Asteroids") ); |
91 | |||
92 | QPEApplication::grabKeyboard(); | ||
93 | |||
91 | QWidget *border = new QWidget( this ); | 94 | QWidget *border = new QWidget( this ); |
92 | border->setBackgroundColor( black ); | 95 | border->setBackgroundColor( black ); |
93 | setCentralWidget( border ); | 96 | setCentralWidget( border ); |
94 | 97 | ||
95 | QVBoxLayout *borderLayout = new QVBoxLayout( border ); | 98 | QVBoxLayout *borderLayout = new QVBoxLayout( border ); |
96 | 99 | ||
diff --git a/noncore/games/qasteroids/toplevel.h b/noncore/games/qasteroids/toplevel.h index 4e1ac9c..0270763 100644 --- a/noncore/games/qasteroids/toplevel.h +++ b/noncore/games/qasteroids/toplevel.h | |||
@@ -36,14 +36,16 @@ class KALedMeter; | |||
36 | class QLCDNumber; | 36 | class QLCDNumber; |
37 | 37 | ||
38 | class KAstTopLevel : public QMainWindow | 38 | class KAstTopLevel : public QMainWindow |
39 | { | 39 | { |
40 | Q_OBJECT | 40 | Q_OBJECT |
41 | public: | 41 | public: |
42 | KAstTopLevel( QWidget *parent=0, const char *name=0 ); | 42 | KAstTopLevel( QWidget *parent=0, const char *name=0, WFlags fl = 0 ); |
43 | virtual ~KAstTopLevel(); | 43 | virtual ~KAstTopLevel(); |
44 | static QString appName() { return QString::fromLatin1("qasteroids"); } | ||
45 | |||
44 | 46 | ||
45 | private: | 47 | private: |
46 | void playSound( const char *snd ); | 48 | void playSound( const char *snd ); |
47 | void readSoundMapping(); | 49 | void readSoundMapping(); |
48 | void doStats(); | 50 | void doStats(); |
49 | 51 | ||