author | cniehaus <cniehaus> | 2003-06-01 13:48:07 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-06-01 13:48:07 (UTC) |
commit | 145faa6417fd952768d0abe15cc8b9920548d45f (patch) (side-by-side diff) | |
tree | d78efad22827115e07bf584425bf666f0f8d7e47 /noncore/games | |
parent | 316ced6af8e9492215ad0a39d43127665239503d (diff) | |
download | opie-145faa6417fd952768d0abe15cc8b9920548d45f.zip opie-145faa6417fd952768d0abe15cc8b9920548d45f.tar.gz opie-145faa6417fd952768d0abe15cc8b9920548d45f.tar.bz2 |
first patches for tr()-changes\!
-rw-r--r-- | noncore/games/backgammon/aidialog.cpp | 44 | ||||
-rw-r--r-- | noncore/games/backgammon/backgammon.cpp | 48 |
2 files changed, 46 insertions, 46 deletions
diff --git a/noncore/games/backgammon/aidialog.cpp b/noncore/games/backgammon/aidialog.cpp index 9642ca5..7dfe403 100644 --- a/noncore/games/backgammon/aidialog.cpp +++ b/noncore/games/backgammon/aidialog.cpp @@ -1,84 +1,84 @@ #include "aidialog.h" #include <qgroupbox.h> AI_Dialog::AI_Dialog(QWidget* parent,const char* name,bool modal,WFlags f) : QDialog(parent,name,modal,f) { setCaption("AI Configuration"); - QGroupBox* settings=new QGroupBox("Settings",this); + QGroupBox* settings=new QGroupBox(tr( "Settings" ),this); settings->setGeometry(10,5,220,170); - QLabel* rescue_label=new QLabel("<b>Rescue</b>",settings); + QLabel* rescue_label=new QLabel(tr( "<b>Rescue</b>" ),settings); rescue_label->setGeometry(50,20,50,20); rescue=new QSpinBox(0,6,1,settings); rescue->setGeometry(100,20,40,20); - QPushButton* rescuehelp=new QPushButton("?",settings); + QPushButton* rescuehelp=new QPushButton(tr( "?" ),settings); rescuehelp->setGeometry(140,20,20,20); connect(rescuehelp,SIGNAL(pressed()),this,SLOT(rescuehelp_pressed())); connect(rescuehelp,SIGNAL(released()),this,SLOT(rescuehelp_released())); - QLabel* eliminate_label=new QLabel("<b>Eliminate</b>",settings); + QLabel* eliminate_label=new QLabel(tr( "<b>Eliminate</b>" ),settings); eliminate_label->setGeometry(50,40,50,20); eliminate=new QSpinBox(0,6,1,settings); eliminate->setGeometry(100,40,40,20); - QPushButton* eliminatehelp=new QPushButton("?",settings); + QPushButton* eliminatehelp=new QPushButton(tr( "?" ),settings); eliminatehelp->setGeometry(140,40,20,20); connect(eliminatehelp,SIGNAL(pressed()),this,SLOT(eliminatehelp_pressed())); connect(eliminatehelp,SIGNAL(released()),this,SLOT(eliminatehelp_released())); - QLabel* expose_label=new QLabel("<b>Expose</b>",settings); + QLabel* expose_label=new QLabel(tr( "<b>Expose</b>" ),settings); expose_label->setGeometry(50,60,50,20); expose=new QSpinBox(0,6,1,settings); expose->setGeometry(100,60,40,20); - QPushButton* exposeehelp=new QPushButton("?",settings); + QPushButton* exposeehelp=new QPushButton(tr( "?" ),settings); exposeehelp->setGeometry(140,60,20,20); connect(exposeehelp,SIGNAL(pressed()),this,SLOT(exposehelp_pressed())); connect(exposeehelp,SIGNAL(released()),this,SLOT(exposehelp_released())); - QLabel* protect_label=new QLabel("<b>Protect</b>",settings); + QLabel* protect_label=new QLabel(tr( "<b>Protect</b>" ),settings); protect_label->setGeometry(50,80,50,20); protect=new QSpinBox(0,6,1,settings); protect->setGeometry(100,80,40,20); - QPushButton* protecthelp=new QPushButton("?",settings); + QPushButton* protecthelp=new QPushButton(tr( "?" ),settings); protecthelp->setGeometry(140,80,20,20); connect(protecthelp,SIGNAL(pressed()),this,SLOT(protecthelp_pressed())); connect(protecthelp,SIGNAL(released()),this,SLOT(protecthelp_released())); - QLabel* safe_label=new QLabel("<b>Safe</b>",settings); + QLabel* safe_label=new QLabel(tr( "<b>Safe</b>" ),settings); safe_label->setGeometry(50,100,50,20); safe=new QSpinBox(0,6,1,settings); safe->setGeometry(100,100,40,20); - QPushButton* safeehelp=new QPushButton("?",settings); + QPushButton* safeehelp=new QPushButton(tr( "?" ),settings); safeehelp->setGeometry(140,100,20,20); connect(safeehelp,SIGNAL(pressed()),this,SLOT(safehelp_pressed())); connect(safeehelp,SIGNAL(released()),this,SLOT(safehelp_released())); - QLabel* empty_label=new QLabel("<b>Empty</b>",settings); + QLabel* empty_label=new QLabel(tr( "<b>Empty</b>" ),settings); empty_label->setGeometry(50,120,50,20); empty=new QSpinBox(0,6,1,settings); empty->setGeometry(100,120,40,20); - QPushButton* emptyhelp=new QPushButton("?",settings); + QPushButton* emptyhelp=new QPushButton(tr( "?" ),settings); emptyhelp->setGeometry(140,120,20,20); connect(emptyhelp,SIGNAL(pressed()),this,SLOT(emptyhelp_pressed())); connect(emptyhelp,SIGNAL(released()),this,SLOT(emptyhelp_released())); - defaultvalues=new QPushButton("Default Values",settings); + defaultvalues=new QPushButton(tr( "Default Values" ),settings); defaultvalues->setGeometry(60,140,90,20); connect(defaultvalues,SIGNAL(clicked()),this,SLOT(setDefaultValues())); - QGroupBox* helpbox=new QGroupBox("Help",this); + QGroupBox* helpbox=new QGroupBox(tr( "Help" ),this); helpbox->setGeometry(10,185,220,90); help=new QLabel(helpbox); help->setGeometry(10,15,200,65); setHelpText(); showMaximized(); } AI_Dialog::~AI_Dialog() { @@ -173,39 +173,39 @@ AISettings AI_Dialog::getAISettings() ai.eliminate=eliminate->value(); ai.expose=expose->value(); ai.protect=protect->value(); ai.safe= safe->value(); ai.empty=empty->value(); return ai; } void AI_Dialog::setHelpText(const QString& type) { if(type=="rescue") { - help->setText("Bring the pieces out of the endzone"); + help->setText(tr( "Bring the pieces out of the endzone" )); } else if(type=="eliminate") { - help->setText("Eliminate an opponents piece"); + help->setText(tr( "Eliminate an opponents piece" )); } else if(type=="expose") { - help->setText("Expose you own pieces.\nAfter such a move only one piece will remain in the slot"); + help->setText(tr( "Expose you own pieces.\nAfter such a move only one piece will remain in the slot") ); } else if(type=="protect") { - help->setText("Protect a single piece by\nputting another one in this slot"); + help->setText(tr( "Protect a single piece by\nputting another one in this slot" )); } else if(type=="safe") { - help->setText("Move piece to a slot already\noccupied by the player"); + help->setText(tr( "Move piece to a slot already\noccupied by the player" )); } else if(type=="empty") { - help->setText("Move piece to an empty slot"); + help->setText(tr( "Move piece to an empty slot") ); } else { - help->setText("Press and hold the ? buttton\nnext to a field for help"); + help->setText(tr( "Press and hold the ? buttton\nnext to a field for help") ); } } diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp index c40f462..06523f1 100644 --- a/noncore/games/backgammon/backgammon.cpp +++ b/noncore/games/backgammon/backgammon.cpp @@ -16,25 +16,25 @@ #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/qpemenubar.h> #include <qpe/resource.h> #include <stdlib.h> BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) : QMainWindow(parent, name, fl) { if (!name) setName("BackGammon"); - setCaption("Backgammon"); + setCaption(tr( "Backgammon") ); setIcon( Resource::loadPixmap( "backgammon" ) ); //general counter varaible int a=0; //the game engine move=new MoveEngine(); //load the default theme Config conf("backgammon"); if(!conf.isValid()) { qDebug("config file does not exist"); conf.setGroup("general"); @@ -96,48 +96,48 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) piecesA_name=theme.readEntry("pieces1","casino_pieces_blue"); piecesB_name=theme.readEntry("pieces2","casino_pieces_white"); diceA_name=theme.readEntry("dice1","casino_dice"); diceB_name=theme.readEntry("dice2","casino_dice"); table_name=theme.readEntry("table","casino_table_green"); odds_name=theme.readEntry("odds","casino_odds"); //the menu QPEMenuBar* menuBar = new QPEMenuBar(this); QPopupMenu* gamemenu= new QPopupMenu(this); - gamemenu->insertItem("New",this,SLOT(newgame())); + gamemenu->insertItem(tr( "New" ),this,SLOT(newgame())); gamemenu->insertSeparator(); - gamemenu->insertItem("Load",this,SLOT(loadgame())); - gamemenu->insertItem("Save",this,SLOT(savegame())); + gamemenu->insertItem(tr( "Load" ),this,SLOT(loadgame())); + gamemenu->insertItem(tr( "Save" ),this,SLOT(savegame())); gamemenu->insertSeparator(); - gamemenu->insertItem("Delete",this,SLOT(deletegame())); - menuBar->insertItem("Game",gamemenu); + gamemenu->insertItem(tr( "Delete" ),this,SLOT(deletegame())); + menuBar->insertItem(tr( "Game" ),gamemenu); QPopupMenu* thememenu= new QPopupMenu(this); - thememenu->insertItem("New",this,SLOT(newtheme())); + thememenu->insertItem(tr( "New" ),this,SLOT(newtheme())); thememenu->insertSeparator(); - thememenu->insertItem("Load",this,SLOT(loadtheme())); - thememenu->insertItem("Save",this,SLOT(savetheme())); + thememenu->insertItem(tr( "Load"),this,SLOT(loadtheme())); + thememenu->insertItem(tr( "Save" ),this,SLOT(savetheme())); thememenu->insertSeparator(); - thememenu->insertItem("Default",this,SLOT(themedefault())); - thememenu->insertItem("Delete",this,SLOT(deletetheme())); - menuBar->insertItem("Theme",thememenu); + thememenu->insertItem(tr( "Default"),this,SLOT(themedefault())); + thememenu->insertItem(tr( "Delete" ),this,SLOT(deletetheme())); + menuBar->insertItem(tr( "Theme" ),thememenu); QPopupMenu* optionmenu=new QPopupMenu(this); - optionmenu->insertItem("Player",this,SLOT(playerselect())); + optionmenu->insertItem(tr( "Player" ),this,SLOT(playerselect())); optionmenu->insertSeparator(); - optionmenu->insertItem("AI",this,SLOT(modify_AI())); - optionmenu->insertItem("Rules",this,SLOT(setrules())); - menuBar->insertItem("Options",optionmenu); + optionmenu->insertItem(tr( "AI" ),this,SLOT(modify_AI())); + optionmenu->insertItem(tr( "Rules" ),this,SLOT(setrules())); + menuBar->insertItem(tr( "Options"),optionmenu); QWidget* mainarea=new QWidget(this); setCentralWidget(mainarea); //the main area QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom); area=new QCanvas(235,235); boardview=new BackGammonView(area,mainarea); boardview->setMaximumHeight(240); layout->addWidget(boardview); connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int))); //status bar message=new QLabel("<b>Backgammon</b>",mainarea); @@ -501,54 +501,54 @@ void BackGammon::themedefault() conf.writeEntry("theme",theme_name); } void BackGammon::deletetheme() { FileDialog* file=new FileDialog(this,"Delete Theme",".theme"); if(!file->exec()) return; theme_name=file->filename(); QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme"; - if(!QMessageBox::warning(this,"Backgammon","deleted theme "+theme_name+" ?","OK","Cancel")) + if(!QMessageBox::warning(this,tr( "Backgammon" ),tr( "deleted theme %1?").arg(theme_name),tr( "OK" ),tr( "Cancel" ))) { QFile(theme_file).remove(); } } void BackGammon::modify_AI() { - AI_Dialog* ai_mod=new AI_Dialog(this,"Load Theme",".theme"); + AI_Dialog* ai_mod=new AI_Dialog(this,tr( "Load Theme" ),".theme"); ai_mod->setAISettings(move->getAISettings()); if(!ai_mod->exec()) return; //get the AI settings AISettings ai=ai_mod->getAISettings(); move->setAISettings(ai); //write new settings to conf file Config conf("backgammon"); conf.setGroup("ai"); conf.writeEntry("rescue",ai.rescue); conf.writeEntry("eliminate",ai.eliminate); conf.writeEntry("expose",ai.expose); conf.writeEntry("protect",ai.protect); conf.writeEntry("safe",ai.safe); conf.writeEntry("empty",ai.empty); } void BackGammon::setrules() { - RulesDialog* rulesdialog=new RulesDialog(this,"Load Theme",".theme"); + RulesDialog* rulesdialog=new RulesDialog(this,tr( "Load Theme" ),".theme"); rulesdialog->setRules(rules); if(!rulesdialog->exec()) return; rules=rulesdialog->getRules(); Config conf("backgammon"); conf.setGroup("rules"); conf.writeEntry("move_with_pieces_out",rules.move_with_pieces_out); conf.writeEntry("nice_dice",rules.generous_dice); move->setRules(rules); } @@ -790,25 +790,25 @@ void BackGammon::done_dice4() } } } void BackGammon::nomove() { if(player==1) nomove_marker->setX(0); else nomove_marker->setX(170); nomove_marker->show(); - message->setText("<b>no move</b>"); + message->setText(tr( "<b>no move</b>" )); dice1_played=true; dice2_played=true; dice3_played=true; dice4_played=true; if(player==1) { diceA1_value=7; diceA2_value=7; diceA3_value=7; diceA4_value=7; } else @@ -826,27 +826,27 @@ void BackGammon::nomove2() { nomove_marker->hide(); setplayer(); showdice(); draw(); area->update(); } void BackGammon::finished(int theplayer) { nomove_marker->hide(); if(theplayer==1) - message->setText("<b>Player 1 wins. Click on board for new game.</b>"); + message->setText(tr( "<b>Player 1 wins. Click on board for new game.</b>" )); else - message->setText("<b>Player 2 wins. Click on board for new game.</b>"); + message->setText(tr( "<b>Player 2 wins. Click on board for new game.</b>" )); diceA1_value=7; diceA2_value=7; diceB1_value=7; diceB2_value=7; player=0; showdice(); draw(); area->update(); gameFinished=true; } void BackGammon::showdice() @@ -886,33 +886,33 @@ void BackGammon::showdice() if(value_diceB2==index) diceB2[index]->show(); else diceB2[index]->hide(); } } void BackGammon::setplayer() { if(dice1_played && dice2_played && dice3_played && dice4_played && player==1) { - message->setText("<b>P2 turn</b>"); + message->setText(tr( "<b>P2 turn</b>", "P means player" )); dice_rolled=false; player=2; if(player2_auto) QTimer::singleShot(2000,this,SLOT(autoroll_dice2())); } else if(dice1_played && dice2_played && dice3_played && dice4_played && player==2) { - message->setText("<b>P1 turn</b>"); + message->setText(tr( "<b>P1 turn</b>", "P means player" )); dice_rolled=false; player=1; if(player1_auto) QTimer::singleShot(2000,this,SLOT(autoroll_dice1())); } } void BackGammon::autoroll_dice1() { mouse(20,210); } |