From d146fd63b94d71b8b56f11be148260b4fe65dd36 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arto=20Hyv=C3=A4ttinen?= Date: Fri, 20 Aug 2010 15:54:19 +0300 Subject: [PATCH] Dialog labels corrected, about added --- chessclockwindow.cpp | 19 +++++++++++++++++++ chessclockwindow.h | 2 ++ classes/timecontrol/basicdialog.cpp | 2 +- classes/timecontrol/delaytimecontrol.cpp | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/chessclockwindow.cpp b/chessclockwindow.cpp index b30b5f3..496fdf9 100644 --- a/chessclockwindow.cpp +++ b/chessclockwindow.cpp @@ -65,6 +65,8 @@ ChessClockWindow::ChessClockWindow(QWidget *parent) menuBar()->addAction( tr("Pause"), this, SLOT(pause())); menuBar()->addAction( tr("New game"), this, SLOT(newGame())); menuBar()->addAction( tr("Visit web page"), this, SLOT(visitWeb())); + menuBar()->addAction( tr("About"),this, SLOT(about())); + menuBar()->addAction(tr("About Qt"), this, SLOT(aboutQt())) } @@ -97,6 +99,23 @@ void ChessClockWindow::visitWeb() process->start(QString("browser --url=chessclock.garage.maemo.org")); } +void ChessClockWindow::about() +{ + pause(); + QMessageBox::about(this, tr("About ChessClock"), + tr("

Chess Clock %1

" + "©Arto Hyvättinen 2010" + "

Chess Clock is free software under the terms of GNU General Public License 3" + "

Bugtracker and instructions at checkclock.garage.maemo.org" + ).arg(qApp->applicationVersion())) +} + +void ChessClockWindow::aboutQt() +{ + pause(); + qApp->aboutQt(); +} + void ChessClockWindow::initTimeControls() { diff --git a/chessclockwindow.h b/chessclockwindow.h index 30bb8ed..d17d979 100644 --- a/chessclockwindow.h +++ b/chessclockwindow.h @@ -43,6 +43,8 @@ public slots: void newGame(); /*! Visit ChessClock web page */ void visitWeb(); + void about(); + void aboutQt(); protected: diff --git a/classes/timecontrol/basicdialog.cpp b/classes/timecontrol/basicdialog.cpp index 51a37b1..01914dc 100644 --- a/classes/timecontrol/basicdialog.cpp +++ b/classes/timecontrol/basicdialog.cpp @@ -45,7 +45,7 @@ BasicDialog::BasicDialog(QString timeControlName, QWidget *parent) : whiteAddition_ = initTimeEdit(); blackAddition_ = initTimeEdit(); // Turns per addition - perTurnLabel_ = new QLabel( tr("Addition per turn")); + perTurnLabel_ = new QLabel( tr("Turns per addition")); whiteTurns_=new QSpinBox; whiteTurns_->setRange(1,99); diff --git a/classes/timecontrol/delaytimecontrol.cpp b/classes/timecontrol/delaytimecontrol.cpp index 0d6a7ff..dfe085f 100644 --- a/classes/timecontrol/delaytimecontrol.cpp +++ b/classes/timecontrol/delaytimecontrol.cpp @@ -25,6 +25,7 @@ #include "basicdialog.h" #include +#include DelayTimeControl::DelayTimeControl() { @@ -49,6 +50,7 @@ ClocksWidget* DelayTimeControl::initGame(bool useLastSettings) { BasicDialog dialog(getName()); dialog.disablePerTurns(); + dialog.additionLabel_->setText(qApp->translate("Delay","Delay time")); dialog.init(); if( useLastSettings || dialog.exec() == QDialog::Accepted) -- 1.7.9.5