Dialog labels corrected, about added

diff --git a/chessclockwindow.cpp b/chessclockwindow.cpp
index b30b5f3..496fdf9 100644 (file)
--- 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("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"));
 }
 
     process->start(QString("browser --url=chessclock.garage.maemo.org"));
 }
 

+void ChessClockWindow::about()
+{
+    pause();
+    QMessageBox::about(this, tr("About ChessClock"),
+                       tr("<h1>Chess Clock %1</h1>"
+                          "&copy;Arto Hyv&auml;ttinen 2010"
+                          "<p>Chess Clock is free software under the terms of GNU General Public License 3"
+                          "<p>Bugtracker and instructions at <a>checkclock.garage.maemo.org</a>"
+                          ).arg(qApp->applicationVersion()))
+}
+
+void ChessClockWindow::aboutQt()
+{
+    pause();
+    qApp->aboutQt();
+}
+

 
 void ChessClockWindow::initTimeControls()
 {
 
 void ChessClockWindow::initTimeControls()
 {

diff --git a/chessclockwindow.h b/chessclockwindow.h
index 30bb8ed..d17d979 100644 (file)
--- a/chessclockwindow.h
+++ b/chessclockwindow.h
@@ -43,6 +43,8 @@ public slots:
     void newGame();
     /*! Visit ChessClock web page */
     void visitWeb();
     void newGame();
     /*! Visit ChessClock web page */
     void visitWeb();

+    void about();
+    void aboutQt();

 
 
 protected:
 
 
 protected:

diff --git a/classes/timecontrol/basicdialog.cpp b/classes/timecontrol/basicdialog.cpp
index 51a37b1..01914dc 100644 (file)
--- 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
     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);
 
     whiteTurns_=new QSpinBox;
     whiteTurns_->setRange(1,99);
 

diff --git a/classes/timecontrol/delaytimecontrol.cpp b/classes/timecontrol/delaytimecontrol.cpp
index 0d6a7ff..dfe085f 100644 (file)
--- a/classes/timecontrol/delaytimecontrol.cpp
+++ b/classes/timecontrol/delaytimecontrol.cpp
@@ -25,6 +25,7 @@
 #include "basicdialog.h"
 
 #include <QApplication>
 #include "basicdialog.h"
 
 #include <QApplication>

+#include <QLabel>

 
 DelayTimeControl::DelayTimeControl()
 {
 
 DelayTimeControl::DelayTimeControl()
 {

@@ -49,6 +50,7 @@ ClocksWidget* DelayTimeControl::initGame(bool useLastSettings)
 {
     BasicDialog dialog(getName());
     dialog.disablePerTurns();
 {
     BasicDialog dialog(getName());
     dialog.disablePerTurns();

+    dialog.additionLabel_->setText(qApp->translate("Delay","Delay time"));

     dialog.init();
 
     if( useLastSettings || dialog.exec() == QDialog::Accepted)
     dialog.init();
 
     if( useLastSettings || dialog.exec() == QDialog::Accepted)