Diffstat (limited to 'noncore/games/tetrix/qtetrix.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/tetrix/qtetrix.cpp | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/noncore/games/tetrix/qtetrix.cpp b/noncore/games/tetrix/qtetrix.cpp index 20cf1a7..a6a5f34 100644 --- a/noncore/games/tetrix/qtetrix.cpp +++ b/noncore/games/tetrix/qtetrix.cpp | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <qlabel.h> | 26 | #include <qlabel.h> |
27 | #include <qdatetime.h> | 27 | #include <qdatetime.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qtimer.h> | ||
29 | 30 | ||
30 | #include "ohighscoredlg.h" | 31 | #include "ohighscoredlg.h" |
31 | 32 | ||
@@ -107,6 +108,8 @@ QTetrix::QTetrix( QWidget *parent, const char *name, WFlags f ) | |||
107 | setCentralWidget( gameArea ); | 108 | setCentralWidget( gameArea ); |
108 | 109 | ||
109 | QGridLayout *gl = new QGridLayout( gameArea, 5, 3, 8 ); | 110 | QGridLayout *gl = new QGridLayout( gameArea, 5, 3, 8 ); |
111 | gl->setColStretch( 1, 5 ); | ||
112 | gl->setColStretch( 2, 10 ); | ||
110 | 113 | ||
111 | QLabel *l; | 114 | QLabel *l; |
112 | l = new QLabel( tr("Next"), gameArea ); | 115 | l = new QLabel( tr("Next"), gameArea ); |
@@ -130,11 +133,7 @@ QTetrix::QTetrix( QWidget *parent, const char *name, WFlags f ) | |||
130 | 133 | ||
131 | board = new QTetrixBoard(gameArea); | 134 | board = new QTetrixBoard(gameArea); |
132 | board->setBackgroundColor(QColor(0,0,0)); | 135 | board->setBackgroundColor(QColor(0,0,0)); |
133 | board->setFixedWidth( 124 ); | ||
134 | gl->addMultiCellWidget( board, 0, 4, 2, 2 ); | 136 | gl->addMultiCellWidget( board, 0, 4, 2, 2 ); |
135 | gl->addColSpacing( 2, 100 ); | ||
136 | gl->addColSpacing( 1, 35 ); | ||
137 | gl->addRowSpacing( 0, 35 ); | ||
138 | 137 | ||
139 | QPushButton *pb = new QPushButton( tr("Start"), gameArea ); | 138 | QPushButton *pb = new QPushButton( tr("Start"), gameArea ); |
140 | pb->setFocusPolicy( NoFocus ); | 139 | pb->setFocusPolicy( NoFocus ); |
@@ -142,21 +141,25 @@ QTetrix::QTetrix( QWidget *parent, const char *name, WFlags f ) | |||
142 | gl->addMultiCellWidget( pb, 4, 4, 0, 1 ); | 141 | gl->addMultiCellWidget( pb, 4, 4, 0, 1 ); |
143 | 142 | ||
144 | connect( board, SIGNAL(gameOverSignal()), SLOT(gameOver()) ); | 143 | connect( board, SIGNAL(gameOverSignal()), SLOT(gameOver()) ); |
145 | connect( board, SIGNAL(drawNextSquareSignal(int,int,QColor*)), showNext, | 144 | connect( board, SIGNAL(drawNextSquareSignal(int,int,QColor*)), this, |
146 | SLOT(drawNextSquare(int,int,QColor*)) ); | 145 | SLOT(setNext(int,int,QColor*)) ); |
147 | connect( showNext, SIGNAL(update()), board, SLOT(updateNext()) ); | 146 | connect( showNext, SIGNAL(update()), board, SLOT(updateNext()) ); |
148 | connect( board, SIGNAL(updateScoreSignal(int)), showScore, | 147 | connect( board, SIGNAL(updateScoreSignal(int)), showScore, SLOT(setNum(int)) ); |
149 | SLOT(setNum(int)) ); | 148 | connect( board, SIGNAL(updateLevelSignal(int)), showLevel, SLOT(setNum(int)) ); |
150 | connect( board, SIGNAL(updateLevelSignal(int)), showLevel, | 149 | connect( board, SIGNAL(updateRemovedSignal(int)), showLines, SLOT(setNum(int)) ); |
151 | SLOT(setNum(int))); | ||
152 | connect( board, SIGNAL(updateRemovedSignal(int)), showLines, | ||
153 | SLOT(setNum(int))); | ||
154 | 150 | ||
155 | showScore->setNum( 0 ); | 151 | showScore->setNum( 0 ); |
156 | showLevel->setNum( 0 ); | 152 | showLevel->setNum( 0 ); |
157 | showLines->setNum( 0 ); | 153 | showLines->setNum( 0 ); |
158 | board->revealNextPiece(TRUE); | 154 | board->revealNextPiece(TRUE); |
159 | board->setFocusPolicy( StrongFocus ); | 155 | board->setFocusPolicy( StrongFocus ); |
156 | |||
157 | QTimer::singleShot( -1, this, SLOT(setup()) ); | ||
158 | } | ||
159 | |||
160 | void QTetrix::setup() | ||
161 | { | ||
162 | resizeEvent( 0x0 ); | ||
160 | } | 163 | } |
161 | 164 | ||
162 | void QTetrix::gameOver() | 165 | void QTetrix::gameOver() |
@@ -172,3 +175,34 @@ void QTetrix::quit() | |||
172 | { | 175 | { |
173 | close(); | 176 | close(); |
174 | } | 177 | } |
178 | |||
179 | void QTetrix::setNext( int x, int y, QColor *color ) | ||
180 | { | ||
181 | resizeEvent( 0x0 ); | ||
182 | showNext->drawNextSquare( x, y, color ); | ||
183 | } | ||
184 | |||
185 | void QTetrix::resizeEvent( QResizeEvent * ) | ||
186 | { | ||
187 | // Set size of board | ||
188 | int widthFactor = board->QFrame::width() / board->boardWidth(); | ||
189 | if ( widthFactor < 1 ) | ||
190 | widthFactor = 1; | ||
191 | int heightFactor = board->QFrame::height() / board->boardHeight(); | ||
192 | if ( heightFactor < 1 ) | ||
193 | heightFactor = 1; | ||
194 | widthFactor > heightFactor ? board->resize( heightFactor * board->boardWidth() + 2, | ||
195 | heightFactor * board->boardHeight() + 2 ) | ||
196 | : board->resize( widthFactor * board->boardWidth() + 2, | ||
197 | widthFactor * board->boardHeight() + 2 ); | ||
198 | |||
199 | // Set size of preview widget | ||
200 | widthFactor = showNext->width() / 5; | ||
201 | if ( widthFactor < 1 ) | ||
202 | widthFactor = 1; | ||
203 | heightFactor = showNext->height() / 6; | ||
204 | if ( heightFactor < 1 ) | ||
205 | heightFactor = 1; | ||
206 | widthFactor > heightFactor ? showNext->resize( heightFactor * 5 + 2, heightFactor * 6 + 2 ) | ||
207 | : showNext->resize( widthFactor * 5 + 2, widthFactor * 6 + 2 ); | ||
208 | } | ||