summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-05-16 16:34:55 (UTC)
committer waspe <waspe>2003-05-16 16:34:55 (UTC)
commit11b6ce5ac500dce757ccdd0a5f5b5ecd7fb866c8 (patch) (unidiff)
tree3013dbafcb4e1f919e104204d1288f0309da5641
parent75f1e9815410e75a6f9ae76d8db716c0c315ea45 (diff)
downloadopie-11b6ce5ac500dce757ccdd0a5f5b5ecd7fb866c8.zip
opie-11b6ce5ac500dce757ccdd0a5f5b5ecd7fb866c8.tar.gz
opie-11b6ce5ac500dce757ccdd0a5f5b5ecd7fb866c8.tar.bz2
*** empty log message ***
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/backgammon/backgammon.cpp131
-rw-r--r--noncore/games/backgammon/backgammon.h32
-rw-r--r--noncore/games/backgammon/backgammonview.cpp14
-rw-r--r--noncore/games/backgammon/backgammonview.h10
-rw-r--r--noncore/games/backgammon/definition.cpp1
-rw-r--r--noncore/games/backgammon/displaydialog.cpp89
-rw-r--r--noncore/games/backgammon/displaydialog.h30
-rw-r--r--noncore/games/backgammon/moveengine.cpp2
-rw-r--r--noncore/games/backgammon/moveengine.h2
-rw-r--r--noncore/games/backgammon/rulesdialog.h1
10 files changed, 56 insertions, 256 deletions
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index 38ccb49..c40f462 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -3,3 +3,2 @@
3#include "aidialog.h" 3#include "aidialog.h"
4#include "displaydialog.h"
5#include "filedialog.h" 4#include "filedialog.h"
@@ -11,2 +10,3 @@
11#include <qfile.h> 10#include <qfile.h>
11#include <qlayout.h>
12#include <qmessagebox.h> 12#include <qmessagebox.h>
@@ -14,2 +14,3 @@
14#include <qtimer.h> 14#include <qtimer.h>
15#include <qmainwindow.h>
15#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
@@ -21,26 +22,5 @@
21 22
22BackGammonView::BackGammonView(QCanvas* canvas,QWidget* parent)
23 :QCanvasView(canvas,parent)
24{
25 //do nothing
26}
27
28
29
30BackGammonView::~BackGammonView()
31{
32 //do nothing
33}
34
35
36
37void BackGammonView::contentsMousePressEvent(QMouseEvent* e)
38{
39 int x=e->x();
40 int y=e->y();
41 emit mouse(x,y);
42}
43 23
44BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) 24BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
45 : QWidget(parent, name, fl) 25 : QMainWindow(parent, name, fl)
46{ 26{
@@ -98,17 +78,2 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
98 78
99 //non qte styles are smaller
100 conf.setGroup("display");
101 display.small=conf.readBoolEntry("small",false);
102 display.warning=conf.readBoolEntry("warning",true);
103 non_qte=display.small;
104 if(display.warning)
105 {
106 Config test("qpe");
107 test.setGroup("Appearance");
108 if(test.readEntry("Style")!="QPE")
109 {
110 displaySettings();
111 }
112 }
113 offset=(non_qte) ? 5 : 0;
114 79
@@ -165,22 +130,17 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
165 optionmenu->insertItem("Rules",this,SLOT(setrules())); 130 optionmenu->insertItem("Rules",this,SLOT(setrules()));
166 optionmenu->insertItem("Display",this,SLOT(displaySettings()));
167 menuBar->insertItem("Options",optionmenu); 131 menuBar->insertItem("Options",optionmenu);
168 132
169 //status bar 133 QWidget* mainarea=new QWidget(this);
170 message=new QLabel("<b>Backgammon</b>",this); 134 setCentralWidget(mainarea);
171 message->setGeometry(0,260,237,20);
172 message->setAlignment(AlignHCenter);
173
174 //the main area 135 //the main area
175 area=new QCanvas(235-2*offset,235-2*offset); 136 QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom);
176 boardview=new BackGammonView(area,this); 137 area=new QCanvas(235,235);
138 boardview=new BackGammonView(area,mainarea);
139 boardview->setMaximumHeight(240);
140 layout->addWidget(boardview);
177 connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int))); 141 connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int)));
178 if(non_qte) 142 //status bar
179 { 143 message=new QLabel("<b>Backgammon</b>",mainarea);
180 boardview->setGeometry(5,20,229,229); 144 message->setAlignment(AlignHCenter);
181 } 145 layout->addWidget(message);
182 else
183 {
184 boardview->setGeometry(1,20,237,237);
185 }
186 146
@@ -250,4 +210,4 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
250 diceA1[a]=new CanvasImageItem(dicebgA,area); 210 diceA1[a]=new CanvasImageItem(dicebgA,area);
251 diceA1[a]->setX(5-offset); 211 diceA1[a]->setX(5);
252 diceA1[a]->setY(205-2*offset); 212 diceA1[a]->setY(205-2);
253 diceA1[a]->setZ(1); 213 diceA1[a]->setZ(1);
@@ -255,4 +215,4 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
255 diceA2[a]=new CanvasImageItem(dicebgA,area); 215 diceA2[a]=new CanvasImageItem(dicebgA,area);
256 diceA2[a]->setX(35-offset); 216 diceA2[a]->setX(35);
257 diceA2[a]->setY(205-2*offset); 217 diceA2[a]->setY(205-2);
258 diceA2[a]->setZ(1); 218 diceA2[a]->setZ(1);
@@ -262,4 +222,4 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
262 diceB1[a]=new CanvasImageItem(dicebgB,area); 222 diceB1[a]=new CanvasImageItem(dicebgB,area);
263 diceB1[a]->setX(175-offset); 223 diceB1[a]->setX(175);
264 diceB1[a]->setY(205-2*offset); 224 diceB1[a]->setY(205-2);
265 diceB1[a]->setZ(1); 225 diceB1[a]->setZ(1);
@@ -267,4 +227,4 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
267 diceB2[a]=new CanvasImageItem(dicebgB,area); 227 diceB2[a]=new CanvasImageItem(dicebgB,area);
268 diceB2[a]->setX(205-offset); 228 diceB2[a]->setX(205);
269 diceB2[a]->setY(205-2*offset); 229 diceB2[a]->setY(205-2);
270 diceB2[a]->setZ(1); 230 diceB2[a]->setZ(1);
@@ -277,4 +237,4 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
277 oddsDice[a]=new CanvasImageItem(oddsbg,area); 237 oddsDice[a]=new CanvasImageItem(oddsbg,area);
278 oddsDice[a]->setX(110-offset); 238 oddsDice[a]->setX(110);
279 oddsDice[a]->setY(210-2*offset); 239 oddsDice[a]->setY(210-2);
280 oddsDice[a]->setZ(1); 240 oddsDice[a]->setZ(1);
@@ -289,6 +249,2 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
289 QImage boardbg(Resource::loadImage("backgammon/boards/"+board_name)); 249 QImage boardbg(Resource::loadImage("backgammon/boards/"+board_name));
290 if(non_qte)
291 {
292 boardbg=boardbg.copy(offset,offset,235-2*offset,200-2*offset);
293 }
294 board=new CanvasImageItem(boardbg,area); 250 board=new CanvasImageItem(boardbg,area);
@@ -297,3 +253,3 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
297 board->setZ(0); 253 board->setZ(0);
298 board->setSize(235-2*offset,200-2*offset); 254 board->setSize(235-2,200-2);
299 board->show(); 255 board->show();
@@ -302,11 +258,7 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
302 QImage tablebg(Resource::loadImage("backgammon/table/"+table_name)); 258 QImage tablebg(Resource::loadImage("backgammon/table/"+table_name));
303 if(non_qte)
304 {
305 tablebg=tablebg.copy(offset,0,235-offset,200);
306 }
307 table=new CanvasImageItem(tablebg,area); 259 table=new CanvasImageItem(tablebg,area);
308 table->setX(0); 260 table->setX(0);
309 table->setY(200-2*offset); 261 table->setY(200-2);
310 table->setZ(0); 262 table->setZ(0);
311 table->setSize(235-2*offset,20); 263 table->setSize(235-2,20);
312 table->show(); 264 table->show();
@@ -601,15 +553,2 @@ void BackGammon::setrules()
601 553
602void BackGammon::displaySettings()
603{
604 DisplayDialog* displaydialog=new DisplayDialog(this);
605 displaydialog->setDisplaySettings(display);
606 if(!displaydialog->exec())
607 return;
608 display=displaydialog->getDisplaySettings();
609 Config conf("backgammon");
610 conf.setGroup("display");
611 conf.writeEntry("small",display.small);
612 conf.writeEntry("warning",display.warning);
613 QMessageBox::warning(this,"Backgammon","changed display settings will\nonly take place after game has\nbeen restarted","OK");
614}
615 554
@@ -618,3 +557,3 @@ void BackGammon::draw()
618 Pieces pieces; 557 Pieces pieces;
619 move->position(pieces,non_qte); 558 move->position(pieces);
620 for(int a=0;a<15;a++) 559 for(int a=0;a<15;a++)
@@ -671,6 +610,6 @@ void BackGammon::mouse(int x,int y)
671 610
672 move->boardpressed(x,y,marker,non_qte); 611 move->boardpressed(x,y,marker);
673 if(marker.visible_current) 612 if(marker.visible_current)
674 { 613 {
675 marker_current->setX(marker.x_current-offset); 614 marker_current->setX(marker.x_current);
676 marker_current->setY(marker.y_current); 615 marker_current->setY(marker.y_current);
@@ -687,3 +626,3 @@ void BackGammon::mouse(int x,int y)
687 { 626 {
688 marker_next[a]->setX(marker.x_next[a]-offset); 627 marker_next[a]->setX(marker.x_next[a]);
689 marker_next[a]->setY(marker.y_next[a]); 628 marker_next[a]->setY(marker.y_next[a]);
@@ -987,6 +926,2 @@ void BackGammon::applytheme()
987 QImage boardbg(Resource::loadImage("backgammon/boards/"+board_name)); 926 QImage boardbg(Resource::loadImage("backgammon/boards/"+board_name));
988 if(non_qte)
989 {
990 boardbg=boardbg.copy(offset,offset,235-2*offset,200-2*offset);
991 }
992 board->setImage(boardbg); 927 board->setImage(boardbg);
@@ -994,6 +929,2 @@ void BackGammon::applytheme()
994 QImage tablebg(Resource::loadImage("backgammon/table/"+table_name)); 929 QImage tablebg(Resource::loadImage("backgammon/table/"+table_name));
995 if(non_qte)
996 {
997 tablebg=tablebg.copy(offset,0,235-offset,200);
998 }
999 table->setImage(tablebg); 930 table->setImage(tablebg);
diff --git a/noncore/games/backgammon/backgammon.h b/noncore/games/backgammon/backgammon.h
index 40dbaba..e3276f1 100644
--- a/noncore/games/backgammon/backgammon.h
+++ b/noncore/games/backgammon/backgammon.h
@@ -3,4 +3,4 @@
3 3
4#include "backgammonview.h"
4#include "canvasimageitem.h" 5#include "canvasimageitem.h"
5#include "definition.h"
6//#include "rulesdialog.h" 6//#include "rulesdialog.h"
@@ -8,21 +8,11 @@
8 8
9#include <qcanvas.h> 9
10#include <qlabel.h> 10#include <qlabel.h>
11#include <qlineedit.h> 11#include <qmainwindow.h>
12#include <qwidget.h> 12//#include <qwidget.h>
13 13
14 14
15class BackGammonView : public QCanvasView
16{
17 Q_OBJECT
18public:
19 BackGammonView(QCanvas* canvas,QWidget* parent);
20 ~BackGammonView();
21signals:
22 void mouse(int,int);
23private:
24 void contentsMousePressEvent(QMouseEvent* e);
25};
26 15
27class BackGammon : public QWidget 16
17class BackGammon : public QMainWindow
28{ 18{
@@ -31,7 +21,4 @@ private:
31 //GUI 21 //GUI
32 //is the style not qte ?
33 bool non_qte;
34 int offset;
35 //the "status" bar 22 //the "status" bar
36 QLineEdit* inputfield; 23 QLabel* message;
37 //the main drawing area 24 //the main drawing area
@@ -52,6 +39,6 @@ private:
52 CanvasImageItem* nomove_marker; 39 CanvasImageItem* nomove_marker;
53 40
54 QCanvasRectangle* marker_current; 41 QCanvasRectangle* marker_current;
55 QCanvasRectangle* marker_next[4]; 42 QCanvasRectangle* marker_next[4];
56 QLabel* message; 43
57 //ENGINE 44 //ENGINE
@@ -115,3 +102,2 @@ private slots:
115 void setrules(); 102 void setrules();
116 void displaySettings();
117 void mouse(int x,int y); 103 void mouse(int x,int y);
diff --git a/noncore/games/backgammon/backgammonview.cpp b/noncore/games/backgammon/backgammonview.cpp
index ecbc12b..6ee8f10 100644
--- a/noncore/games/backgammon/backgammonview.cpp
+++ b/noncore/games/backgammon/backgammonview.cpp
@@ -3,10 +3,16 @@
3BackGammonView::BackGammonView(QCanvas* canvas,QWidget* parent) 3BackGammonView::BackGammonView(QCanvas* canvas,QWidget* parent)
4 :QCanvasView(canvas,parent) 4 :QCanvasView(canvas,parent)
5{ 5{
6 //do nothing
6} 7}
7 8
9
10
8BackGammonView::~BackGammonView() 11BackGammonView::~BackGammonView()
9{ 12{
13 //do nothing
10} 14}
11 15
16
17
12void BackGammonView::contentsMousePressEvent(QMouseEvent* e) 18void BackGammonView::contentsMousePressEvent(QMouseEvent* e)
@@ -14,4 +20,4 @@ void BackGammonView::contentsMousePressEvent(QMouseEvent* e)
14 int x=e->x(); 20 int x=e->x();
15 int y=e->y(); 21 int y=e->y();
16 //emit mousepressed(x,y); 22 emit mouse(x,y);
17} \ No newline at end of file 23}
diff --git a/noncore/games/backgammon/backgammonview.h b/noncore/games/backgammon/backgammonview.h
index e50f2b0..52508e2 100644
--- a/noncore/games/backgammon/backgammonview.h
+++ b/noncore/games/backgammon/backgammonview.h
@@ -1,3 +1,3 @@
1#ifndef BACKGAMMONVIEW_H 1#ifndef BACKGAMMON_VIEW_H
2#define BACKGAMMONVIEW_H 2#define BACKGAMMON_VIEW_H
3 3
@@ -10,5 +10,5 @@ public:
10 BackGammonView(QCanvas* canvas,QWidget* parent); 10 BackGammonView(QCanvas* canvas,QWidget* parent);
11 ~BackGammonView(); 11 ~BackGammonView();
12signals: 12signals:
13 //void mousepressed(int,int); 13 void mouse(int,int);
14private: 14private:
@@ -17,2 +17,2 @@ private:
17 17
18#endif //BACKGAMMONVIEW_H \ No newline at end of file 18#endif //BACKGAMMON_VIEW_H \ No newline at end of file
diff --git a/noncore/games/backgammon/definition.cpp b/noncore/games/backgammon/definition.cpp
index 9e0029d..c036319 100644
--- a/noncore/games/backgammon/definition.cpp
+++ b/noncore/games/backgammon/definition.cpp
@@ -2,2 +2 @@
2
3static bool debug=false;
diff --git a/noncore/games/backgammon/displaydialog.cpp b/noncore/games/backgammon/displaydialog.cpp
deleted file mode 100644
index 8b97545..0000000
--- a/noncore/games/backgammon/displaydialog.cpp
+++ b/dev/null
@@ -1,89 +0,0 @@
1#include "displaydialog.h"
2
3#include <qgroupbox.h>
4#include <qlabel.h>
5
6DisplayDialog::DisplayDialog(QWidget* parent,const char* name,bool modal,WFlags f)
7 : QDialog(parent,name,modal,f)
8{
9 setCaption("Display Configuration");
10 QLabel* header=new QLabel("<b>Change the display settings</b>",this);
11 header->setGeometry(10,10,200,20);
12
13 //
14 QGroupBox* settings_frame=new QGroupBox("Settings",this);
15 settings_frame->setGeometry(10,10,220,120);
16
17 small_box=new QRadioButton("Big display, e.g. for QPE Style",settings_frame);
18 small_box->setGeometry(10,20,200,20);
19 connect(small_box,SIGNAL(clicked()),this,SLOT(small_clicked()));
20
21 big_box=new QRadioButton("Small display, e.g. for Windows Style",settings_frame);
22 big_box->setGeometry(10,50,200,20);
23 connect(big_box,SIGNAL(clicked()),this,SLOT(big_clicked()));
24
25 //
26 QGroupBox* warning_frame=new QGroupBox("Warning",this);
27 warning_frame->setGeometry(10,140,220,120);
28
29 warning_box=new QCheckBox("show style warning",warning_frame);
30 warning_box->setGeometry(10,20,200,20);
31 connect(warning_box,SIGNAL(clicked()),this,SLOT(warning_clicked()));
32
33 QLabel* warning_help=new QLabel("show style warning at statup if the system style is not QPE\nif not set to small you may have\nscrollbars on the palying area",warning_frame);
34 warning_help->setGeometry(10,50,200,60);
35
36 showMaximized();
37}
38
39
40DisplayDialog::~DisplayDialog()
41{
42}
43
44void DisplayDialog::big_clicked()
45{
46 big_box->setChecked(true);
47 small_box->setChecked(false);
48}
49
50void DisplayDialog::small_clicked()
51{
52 big_box->setChecked(false);
53 small_box->setChecked(true);
54}
55
56void DisplayDialog::warning_clicked()
57{
58}
59
60void DisplayDialog::setDisplaySettings(const Display& display)
61{
62 if(!display.small)
63 {
64 big_box->setChecked(false);
65 small_box->setChecked(true);
66 }
67 else
68 {
69 big_box->setChecked(true);
70 small_box->setChecked(false);
71 }
72 if(display.warning)
73 warning_box->setChecked(true);
74 else
75 warning_box->setChecked(false);
76
77}
78
79Display DisplayDialog::getDisplaySettings()
80{
81 Display display;
82 display.small=!small_box->isChecked();
83 display.warning=warning_box->isChecked();
84 return display;
85}
86
87
88
89
diff --git a/noncore/games/backgammon/displaydialog.h b/noncore/games/backgammon/displaydialog.h
deleted file mode 100644
index 26b77f0..0000000
--- a/noncore/games/backgammon/displaydialog.h
+++ b/dev/null
@@ -1,30 +0,0 @@
1#ifndef DISPLAYDLAOG_H
2#define DISPLAYDLAOG_H
3
4#include <qcheckbox.h>
5#include <qdialog.h>
6#include <qradiobutton.h>
7
8#include "definition.h"
9
10
11class DisplayDialog : public QDialog
12{
13 Q_OBJECT
14private:
15 QRadioButton* small_box;
16 QRadioButton* big_box;
17 QCheckBox* warning_box;
18public:
19 DisplayDialog(QWidget* parent=0,const char* name=0,bool modal=TRUE,WFlags f=0);
20 ~DisplayDialog();
21private slots:
22 void big_clicked();
23 void small_clicked();
24 void warning_clicked();
25public:
26 void setDisplaySettings(const Display& display);
27 Display getDisplaySettings();
28};
29
30#endif //DISPLAYDLAOG_H
diff --git a/noncore/games/backgammon/moveengine.cpp b/noncore/games/backgammon/moveengine.cpp
index 8106b3f..009c449 100644
--- a/noncore/games/backgammon/moveengine.cpp
+++ b/noncore/games/backgammon/moveengine.cpp
@@ -6,4 +6,2 @@
6 6
7#include <stdlib.h>
8
9MoveEngine::MoveEngine() 7MoveEngine::MoveEngine()
diff --git a/noncore/games/backgammon/moveengine.h b/noncore/games/backgammon/moveengine.h
index a2d4a52..4c39a04 100644
--- a/noncore/games/backgammon/moveengine.h
+++ b/noncore/games/backgammon/moveengine.h
@@ -3,4 +3,4 @@
3 3
4#include <qobject.h>
5#include "definition.h" 4#include "definition.h"
5#include <qobject.h>
6 6
diff --git a/noncore/games/backgammon/rulesdialog.h b/noncore/games/backgammon/rulesdialog.h
index 9269a0e..f11a28c 100644
--- a/noncore/games/backgammon/rulesdialog.h
+++ b/noncore/games/backgammon/rulesdialog.h
@@ -7,3 +7,2 @@
7 7
8
9class RulesDialog : public QDialog 8class RulesDialog : public QDialog