-rw-r--r-- | noncore/games/kpacman/board.cpp | 6 | ||||
-rw-r--r-- | noncore/games/kpacman/keys.cpp | 10 | ||||
-rw-r--r-- | noncore/games/kpacman/kpacman.cpp | 30 | ||||
-rw-r--r-- | noncore/games/kpacman/kpacmanwidget.cpp | 4 | ||||
-rw-r--r-- | noncore/games/kpacman/painter.cpp | 6 | ||||
-rw-r--r-- | noncore/games/kpacman/referee.cpp | 54 | ||||
-rw-r--r-- | noncore/games/kpacman/score.cpp | 48 | ||||
-rw-r--r-- | noncore/games/kpacman/status.cpp | 4 |
8 files changed, 81 insertions, 81 deletions
diff --git a/noncore/games/kpacman/board.cpp b/noncore/games/kpacman/board.cpp index 849e75b..f95f699 100644 --- a/noncore/games/kpacman/board.cpp +++ b/noncore/games/kpacman/board.cpp @@ -54,17 +54,17 @@ void Board::init(Image image, QString levelName) if (mapName == levelName) image = File; else { QFile levelFile(levelName); if (!levelFile.open(IO_ReadOnly)) { - QString msg = i18n("The levelmap could not be constructed.\n\n" + QString msg = "The levelmap could not be constructed.\n\n" "The file '@LEVELNAME@' does not exist,\n" - "or could not be opened for reading."); + "or could not be opened for reading."; msg.replace(QRegExp("@LEVELNAME@"), levelName); - // QMessageBox::information(0, i18n("Initialization Error"), msg); + // QMessageBox::information(0, tr("Initialization Error"), msg); printf("%s\n", msg.data()); } else { map.fill(' ', BoardHeight*BoardWidth); int height = 0; QTextStream levelStream(&levelFile); diff --git a/noncore/games/kpacman/keys.cpp b/noncore/games/kpacman/keys.cpp index c609373..8b17785 100644 --- a/noncore/games/kpacman/keys.cpp +++ b/noncore/games/kpacman/keys.cpp @@ -27,25 +27,25 @@ Keys::Keys( QWidget *parent, const char *name) : QDialog( parent, name, TRUE ) { //KStandardDirs *dirs = KGlobal::dirs(); QPushButton *okButton = new QPushButton(this); - okButton->setText(i18n("Ok")); + okButton->setText(tr("Ok")); okButton->setFixedSize(okButton->size()); connect( okButton, SIGNAL(clicked()),this, SLOT(ok()) ); okButton->move(20,210); QPushButton *defaultButton = new QPushButton(this); - defaultButton->setText(i18n("Defaults")); + defaultButton->setText(tr("Defaults")); defaultButton->setFixedSize(defaultButton->size()); connect( defaultButton, SIGNAL(clicked()),this, SLOT(defaults()) ); defaultButton->move(140,210); QPushButton *cancelButton = new QPushButton(this); - cancelButton->setText(i18n("Cancel")); + cancelButton->setText(tr("Cancel")); cancelButton->setFixedSize(cancelButton->size()); connect( cancelButton, SIGNAL(clicked()),this, SLOT(reject()) ); cancelButton->move(260,210); QFrame *separator = new QFrame(this); separator->setFrameStyle( QFrame::HLine | QFrame::Sunken ); @@ -90,26 +90,26 @@ Keys::Keys( QWidget *parent, const char *name) right->setPixmap( QPixmap(pixPath)); right->setFixedSize(right->pixmap()->size()); connect( right, SIGNAL(clicked()),this, SLOT(butRight()) ); right->move(220, 90); - setCaption(i18n("Change Direction Keys")); + setCaption(tr("Change Direction Keys")); setFixedSize(380, 260); lab = 0; init(); } void Keys::keyPressEvent( QKeyEvent *e ) { uint kCode = e->key() & ~(SHIFT | CTRL | ALT); QString string = KAccel::keyToString(kCode); if (lab != 0) { if ( string.isNull() ) - lab->setText(i18n("Undefined key")); + lab->setText(tr("Undefined key")); else lab->setText(string); } else if ( lab == 0 && e->key() == Key_Escape) reject(); } diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp index 4077085..7df6ef0 100644 --- a/noncore/games/kpacman/kpacman.cpp +++ b/noncore/games/kpacman/kpacman.cpp @@ -84,47 +84,47 @@ Kpacman::~Kpacman() } void Kpacman::menu() { gamePopup = new QPopupMenu(); CHECK_PTR( gamePopup ); - newID = gamePopup->insertItem(i18n("&New"), this, SLOT(newKpacman()),Key_F2); - pauseID = gamePopup->insertItem(i18n("&Pause"), + newID = gamePopup->insertItem(tr("&New"), this, SLOT(newKpacman()),Key_F2); + pauseID = gamePopup->insertItem(tr("&Pause"), this, SLOT(pauseKpacman()), Key_F3); - hofID = gamePopup->insertItem(i18n("&Hall of fame"), + hofID = gamePopup->insertItem(tr("&Hall of fame"), this, SLOT(toggleHallOfFame()), Key_F4); gamePopup->insertSeparator(); - gamePopup->insertItem(i18n("&Quit"), this, SLOT(quitKpacman()), CTRL+Key_Q); + gamePopup->insertItem(tr("&Quit"), this, SLOT(quitKpacman()), CTRL+Key_Q); gamePopup->setCheckable(TRUE); optionsPopup = new QPopupMenu(); CHECK_PTR(optionsPopup); modesPopup = new QPopupMenu(); CHECK_PTR(modesPopup); - hideMouseCursorID = optionsPopup->insertItem(i18n("&Hide Mousecursor"), + hideMouseCursorID = optionsPopup->insertItem(tr("&Hide Mousecursor"), this, SLOT(toggleHideMouseCursor()), CTRL+Key_H); optionsPopup->insertSeparator(); if (lookupSchemes() > 0) { - optionsPopup->insertItem(i18n("&Select graphic scheme"), modesPopup); + optionsPopup->insertItem(tr("&Select graphic scheme"), modesPopup); optionsPopup->insertSeparator(); } - focusOutPauseID = optionsPopup->insertItem(i18n("&Pause in Background"), + focusOutPauseID = optionsPopup->insertItem(tr("&Pause in Background"), this, SLOT(toggleFocusOutPause())); - focusInContinueID = optionsPopup->insertItem(i18n("&Continue in Foreground"), + focusInContinueID = optionsPopup->insertItem(tr("&Continue in Foreground"), this, SLOT(toggleFocusInContinue())); optionsPopup->insertSeparator(); - optionsPopup->insertItem(i18n("Change &keys..."), this, SLOT(confKeys())); + optionsPopup->insertItem(tr("Change &keys..."), this, SLOT(confKeys())); #ifndef QWS - QString aboutText = i18n("@PACKAGE@ - @VERSION@\n\n" + QString aboutText = tr("@PACKAGE@ - @VERSION@\n\n" "Joerg Thoennissen (joe@dsite.de)\n\n" "A pacman game for the KDE Desktop\n\n" "The program based on the source of ksnake\n" "by Michel Filippi (mfilippi@sade.rhein-main.de).\n" "The design was strongly influenced by the pacman\n" "(c) 1980 MIDWAY MFG.CO.\n\n" @@ -134,31 +134,31 @@ void Kpacman::menu() aboutText.replace(QRegExp("@VERSION@"), VERSION); QPopupMenu *helpPopup = helpMenu(aboutText, FALSE); #endif //_menuBar = new KMenuBar(this); //CHECK_PTR( _menuBar ); - //_menuBar->insertItem(i18n("&Game"), gamePopup); - //_menuBar->insertItem(i18n("&Options"), optionsPopup); + //_menuBar->insertItem(tr("&Game"), gamePopup); + //_menuBar->insertItem(tr("&Options"), optionsPopup); //_menuBar->insertSeparator(); #ifndef QWS - _menuBar->insertItem(i18n("&Help"), helpPopup); + _menuBar->insertItem(tr("&Help"), helpPopup); #endif } int Kpacman::lookupSchemes() { APP_CONFIG_BEGIN( cfg ); int ModeCount = cfg->readNumEntry("ModeCount", -1); int Mode = cfg->readNumEntry("Mode", -1); int SchemeCount = cfg->readNumEntry("SchemeCount"); int Scheme = cfg->readNumEntry("Scheme", -1); if (SchemeCount == 0 || Scheme == -1) { - QMessageBox::warning(this, i18n("Configuration Error"), - i18n("There are no schemes defined,\n" + QMessageBox::warning(this, tr("Configuration Error"), + tr("There are no schemes defined,\n" "or no scheme is selected.")); APP_CONFIG_END( cfg ); return 0; } connect(modesPopup, SIGNAL(activated(int)), this, SLOT(schemeChecked(int))); diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp index 330c88e..215dcda 100644 --- a/noncore/games/kpacman/kpacmanwidget.cpp +++ b/noncore/games/kpacman/kpacmanwidget.cpp @@ -111,17 +111,17 @@ void KpacmanWidget::confScheme() if (bitfont != 0) delete bitfont; bitfont = new Bitfont(fontName, bitfontFirstChar, bitfontLastChar); if (bitfont->width() == 0 || bitfont->height() == 0) { - QString msg = i18n("The bitfont could not be contructed.\n\n" + QString msg = tr("The bitfont could not be contructed.\n\n" "The file '@FONTNAME@' does not exist,\n" "or is of an unknown format."); msg.replace(QRegExp("@FONTNAME@"), fontName); - // QMessageBox::critical(this, i18n("Initialization Error"), msg); + // QMessageBox::critical(this, tr("Initialization Error"), msg); printf("%s\n", msg.data()); } } RESTORE_CONFIG_GROUP( cfg, oldgroup ); APP_CONFIG_END( cfg ); diff --git a/noncore/games/kpacman/painter.cpp b/noncore/games/kpacman/painter.cpp index 16fed55..80aeab0 100644 --- a/noncore/games/kpacman/painter.cpp +++ b/noncore/games/kpacman/painter.cpp @@ -71,17 +71,17 @@ QList<QPixmap> *Painter::loadPixmap(QWidget*, QString pixmapName, if (!pixmaps->isEmpty()) pixmaps->clear(); QPixmap PIXMAP(pixmapName); if (PIXMAP.isNull() || PIXMAP.mask() == NULL) { - QString msg = i18n("The pixmap could not be contructed.\n\n" + QString msg = "The pixmap could not be contructed.\n\n" "The file '@PIXMAPNAME@' does not exist,\n" - "or is of an unknown format."); + "or is of an unknown format."; msg.replace(QRegExp("@PIXMAPNAME@"), pixmapName); - // QMessageBox::critical(parent, i18n("Initialization Error"), msg); + // QMessageBox::critical(parent, tr("Initialization Error"), msg); printf("%s\n", msg.data()); return 0; } int height = PIXMAP.height(); int width = (height == 0) ? 0 : PIXMAP.width()/(PIXMAP.width()/height); diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp index 567a8ed..9edaabd 100644 --- a/noncore/games/kpacman/referee.cpp +++ b/noncore/games/kpacman/referee.cpp @@ -92,14 +92,14 @@ void Referee::paintEvent( QPaintEvent *e) QPixmap p = pix->levelPix(); bitBlt(this, rect.x(), rect.y(), &p, rect.x(), rect.y(), rect.width(), rect.height()); } if ((gameState.testBit(GameOver) || gameState.testBit(Demonstration)) && - rect.intersects(pix->rect(board->position(fruithome), i18n("GAME OVER")))) - pix->draw(board->position(fruithome), Widget, i18n("GAME OVER"), RED); + rect.intersects(pix->rect(board->position(fruithome), tr("GAME OVER")))) + pix->draw(board->position(fruithome), Widget, tr("GAME OVER"), RED); for (Energizer *e = energizers->first(); e != 0; e = energizers->next()) { if (e && e->state() == on && rect.intersects(pix->rect(e->position(), EnergizerPix)) && !(e->position() == pacman->position() && gameState.testBit(Scoring))) { if (e->pix() != -1) @@ -154,22 +154,22 @@ void Referee::paintEvent( QPaintEvent *e) if (gameState.testBit(LevelDone) && rect.intersects(pix->rect(pacman->position(), PacmanPix))) pix->draw(pacman->position(), Widget, PacmanPix, pacman->pix()); if (gameState.testBit(Player) && - rect.intersects(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")))) - pix->draw(board->position(monsterhome, 0), Widget, i18n("PLAYER ONE"), CYAN); + rect.intersects(pix->rect(board->position(monsterhome, 0), tr("PLAYER ONE")))) + pix->draw(board->position(monsterhome, 0), Widget, tr("PLAYER ONE"), CYAN); if (gameState.testBit(Ready) && - rect.intersects(pix->rect(board->position(fruithome), i18n("READY!")))) - pix->draw(board->position(fruithome), Widget, i18n("READY!"), YELLOW); + rect.intersects(pix->rect(board->position(fruithome), tr("READY!")))) + pix->draw(board->position(fruithome), Widget, tr("READY!"), YELLOW); if (gameState.testBit(Paused) && - rect.intersects(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")))) - pix->draw((BoardWidth*BoardHeight)/2-BoardWidth, Widget, i18n("PAUSED"), RED, BLACK); + rect.intersects(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, tr("PAUSED")))) + pix->draw((BoardWidth*BoardHeight)/2-BoardWidth, Widget, tr("PAUSED"), RED, BLACK); } void Referee::timerEvent( QTimerEvent *e ) { if (gameState.testBit(HallOfFame)) return; @@ -837,16 +837,16 @@ void Referee::pause() if (!gameState.testBit(Paused)) { pausedTimer = gameTimer; stop(); stopEnergizer(); gameState.setBit(Paused); - repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")), FALSE); + repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, tr("PAUSED")), FALSE); } else { gameState.clearBit(Paused); - repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, i18n("PAUSED")), FALSE); + repaint(pix->rect((BoardWidth*BoardHeight)/2-BoardWidth, tr("PAUSED")), FALSE); if (pausedTimer) { pausedTimer = 0; start(); } } emit togglePaused(); @@ -903,39 +903,39 @@ void Referee::introMonster(int id) void Referee::introPaint(int t) { QString pts; switch (t) { - case 0 : repaint(pix->draw(16, 6, RoomPix, i18n("CHARACTER"), WHITE, QColor(), AlignLeft), FALSE); - repaint(pix->draw(36, 6, RoomPix, i18n("/"), WHITE, QColor(), AlignLeft), FALSE); - repaint(pix->draw(40, 6, RoomPix, i18n("NICKNAME"), WHITE, QColor(), AlignLeft), FALSE); + case 0 : repaint(pix->draw(16, 6, RoomPix, tr("CHARACTER"), WHITE, QColor(), AlignLeft), FALSE); + repaint(pix->draw(36, 6, RoomPix, tr("/"), WHITE, QColor(), AlignLeft), FALSE); + repaint(pix->draw(40, 6, RoomPix, tr("NICKNAME"), WHITE, QColor(), AlignLeft), FALSE); break; case 1 : introMonster(0); break; - case 2 : repaint(pix->draw(16, 10, RoomPix, i18n("-SHADOW"), RED, QColor(), AlignLeft), FALSE); + case 2 : repaint(pix->draw(16, 10, RoomPix, tr("-SHADOW"), RED, QColor(), AlignLeft), FALSE); break; - case 3 : repaint(pix->draw(38, 10, RoomPix, i18n("\"BLINKY\""), RED, QColor(), AlignLeft), FALSE); + case 3 : repaint(pix->draw(38, 10, RoomPix, tr("\"BLINKY\""), RED, QColor(), AlignLeft), FALSE); break; case 4 : introMonster(1); break; - case 5 : repaint(pix->draw(16, 16, RoomPix, i18n("-SPEEDY"), PINK, QColor(), AlignLeft), FALSE); + case 5 : repaint(pix->draw(16, 16, RoomPix, tr("-SPEEDY"), PINK, QColor(), AlignLeft), FALSE); break; - case 6 : repaint(pix->draw(38, 16, RoomPix, i18n("\"PINKY\""), PINK, QColor(), AlignLeft), FALSE); + case 6 : repaint(pix->draw(38, 16, RoomPix, tr("\"PINKY\""), PINK, QColor(), AlignLeft), FALSE); break; case 7 : introMonster(2); break; - case 8 : repaint(pix->draw(16, 22, RoomPix, i18n("-BASHFUL"), CYAN, QColor(), AlignLeft), FALSE); + case 8 : repaint(pix->draw(16, 22, RoomPix, tr("-BASHFUL"), CYAN, QColor(), AlignLeft), FALSE); break; - case 9 : repaint(pix->draw(38, 22, RoomPix, i18n("\"INKY\""), CYAN, QColor(), AlignLeft), FALSE); + case 9 : repaint(pix->draw(38, 22, RoomPix, tr("\"INKY\""), CYAN, QColor(), AlignLeft), FALSE); break; case 10 : introMonster(3); break; - case 11 : repaint(pix->draw(16, 28, RoomPix, i18n("-POKEY"), ORANGE, QColor(), AlignLeft), FALSE); + case 11 : repaint(pix->draw(16, 28, RoomPix, tr("-POKEY"), ORANGE, QColor(), AlignLeft), FALSE); break; - case 12 : repaint(pix->draw(38, 28, RoomPix, i18n("\"CLYDE\""), ORANGE, QColor(), AlignLeft), FALSE); + case 12 : repaint(pix->draw(38, 28, RoomPix, tr("\"CLYDE\""), ORANGE, QColor(), AlignLeft), FALSE); break; case 13 : pts.sprintf("%d", pointScore); repaint(pix->draw(28, 44, RoomPix, pts.data(), WHITE, QColor(), AlignRight), FALSE); repaint(pix->draw(31, 44, RoomPix, "\x1C\x1D\x1E", WHITE, QColor(), AlignLeft), FALSE); pts.sprintf("%d", energizerScore); repaint(pix->draw(28, 48, RoomPix, pts.data(), WHITE, QColor(), AlignRight), FALSE); @@ -1093,14 +1093,14 @@ void Referee::play() repaint(); emit toggleNew(); emit setLifes(lifes); emit setLevel(level); emit setPoints(points); - repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), FALSE); - repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); + repaint(pix->rect(board->position(monsterhome, 0), tr("PLAYER ONE")), FALSE); + repaint(pix->rect(board->position(fruithome), tr("READY!")), FALSE); timerCount = 0; QTimer::singleShot(playerDurMS, this, SLOT(ready())); } void Referee::ready() @@ -1111,26 +1111,26 @@ void Referee::ready() } if (gameState.testBit(Player)) { emit setLifes(--lifes); gameState.clearBit(Player); gameState.clearBit(Init); - repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), FALSE); + repaint(pix->rect(board->position(monsterhome, 0), tr("PLAYER ONE")), FALSE); repaintFigures(); QTimer::singleShot(playerDurMS, this, SLOT(ready())); return; } if (gameState.testBit(Ready)) { gameState.clearBit(Ready); - repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); + repaint(pix->rect(board->position(fruithome), tr("READY!")), FALSE); start(); } else { gameState.setBit(Ready); gameState.clearBit(Init); - repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); + repaint(pix->rect(board->position(fruithome), tr("READY!")), FALSE); QTimer::singleShot(readyDurMS, this, SLOT(ready())); } } void Referee::levelUp() @@ -1291,13 +1291,13 @@ void Referee::killedPlay() gameState.setBit(GameOver); gameState.clearBit(Playing); for (int e = 0; e < board->energizers(); e++) { energizers->at(e)->setOff(); repaint(pix->rect(board->position(energizer, e), EnergizerPix), FALSE); } - repaint(pix->rect(board->position(fruithome), i18n("GAME OVER")), FALSE); + repaint(pix->rect(board->position(fruithome), tr("GAME OVER")), FALSE); QTimer::singleShot(gameOverDurMS, this, SLOT(hallOfFame())); } else { gameState.clearBit(Init); initPacman(); initFruit(); initMonsters(); diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp index 6e660e8..17dbf0a 100644 --- a/noncore/games/kpacman/score.cpp +++ b/noncore/games/kpacman/score.cpp @@ -72,32 +72,32 @@ Score::~Score() { // write(); } void Score::paintEvent( QPaintEvent *e) { - if (rect(1, 0, i18n(" 1UP ")).intersects(e->rect())) { + if (rect(1, 0, tr(" 1UP ")).intersects(e->rect())) { QPixmap pix; QColor fg = BLACK; if (cursor.on || paused || lastPlayer != 0) fg = WHITE; - pix = bitfont->text(i18n(" 1UP "), fg, BLACK); + pix = bitfont->text(tr(" 1UP "), fg, BLACK); bitBlt(this, x(1), y(0), &pix); } - if (rect(8, 0, i18n(" HIGH SCORE ")).intersects(e->rect())) { - QPixmap pix = bitfont->text(i18n(" HIGH SCORE "), WHITE, BLACK); + if (rect(8, 0, tr(" HIGH SCORE ")).intersects(e->rect())) { + QPixmap pix = bitfont->text(tr(" HIGH SCORE "), WHITE, BLACK); bitBlt(this, x(8), y(0), &pix); } - if (maxPlayer > 1 && rect(21, 0, i18n(" 2UP ")).intersects(e->rect())) { + if (maxPlayer > 1 && rect(21, 0, tr(" 2UP ")).intersects(e->rect())) { QPixmap pix; QColor fg = BLACK; if (cursor.on || paused || lastPlayer != 1) fg = WHITE; - pix = bitfont->text(i18n(" 2UP "), fg, BLACK); + pix = bitfont->text(tr(" 2UP "), fg, BLACK); bitBlt(this, x(21), y(0), &pix); } QString s; s.sprintf("%6d0", playerScore[0]/10); @@ -110,32 +110,32 @@ void Score::paintEvent( QPaintEvent *e) if (rect(8, 1, s).intersects(e->rect())) { QPixmap pix = bitfont->text(s, WHITE, BLACK); bitBlt(this, x(8), y(1), &pix); } if (lastScore >= 0) { - if (rect(1, 4*1.25, i18n(" CONGRATULATIONS ")).intersects(e->rect())) { - QPixmap pix = bitfont->text(i18n(" CONGRATULATIONS "), YELLOW, BLACK); + if (rect(1, 4*1.25, tr(" CONGRATULATIONS ")).intersects(e->rect())) { + QPixmap pix = bitfont->text(tr(" CONGRATULATIONS "), YELLOW, BLACK); bitBlt(this, x(1), y(4*1.25), &pix); } - if (rect(1, 6*1.25, i18n(" YOU HAVE ARCHIEVED ")).intersects(e->rect())) { - QPixmap pix = bitfont->text(i18n(" YOU HAVE ARCHIEVED "), CYAN, BLACK); + if (rect(1, 6*1.25, tr(" YOU HAVE ARCHIEVED ")).intersects(e->rect())) { + QPixmap pix = bitfont->text(tr(" YOU HAVE ARCHIEVED "), CYAN, BLACK); bitBlt(this, x(1), y(6*1.25), &pix); } - if (rect(1, 7*1.25, i18n(" A SCORE IN THE TOP 10. ")).intersects(e->rect())) { - QPixmap pix = bitfont->text(i18n(" A SCORE IN THE TOP 10. "), CYAN, BLACK); + if (rect(1, 7*1.25, tr(" A SCORE IN THE TOP 10. ")).intersects(e->rect())) { + QPixmap pix = bitfont->text(tr(" A SCORE IN THE TOP 10. "), CYAN, BLACK); bitBlt(this, x(1), y(7*1.25), &pix); } - if (rect(1, 8*1.25, i18n(" ")).intersects(e->rect())) { - QPixmap pix = bitfont->text(i18n(" "), CYAN, BLACK); + if (rect(1, 8*1.25, tr(" ")).intersects(e->rect())) { + QPixmap pix = bitfont->text(tr(" "), CYAN, BLACK); bitBlt(this, x(1), y(8*1.25), &pix); } } - if (rect(1, 9.5*1.25, i18n("RNK SCORE NAME DATE")).intersects(e->rect())) { - QPixmap pix = bitfont->text(i18n("RNK SCORE NAME DATE"), WHITE, BLACK); + if (rect(1, 9.5*1.25, tr("RNK SCORE NAME DATE")).intersects(e->rect())) { + QPixmap pix = bitfont->text(tr("RNK SCORE NAME DATE"), WHITE, BLACK); bitBlt(this, x(1), y(9.5*1.25), &pix); } for (int i = 0; i < 10; i++) { s.sprintf("%2d%9d %-3.3s %-8.8s", i+1, hallOfFame[i].points, hallOfFame[i].name.utf8().data(), @@ -152,14 +152,14 @@ void Score::paintEvent( QPaintEvent *e) bitBlt(this, x(cursor.x), y(cursor.y*1.25), &pix); } } if (paused) { - QPixmap pix = bitfont->text(i18n("PAUSED"), RED, BLACK); - QRect r = bitfont->rect(i18n("PAUSED")); + QPixmap pix = bitfont->text(tr("PAUSED"), RED, BLACK); + QRect r = bitfont->rect(tr("PAUSED")); r.moveCenter(QPoint(this->width()/2, this->height()/2)); bitBlt(this, r.x(), r.y(), &pix); } } @@ -172,16 +172,16 @@ void Score::timerEvent(QTimerEvent*) if (cursor.x != -1 && cursor.y != -1) repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), FALSE); scrollRepeat = FALSE; if (lastPlayer == 0) - repaint(rect(1, 0, i18n(" 1UP ")), FALSE); + repaint(rect(1, 0, tr(" 1UP ")), FALSE); if (lastPlayer == 1) - repaint(rect(21, 0, i18n(" 2UP ")), FALSE); + repaint(rect(21, 0, tr(" 2UP ")), FALSE); } void Score::keyPressEvent(QKeyEvent *k) { if (lastScore < 0 || lastPlayer < 0 || lastPlayer >= maxPlayer || paused) { k->ignore(); @@ -478,26 +478,26 @@ void Score::read() void Score::write() { #ifndef QWS if (!highscoreFile.exists() && highscoreFile.name() == systemHighscoreFileInfo.filePath()) KMessageBox::information(0, - i18n("You're going to create the highscore-file\n" + tr("You're going to create the highscore-file\n" "'%1'\n" "for your maschine, that should be used systemwide.\n" "\n" "To grant access to the other users, set the appropriate rights (a+w)\n" "on that file or ask your systemadministator for that favor.\n" "\n" "To use a different directory or filename for the highscores," "specify them in the configfile (kpacmanrc:highscoreFilePath)." ).arg(systemHighscoreFileInfo.filePath())); if (highscoreFile.name() == privateHighscoreFileInfo.filePath()) KMessageBox::information(0, - i18n("You're using a private highscore-file, that's mostly because of\n" + tr("You're using a private highscore-file, that's mostly because of\n" "missing write-access to the systemwide file\n" "'%1' .\n" "\n" "Ask your systemadministrator for granting you access to that file,\n" "by setting the appropriate rights (a+w) on it.\n" "\n" @@ -516,13 +516,13 @@ void Score::write() } void Score::setPause(bool Paused) { paused = Paused; - QRect r = bitfont->rect(i18n("PAUSED")); + QRect r = bitfont->rect(tr("PAUSED")); r.moveCenter(QPoint(this->width()/2, this->height()/2)); repaint(r, TRUE); // repaint 1UP or 2UP repaint(FALSE); } @@ -544,13 +544,13 @@ void Score::end() /* * Return the date in a formatted QString. The format can be changed using internationalization * of the string "YY/MM/DD". Invalid QDate's where returned as "00/00/00". */ QString Score::formatDate(QDate date) { - QString s = i18n("@YY@/@MM@/@DD@"); + QString s = tr("@YY@/@MM@/@DD@"); QString dd; dd.sprintf("%02d", date.isValid() ? date.year() % 100 : 0); s.replace(QRegExp("@YY@"), dd); dd.sprintf("%02d", date.isValid() ? date.month() : 0); s.replace(QRegExp("@MM@"), dd); diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp index 00d1f22..3453d37 100644 --- a/noncore/games/kpacman/status.cpp +++ b/noncore/games/kpacman/status.cpp @@ -45,17 +45,17 @@ QList<QPixmap> *Status::loadPixmap(QWidget *parent, QString pixmapName, if (!pixmaps->isEmpty()) pixmaps->clear(); QPixmap PIXMAP(pixmapName); if (PIXMAP.isNull() || PIXMAP.mask() == NULL) { - QString msg = i18n("The pixmap could not be contructed.\n\n" + QString msg = tr("The pixmap could not be contructed.\n\n" "The file '@PIXMAPNAME@' does not exist,\n" "or is of an unknown format."); msg.replace(QRegExp("@PIXMAPNAME@"), pixmapName); - QMessageBox::information(parent, i18n("Initialization Error"), + QMessageBox::information(parent, tr("Initialization Error"), (const char *) msg); return 0; } int height = PIXMAP.height(); int width = (height == 0) ? 0 : PIXMAP.width()/(PIXMAP.width()/height); |