| author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
| commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (side-by-side diff) | |
| tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/games/wordgame | |
| parent | 1c58d1407f9584fedcdae390a04e2b37e5853361 (diff) | |
| download | opie-e16d333ec2e8509fc665921ca106c25325bae9e0.zip opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.gz opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.bz2 | |
Merge from BRANCH_1_0
| -rw-r--r-- | noncore/games/wordgame/opie-wordgame.control | 2 | ||||
| -rw-r--r-- | noncore/games/wordgame/wordgame.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control index 3be8e8f..c7dc126 100644 --- a/noncore/games/wordgame/opie-wordgame.control +++ b/noncore/games/wordgame/opie-wordgame.control @@ -4,8 +4,8 @@ Priority: optional Section: opie/games Maintainer: Martin Imobersteg <imm@gmx.ch> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Crossword game A crossword game for the Opie environment. Play against the computer or human opponents. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index d3160f4..d46e824 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp @@ -290,7 +290,7 @@ bool WordGame::loadRules(const QString &name) QString title = name; title.truncate( title.length() - 6 ); - setCaption( title ); + //setCaption( title ); QString shapepixmap; ts >> shapepixmap; @@ -314,7 +314,7 @@ bool WordGame::loadRules(const QString &name) if ( re++ < 10 ) ts >> e; } - QImage shim = Resource::loadImage("wordgame/wordgame_shapes.xpm"); + QImage shim = Resource::loadImage("wordgame/wordgame_shapes"); shim = shim.smoothScale((re-1)*TileItem::smallWidth(),TileItem::smallHeight()); QPixmap bgshapes; bgshapes.convertFromImage(shim); |