projects
/
impuzzle
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changing settings dialog logic and menu changes
[impuzzle]
/
src
/
mainwindow.cpp
diff --git
a/src/mainwindow.cpp
b/src/mainwindow.cpp
index
fea49c2
..
e2b2b19
100644
(file)
--- a/
src/mainwindow.cpp
+++ b/
src/mainwindow.cpp
@@
-59,11
+59,13
@@
MainWindow *MainWindow::instance()
void MainWindow::createMenu()
{
void MainWindow::createMenu()
{
- menu_ = menuBar()->addMenu("");
+ menu_ = menuBar()->addMenu("&Game");
menu_->addAction(newGameAction_);
menu_->addAction(saveAction_);
menu_->addAction(newGameAction_);
menu_->addAction(saveAction_);
- menu_->addAction(aboutAction_);
menu_->addAction(importAction_);
menu_->addAction(importAction_);
+
+ helpMenu_ = menuBar()->addMenu("&Help");
+ helpMenu_->addAction(aboutAction_);
}
void MainWindow::createActions()
}
void MainWindow::createActions()
@@
-90,10
+92,13
@@
void MainWindow::importClicked()
void MainWindow::newGameClicked()
{
void MainWindow::newGameClicked()
{
- settingsDialog_->exec();
+ int r = settingsDialog_->exec();
- GameView::instance()->setPieces(ImageImporter::instance()->newPieces(Settings::instance()->image(), Settings::instance()->pieceCount()));
- enableSaving();
+ if(r) {
+ GameView::instance()->setPieces(ImageImporter::instance()->newPieces(Settings::instance()->image(), Settings::instance()->pieceCount()));
+ enableSaving();
+ PuzzleItem::setMoveCount(0);
+ }
}
void MainWindow::aboutClicked()
}
void MainWindow::aboutClicked()