# HG changeset patch # User displacer # Date 1200840241 0 # Node ID 033971bbe63978a1072110752459648def3b6a2c # Parent da975a75af09797de10770afecf7ad5669a04738 strange tr() diff -r da975a75af09 -r 033971bbe639 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Sun Jan 20 14:40:36 2008 +0000 +++ b/QTfrontend/pages.cpp Sun Jan 20 14:44:01 2008 +0000 @@ -60,10 +60,10 @@ pageLayout->setColumnStretch(1, 2); pageLayout->setColumnStretch(2, 1); - BtnSinglePlayer = addButton("Single Player", pageLayout, 0, 1); + BtnSinglePlayer = addButton(QPushButton::tr("Single Player"), pageLayout, 0, 1); BtnSinglePlayer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - BtnMultiplayer = addButton("Multiplayer", pageLayout, 1, 1); + BtnMultiplayer = addButton(tr("Multiplayer"), pageLayout, 1, 1); BtnMultiplayer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); BtnNet = addButton("Net game", pageLayout, 2, 1); diff -r da975a75af09 -r 033971bbe639 QTfrontend/pages.h --- a/QTfrontend/pages.h Sun Jan 20 14:40:36 2008 +0000 +++ b/QTfrontend/pages.h Sun Jan 20 14:44:01 2008 +0000 @@ -59,26 +59,26 @@ } virtual ~AbstractPage() {}; - QPushButton* addButton(const char* btname, QGridLayout* grid, int wy, int wx) { + QPushButton* addButton(QString btname, QGridLayout* grid, int wy, int wx) { QPushButton* butt = new QPushButton(this); butt->setFont(*font14); - butt->setText(QPushButton::tr(btname)); + butt->setText(btname); grid->addWidget(butt, wy, wx); return butt; }; - QPushButton* addButton(const char* btname, QGridLayout* grid, int wy, int wx, int rowSpan, int columnSpan) { + QPushButton* addButton(QString btname, QGridLayout* grid, int wy, int wx, int rowSpan, int columnSpan) { QPushButton* butt = new QPushButton(this); butt->setFont(*font14); - butt->setText(QPushButton::tr(btname)); + butt->setText(btname); grid->addWidget(butt, wy, wx, rowSpan, columnSpan); return butt; }; - QPushButton* addButton(const char* btname, QBoxLayout* box, int where) { + QPushButton* addButton(QString btname, QBoxLayout* box, int where) { QPushButton* butt = new QPushButton(this); butt->setFont(*font14); - butt->setText(QPushButton::tr(btname)); + butt->setText(btname); box->addWidget(butt, where); return butt; };