author | cniehaus <cniehaus> | 2003-08-12 16:15:32 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-08-12 16:15:32 (UTC) |
commit | 713725e85c03c3bbbc0358301ed84241c6d0dd5b (patch) (unidiff) | |
tree | 84aea38721724403e688bdd1e987be392459d4d1 /noncore | |
parent | d16aa943a04b1e630e913cc55789bb876cd0f42f (diff) | |
download | opie-713725e85c03c3bbbc0358301ed84241c6d0dd5b.zip opie-713725e85c03c3bbbc0358301ed84241c6d0dd5b.tar.gz opie-713725e85c03c3bbbc0358301ed84241c6d0dd5b.tar.bz2 |
now it will even compile
-rw-r--r-- | noncore/games/oyatzee/main.cpp | 2 | ||||
-rw-r--r-- | noncore/games/oyatzee/oyatzee.cpp | 10 | ||||
-rw-r--r-- | noncore/games/oyatzee/oyatzee.h | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/noncore/games/oyatzee/main.cpp b/noncore/games/oyatzee/main.cpp index 6e5002c..1fd51f6 100644 --- a/noncore/games/oyatzee/main.cpp +++ b/noncore/games/oyatzee/main.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | #include "wordgame.h" | 1 | #include "oyatzee.h" |
2 | 2 | ||
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | 4 | ||
5 | int main( int argc, char ** argv ) | 5 | int main( int argc, char ** argv ) |
6 | { | 6 | { |
7 | QPEApplication a( argc, argv ); | 7 | QPEApplication a( argc, argv ); |
diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp index 7940b89..85d9616 100644 --- a/noncore/games/oyatzee/oyatzee.cpp +++ b/noncore/games/oyatzee/oyatzee.cpp | |||
@@ -38,13 +38,12 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( | |||
38 | setCentralWidget( thing ); | 38 | setCentralWidget( thing ); |
39 | 39 | ||
40 | QVBoxLayout *vbox = new QVBoxLayout( thing ); | 40 | QVBoxLayout *vbox = new QVBoxLayout( thing ); |
41 | 41 | ||
42 | sb = new Scoreboard( thing , "sb" ); | 42 | sb = new Scoreboard( thing , "sb" ); |
43 | dw = new DiceWidget( thing , "dw" ); | 43 | dw = new DiceWidget( thing , "dw" ); |
44 | |||
45 | 44 | ||
46 | vbox->addWidget( sb ); | 45 | vbox->addWidget( sb ); |
47 | vbox->addWidget( dw ); | 46 | vbox->addWidget( dw ); |
48 | 47 | ||
49 | setPlayerNumber( 2 ); | 48 | setPlayerNumber( 2 ); |
50 | setRoundsNumber( 1 ); | 49 | setRoundsNumber( 1 ); |
@@ -119,13 +118,17 @@ Dice::Dice( QWidget *parent , const char *name ) : QFrame( parent , name ) | |||
119 | 118 | ||
120 | connect( this , SIGNAL( selected() ), this , SLOT( slotSelected() ) ); | 119 | connect( this , SIGNAL( selected() ), this , SLOT( slotSelected() ) ); |
121 | } | 120 | } |
122 | 121 | ||
123 | void Dice::slotSelected() | 122 | void Dice::slotSelected() |
124 | { | 123 | { |
125 | qDebug( QString::number( Value ) ); | 124 | if ( isSelected ) |
125 | isSelected = false; | ||
126 | else isSelected = true; | ||
127 | |||
128 | update(); | ||
126 | } | 129 | } |
127 | 130 | ||
128 | int Dice::hasValue() | 131 | int Dice::hasValue() |
129 | { | 132 | { |
130 | return Value; | 133 | return Value; |
131 | } | 134 | } |
@@ -147,12 +150,15 @@ void Dice::paintEvent( QPaintEvent * ) | |||
147 | { | 150 | { |
148 | QPainter p; | 151 | QPainter p; |
149 | p.begin( this ); | 152 | p.begin( this ); |
150 | 153 | ||
151 | p.drawRect( 0,0, this->width() , this->height() ); | 154 | p.drawRect( 0,0, this->width() , this->height() ); |
152 | 155 | ||
156 | if ( isSelected ) | ||
157 | p.drawRect( 20,20, 10,10 ); | ||
158 | |||
153 | paintNumber( &p ); | 159 | paintNumber( &p ); |
154 | } | 160 | } |
155 | 161 | ||
156 | void Dice::paintNumber( QPainter *p ) | 162 | void Dice::paintNumber( QPainter *p ) |
157 | { | 163 | { |
158 | switch ( Value ) | 164 | switch ( Value ) |
diff --git a/noncore/games/oyatzee/oyatzee.h b/noncore/games/oyatzee/oyatzee.h index 7be9407..01ab36d 100644 --- a/noncore/games/oyatzee/oyatzee.h +++ b/noncore/games/oyatzee/oyatzee.h | |||
@@ -44,12 +44,13 @@ class Dice : public QFrame | |||
44 | { | 44 | { |
45 | Q_OBJECT | 45 | Q_OBJECT |
46 | public: | 46 | public: |
47 | Dice( QWidget* parent = 0, const char* name = 0 ); | 47 | Dice( QWidget* parent = 0, const char* name = 0 ); |
48 | 48 | ||
49 | int Value; | 49 | int Value; |
50 | bool isSelected; | ||
50 | 51 | ||
51 | int hasValue(); | 52 | int hasValue(); |
52 | void roll(); | 53 | void roll(); |
53 | virtual void mousePressEvent( QMouseEvent* ); | 54 | virtual void mousePressEvent( QMouseEvent* ); |
54 | 55 | ||
55 | private slots: | 56 | private slots: |