summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Games/minesweep.desktop2
-rw-r--r--noncore/games/minesweep/minesweep.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/Games/minesweep.desktop b/apps/Games/minesweep.desktop
index 3a74b46..b630647 100644
--- a/apps/Games/minesweep.desktop
+++ b/apps/Games/minesweep.desktop
@@ -1,27 +1,27 @@
1[Desktop Entry] 1[Desktop Entry]
2Exec=minesweep 2Exec=minesweep
3Icon=minesweep/MineHunt 3Icon=minesweep/MineSweep
4Type=Application 4Type=Application
5Name=Mine Hunt 5Name=Mine Hunt
6Comment=Find the mines 6Comment=Find the mines
7Name[fr]=Démineur 7Name[fr]=Démineur
8Comment[fr]=Jeu de déminage 8Comment[fr]=Jeu de déminage
9Name[de]=Minenjagd 9Name[de]=Minenjagd
10Comment[de]=Finde die Minen 10Comment[de]=Finde die Minen
11Name[es]=Busca Minas 11Name[es]=Busca Minas
12Comment[es]=Busca las minas 12Comment[es]=Busca las minas
13Name[fr]=Démineur 13Name[fr]=Démineur
14Name[hu]=Aknakeresõ 14Name[hu]=Aknakeresõ
15Name[it]=Campo Minato 15Name[it]=Campo Minato
16Comment[it]=Campo Minato 16Comment[it]=Campo Minato
17Name[no]=Minesøk 17Name[no]=Minesøk
18Name[pt]=Minas 18Name[pt]=Minas
19Comment[pt]=Procura as minas 19Comment[pt]=Procura as minas
20Name[pt_BR]=Caça-Minas 20Name[pt_BR]=Caça-Minas
21Comment[pt_BR]=Caça as minas 21Comment[pt_BR]=Caça as minas
22Name[zh_TW]=踩地雷 22Name[zh_TW]=踩地雷
23Name[sl]=Minolovec 23Name[sl]=Minolovec
24Comment[sl]=Najdi mine 24Comment[sl]=Najdi mine
25Name[nl]=Mijnenveger 25Name[nl]=Mijnenveger
26Name[ru]=Сапер 26Name[ru]=Сапер
27Comment[ru]=Отыщите мины 27Comment[ru]=Отыщите мины
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 4a6a92c..c14609d 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -179,131 +179,131 @@ void ResultIndicator::showResult( QWidget *ref, bool won )
179 QPalette p( red ); 179 QPalette p( red );
180 r->setPalette( p ); 180 r->setPalette( p );
181 r->setText( MineSweep::tr("You exploded!") ); 181 r->setText( MineSweep::tr("You exploded!") );
182 r->resize( ref->size() ); 182 r->resize( ref->size() );
183 r->move( ref->mapToGlobal(QPoint(0,0)) ); 183 r->move( ref->mapToGlobal(QPoint(0,0)) );
184 r->show(); 184 r->show();
185 r->twoStage = TRUE; 185 r->twoStage = TRUE;
186 r->timerId =r->startTimer(200); 186 r->timerId =r->startTimer(200);
187 } 187 }
188} 188}
189 189
190void ResultIndicator::center() 190void ResultIndicator::center()
191{ 191{
192 QWidget *w = parentWidget(); 192 QWidget *w = parentWidget();
193 193
194 QPoint pp = w->mapToGlobal( QPoint(0,0) ); 194 QPoint pp = w->mapToGlobal( QPoint(0,0) );
195 QSize s = sizeHint()*3; 195 QSize s = sizeHint()*3;
196 s.setWidth( QMIN(s.width(), w->width()) ); 196 s.setWidth( QMIN(s.width(), w->width()) );
197 pp = QPoint( pp.x() + w->width()/2 - s.width()/2, 197 pp = QPoint( pp.x() + w->width()/2 - s.width()/2,
198 pp.y() + w->height()/ 2 - s.height()/2 ); 198 pp.y() + w->height()/ 2 - s.height()/2 );
199 199
200 setGeometry( QRect(pp, s) ); 200 setGeometry( QRect(pp, s) );
201 201
202} 202}
203 203
204void ResultIndicator::timerEvent( QTimerEvent *te ) 204void ResultIndicator::timerEvent( QTimerEvent *te )
205{ 205{
206 if ( te->timerId() != timerId ) 206 if ( te->timerId() != timerId )
207 return; 207 return;
208 killTimer( timerId ); 208 killTimer( timerId );
209 if ( twoStage ) { 209 if ( twoStage ) {
210 center(); 210 center();
211 twoStage = FALSE; 211 twoStage = FALSE;
212 timerId = startTimer( 1000 ); 212 timerId = startTimer( 1000 );
213 } else { 213 } else {
214 delete this; 214 delete this;
215 } 215 }
216} 216}
217 217
218 218
219class MineFrame : public QFrame 219class MineFrame : public QFrame
220{ 220{
221public: 221public:
222 MineFrame( QWidget *parent, const char *name = 0 ) 222 MineFrame( QWidget *parent, const char *name = 0 )
223 :QFrame( parent, name ), field(0) {} 223 :QFrame( parent, name ), field(0) {}
224 void setField( MineField *f ) { 224 void setField( MineField *f ) {
225 field = f; 225 field = f;
226 setMinimumSize( field->sizeHint() ); 226 setMinimumSize( field->sizeHint() );
227 } 227 }
228protected: 228protected:
229 void resizeEvent( QResizeEvent *e ) { 229 void resizeEvent( QResizeEvent *e ) {
230 field->setAvailableRect( contentsRect()); 230 field->setAvailableRect( contentsRect());
231 QFrame::resizeEvent(e); 231 QFrame::resizeEvent(e);
232 } 232 }
233private: 233private:
234 MineField *field; 234 MineField *field;
235}; 235};
236 236
237 237
238 238
239MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) 239MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
240: QMainWindow( parent, name, f ) 240: QMainWindow( parent, name, f )
241{ 241{
242 srand(::time(0)); 242 srand(::time(0));
243 setCaption( tr("Mine Hunt") ); 243 setCaption( tr("Mine Sweep") );
244 QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff ); 244 QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff );
245 setIcon( Resource::loadPixmap( "minesweep/MineHunt" ) ); 245 setIcon( Resource::loadPixmap( "minesweep/MineSweep" ) );
246 246
247 QToolBar *toolBar = new QToolBar( this ); 247 QToolBar *toolBar = new QToolBar( this );
248 toolBar->setHorizontalStretchable( TRUE ); 248 toolBar->setHorizontalStretchable( TRUE );
249 249
250 QMenuBar *menuBar = new QMenuBar( toolBar ); 250 QMenuBar *menuBar = new QMenuBar( toolBar );
251 251
252 QPopupMenu *gameMenu = new QPopupMenu( this ); 252 QPopupMenu *gameMenu = new QPopupMenu( this );
253 gameMenu->insertItem( tr("Beginner"), this, SLOT( beginner() ) ); 253 gameMenu->insertItem( tr("Beginner"), this, SLOT( beginner() ) );
254 gameMenu->insertItem( tr("Advanced"), this, SLOT( advanced() ) ); 254 gameMenu->insertItem( tr("Advanced"), this, SLOT( advanced() ) );
255 255
256 if (qApp->desktop()->width() >= 240) { 256 if (qApp->desktop()->width() >= 240) {
257 gameMenu->insertItem( tr("Expert"), this, SLOT( expert() ) ); 257 gameMenu->insertItem( tr("Expert"), this, SLOT( expert() ) );
258 } 258 }
259 259
260 menuBar->insertItem( tr("Game"), gameMenu ); 260 menuBar->insertItem( tr("Game"), gameMenu );
261 261
262 guessLCD = new QLCDNumber( toolBar ); 262 guessLCD = new QLCDNumber( toolBar );
263 toolBar->setStretchableWidget( guessLCD ); 263 toolBar->setStretchableWidget( guessLCD );
264 264
265 QPalette lcdPal( red ); 265 QPalette lcdPal( red );
266 lcdPal.setColor( QColorGroup::Background, QApplication::palette().active().background() ); 266 lcdPal.setColor( QColorGroup::Background, QApplication::palette().active().background() );
267 lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() ); 267 lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() );
268 268
269// guessLCD->setPalette( lcdPal ); 269// guessLCD->setPalette( lcdPal );
270 guessLCD->setSegmentStyle( QLCDNumber::Flat ); 270 guessLCD->setSegmentStyle( QLCDNumber::Flat );
271 guessLCD->setFrameStyle( QFrame::NoFrame ); 271 guessLCD->setFrameStyle( QFrame::NoFrame );
272 guessLCD->setNumDigits( 2 ); 272 guessLCD->setNumDigits( 2 );
273 guessLCD->setBackgroundMode( PaletteButton ); 273 guessLCD->setBackgroundMode( PaletteButton );
274 newGameButton = new QPushButton( toolBar ); 274 newGameButton = new QPushButton( toolBar );
275 newGameButton->setPixmap( QPixmap( pix_new ) ); 275 newGameButton->setPixmap( QPixmap( pix_new ) );
276 newGameButton->setFocusPolicy(QWidget::NoFocus); 276 newGameButton->setFocusPolicy(QWidget::NoFocus);
277 connect( newGameButton, SIGNAL(clicked()), this, SLOT(newGame()) ); 277 connect( newGameButton, SIGNAL(clicked()), this, SLOT(newGame()) );
278 278
279 timeLCD = new QLCDNumber( toolBar ); 279 timeLCD = new QLCDNumber( toolBar );
280// timeLCD->setPalette( lcdPal ); 280// timeLCD->setPalette( lcdPal );
281 timeLCD->setSegmentStyle( QLCDNumber::Flat ); 281 timeLCD->setSegmentStyle( QLCDNumber::Flat );
282 timeLCD->setFrameStyle( QFrame::NoFrame ); 282 timeLCD->setFrameStyle( QFrame::NoFrame );
283 timeLCD->setNumDigits( 5 ); // "mm:ss" 283 timeLCD->setNumDigits( 5 ); // "mm:ss"
284 timeLCD->setBackgroundMode( PaletteButton ); 284 timeLCD->setBackgroundMode( PaletteButton );
285 285
286 setToolBarsMovable ( FALSE ); 286 setToolBarsMovable ( FALSE );
287 287
288 addToolBar( toolBar ); 288 addToolBar( toolBar );
289 289
290 MineFrame *mainframe = new MineFrame( this ); 290 MineFrame *mainframe = new MineFrame( this );
291 mainframe->setFrameShape( QFrame::Box ); 291 mainframe->setFrameShape( QFrame::Box );
292 mainframe->setFrameShadow( QFrame::Raised ); 292 mainframe->setFrameShadow( QFrame::Raised );
293 293
294 mainframe->setLineWidth(2); 294 mainframe->setLineWidth(2);
295 295
296 field = new MineField( mainframe ); 296 field = new MineField( mainframe );
297 mainframe->setField( field ); 297 mainframe->setField( field );
298 QFont fnt = field->font(); 298 QFont fnt = field->font();
299 fnt.setBold( TRUE ); 299 fnt.setBold( TRUE );
300 field->setFont( QFont( fnt ) ); 300 field->setFont( QFont( fnt ) );
301 field->setFocus(); 301 field->setFocus();
302 setCentralWidget( mainframe ); 302 setCentralWidget( mainframe );
303 303
304 connect( field, SIGNAL( gameOver(bool) ), this, SLOT( gameOver(bool) ) ); 304 connect( field, SIGNAL( gameOver(bool) ), this, SLOT( gameOver(bool) ) );
305 connect( field, SIGNAL( mineCount(int) ), this, SLOT( setCounter(int) ) ); 305 connect( field, SIGNAL( mineCount(int) ), this, SLOT( setCounter(int) ) );
306 connect( field, SIGNAL( gameStarted()), this, SLOT( startPlaying() ) ); 306 connect( field, SIGNAL( gameStarted()), this, SLOT( startPlaying() ) );
307 307
308 timer = new QTimer( this ); 308 timer = new QTimer( this );
309 connect( timer, SIGNAL( timeout() ), this, SLOT( updateTime() ) ); 309 connect( timer, SIGNAL( timeout() ), this, SLOT( updateTime() ) );