From 434b0c4e94e2ff4c3a44483892a44a227f081e71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arto=20Hyv=C3=A4ttinen?= Date: Mon, 16 Aug 2010 15:11:36 +0300 Subject: [PATCH] Tryied to fix unspecified bugs --- chessclockwindow.cpp | 3 +++ classes/clockswidget.cpp | 6 ++++++ classes/clockswidget.h | 1 + classes/startwidget.cpp | 8 ++++++-- classes/timecontrol/basicdialog.cpp | 2 +- classes/timecontrol/fischertimecontrol.cpp | 4 ++-- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/chessclockwindow.cpp b/chessclockwindow.cpp index 8bbd15a..0ab4e48 100644 --- a/chessclockwindow.cpp +++ b/chessclockwindow.cpp @@ -96,7 +96,10 @@ void ChessClockWindow::startGame(TimeControl *timecontrol) if( newWidget ) { if( clocks_ ) + { + stack_->removeWidget(clocks_); delete clocks_; + } clocks_ = newWidget; stack_->addWidget(clocks_); stack_->setCurrentWidget(clocks_); diff --git a/classes/clockswidget.cpp b/classes/clockswidget.cpp index d39c1f2..82cf7c3 100644 --- a/classes/clockswidget.cpp +++ b/classes/clockswidget.cpp @@ -76,6 +76,12 @@ ClocksWidget::ClocksWidget(ChessClock *white, ChessClock *black, QWidget *parent delayTimer_.start(); // Initial start } +ClocksWidget::~ClocksWidget() +{ + delete white_; + delete black_; +} + void ClocksWidget::pause() { if(status_ == WhiteTurn) diff --git a/classes/clockswidget.h b/classes/clockswidget.h index 1283d32..4f87423 100644 --- a/classes/clockswidget.h +++ b/classes/clockswidget.h @@ -47,6 +47,7 @@ class ClocksWidget : public QWidget Q_OBJECT public: ClocksWidget(ChessClock* white, ChessClock* black, QWidget *parent = 0); + ~ClocksWidget(); bool isPlayStarted() { return (status_!=Welcome); } protected: diff --git a/classes/startwidget.cpp b/classes/startwidget.cpp index b790a92..e18970b 100644 --- a/classes/startwidget.cpp +++ b/classes/startwidget.cpp @@ -49,7 +49,7 @@ StartWidget::StartWidget(QWidget *parent) : leftLayout->addWidget(titleLabel); leftLayout->addWidget(copyLabel); leftLayout->addWidget(logoLabel); - leftLayout->addWidget(introLabel); + modeSelect_ = new QListWidget(); modeSelect_->setViewMode(QListView::IconMode); @@ -59,9 +59,13 @@ StartWidget::StartWidget(QWidget *parent) : connect( modeSelect_, SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(selectControl(QListWidgetItem*))); + QVBoxLayout* rightLayout = new QVBoxLayout; + rightLayout->addWidget(introLabel); + rightLayout->addWidget(modeSelect_); + QHBoxLayout* layout = new QHBoxLayout; layout->addLayout(leftLayout); - layout->addWidget(modeSelect_); + layout->addLayout(rightLayout); setLayout( layout ); diff --git a/classes/timecontrol/basicdialog.cpp b/classes/timecontrol/basicdialog.cpp index 436f2f6..51a37b1 100644 --- a/classes/timecontrol/basicdialog.cpp +++ b/classes/timecontrol/basicdialog.cpp @@ -29,7 +29,7 @@ #include #include #include - +#include BasicDialog::BasicDialog(QString timeControlName, QWidget *parent) : QDialog(parent) diff --git a/classes/timecontrol/fischertimecontrol.cpp b/classes/timecontrol/fischertimecontrol.cpp index cc29ad0..c960e4b 100644 --- a/classes/timecontrol/fischertimecontrol.cpp +++ b/classes/timecontrol/fischertimecontrol.cpp @@ -45,10 +45,10 @@ ClocksWidget* FischerTimeControl::initGame(bool useLastSettings) { dialog.store(); FischerClock* white = new FischerClock( true, dialog.getWhiteAddition(), dialog.getWhitePerTurns()); - white->addTime(dialog.getWhiteInitial()); + white->setTimeAvailable(dialog.getWhiteInitial()); FischerClock* black = new FischerClock( false, dialog.getBlackAddition(), dialog.getBlackPerTurns()); - black->addTime( dialog.getBlackInitial()); + black->setTimeAvailable( dialog.getBlackInitial()); return( new ClocksWidget(white,black)); -- 1.7.9.5