author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (unidiff) | |
tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/games/backgammon | |
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/backgammon/backgammon.control | 2 | ||||
-rw-r--r-- | noncore/games/backgammon/backgammon.cpp | 2 | ||||
-rw-r--r-- | noncore/games/backgammon/backgammon.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/noncore/games/backgammon/backgammon.control b/noncore/games/backgammon/backgammon.control index b75bc60..6468181 100644 --- a/noncore/games/backgammon/backgammon.control +++ b/noncore/games/backgammon/backgammon.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: backgammon | 1 | Package: backgammon |
2 | Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html | 2 | Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Ralf Waspe <rwaspe@web.de> | 5 | Maintainer: Ralf Waspe <rwaspe@web.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Backgammon Game | 8 | Description: Backgammon Game |
10 | A Backgammon game for the Opie environment. | 9 | A Backgammon game for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp index db1a058..06523f1 100644 --- a/noncore/games/backgammon/backgammon.cpp +++ b/noncore/games/backgammon/backgammon.cpp | |||
@@ -132,14 +132,12 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) | |||
132 | 132 | ||
133 | QWidget* mainarea=new QWidget(this); | 133 | QWidget* mainarea=new QWidget(this); |
134 | setCentralWidget(mainarea); | 134 | setCentralWidget(mainarea); |
135 | //the main area | 135 | //the main area |
136 | QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom); | 136 | QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom); |
137 | area=new QCanvas(235,235); | 137 | area=new QCanvas(235,235); |
138 | QColor bgColor=palette().color(QPalette::Normal,QColorGroup::Background); | ||
139 | area->setBackgroundColor(bgColor); | ||
140 | boardview=new BackGammonView(area,mainarea); | 138 | boardview=new BackGammonView(area,mainarea); |
141 | boardview->setMaximumHeight(240); | 139 | boardview->setMaximumHeight(240); |
142 | layout->addWidget(boardview); | 140 | layout->addWidget(boardview); |
143 | connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int))); | 141 | connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int))); |
144 | //status bar | 142 | //status bar |
145 | message=new QLabel("<b>Backgammon</b>",mainarea); | 143 | message=new QLabel("<b>Backgammon</b>",mainarea); |
diff --git a/noncore/games/backgammon/backgammon.h b/noncore/games/backgammon/backgammon.h index d803489..e3276f1 100644 --- a/noncore/games/backgammon/backgammon.h +++ b/noncore/games/backgammon/backgammon.h | |||
@@ -15,12 +15,13 @@ | |||
15 | 15 | ||
16 | 16 | ||
17 | class BackGammon : public QMainWindow | 17 | class BackGammon : public QMainWindow |
18 | { | 18 | { |
19 | Q_OBJECT | 19 | Q_OBJECT |
20 | private: | 20 | private: |
21 | //GUI | ||
21 | //the "status" bar | 22 | //the "status" bar |
22 | QLabel* message; | 23 | QLabel* message; |
23 | //the main drawing area | 24 | //the main drawing area |
24 | QCanvas* area; | 25 | QCanvas* area; |
25 | BackGammonView* boardview; | 26 | BackGammonView* boardview; |
26 | CanvasImageItem* board; | 27 | CanvasImageItem* board; |