src/new_game_dialog.cpp src/new_game_dialog.h @@ -1,3 +1,6 @@ +2009-09-19 Graeme Gott <graeme@gottcode.org> + * Add new game dialog. + 2009-09-18 Graeme Gott <graeme@gottcode.org> * Make pause behavior consistent across platforms. * FIXED: Scores were not sorted correctly. ChangeLog @@ -24,6 +24,7 @@ unix: !macx { HEADERS = src/board.h \ src/cell.h \ src/maze.h \ + src/new_game_dialog.h \ src/path.h \ src/scores.h \ src/settings.h \ @@ -35,6 +36,7 @@ SOURCES = src/board.cpp \ src/cell.cpp \ src/main.cpp \ src/maze.cpp \ + src/new_game_dialog.cpp \ src/path.cpp \ src/scores.cpp \ src/settings.cpp \ cutemaze.pro @@ -116,14 +116,6 @@ Board::~Board() void Board::newGame() { - // Prompt user - if (!m_done) { - emit pauseChecked(true); - if (QMessageBox::question(this, tr("Question"), tr("Abort current game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No) { - return; - } - } - // Stop tracking time m_status_timer->stop(); src/board.cpp @@ -37,7 +37,6 @@ #include <QPainter> #include <QPushButton> #include <QSettings> -#include <QSpinBox> #include <QTabWidget> #include <QVBoxLayout> @@ -234,46 +233,6 @@ Settings::Settings(QWidget* parent) gameplay_layout->addWidget(m_gameplay_smooth, 4, 1); - // Create Mazes tab - QWidget* mazes_tab = new QWidget; - tabs->addTab(mazes_tab, tr("Mazes")); - - m_mazes_preview = new QLabel(mazes_tab); - - m_mazes_algorithm = new QComboBox(mazes_tab); - m_mazes_algorithm->setInsertPolicy(QComboBox::InsertAlphabetically); - connect(m_mazes_algorithm, SIGNAL(currentIndexChanged(int)), this, SLOT(algorithmSelected(int))); - m_mazes_algorithm->addItem(tr("Hunt and Kill"), 0); - m_mazes_algorithm->addItem(tr("Kruskal"), 1); - m_mazes_algorithm->addItem(tr("Prim"), 2); - m_mazes_algorithm->addItem(tr("Recursive Backtracker"), 3); - m_mazes_algorithm->addItem(tr("Stack"), 4); - m_mazes_algorithm->addItem(tr("Stack 2"), 5); - m_mazes_algorithm->addItem(tr("Stack 3"), 6); - m_mazes_algorithm->addItem(tr("Stack 4"), 7); - m_mazes_algorithm->addItem(tr("Stack 5"), 8); - - m_mazes_targets = new QSpinBox(mazes_tab); - m_mazes_targets->setRange(1, 99); - - m_mazes_size = new QSpinBox(mazes_tab); - m_mazes_size->setRange(10, 99); - - QGridLayout* mazes_layout = new QGridLayout(mazes_tab); - mazes_layout->setSpacing(6); - mazes_layout->setRowStretch(0, 1); - mazes_layout->setRowStretch(5, 1); - mazes_layout->setColumnStretch(0, 1); - mazes_layout->setColumnStretch(3, 1); - mazes_layout->addWidget(m_mazes_preview, 1, 2); - mazes_layout->addWidget(new QLabel(tr("Algorithm"), mazes_tab), 2, 1, Qt::AlignRight | Qt::AlignVCenter); - mazes_layout->addWidget(m_mazes_algorithm, 2, 2); - mazes_layout->addWidget(new QLabel(tr("Targets"), mazes_tab), 3, 1, Qt::AlignRight | Qt::AlignVCenter); - mazes_layout->addWidget(m_mazes_targets, 3, 2); - mazes_layout->addWidget(new QLabel(tr("Size"), mazes_tab), 4, 1, Qt::AlignRight | Qt::AlignVCenter); - mazes_layout->addWidget(m_mazes_size, 4, 2); - - // Create Controls tab QWidget* controls_tab = new QWidget; tabs->addTab(controls_tab, tr("Controls")); @@ -367,11 +326,6 @@ void Settings::accept() settings.setValue("Show Time", m_gameplay_time->isChecked()); settings.setValue("Smooth Movement", m_gameplay_smooth->isChecked()); - // Write new maze settings to disk - settings.setValue("New/Algorithm", m_mazes_algorithm->itemData(m_mazes_algorithm->currentIndex())); - settings.setValue("New/Targets", m_mazes_targets->value()); - settings.setValue("New/Size", m_mazes_size->value()); - // Write control button settings to disk foreach (ControlButton* button, controls) { settings.setValue("Controls/" + button->objectName().mid(8), button->key); @@ -395,15 +349,6 @@ void Settings::reject() // ============================================================================ -void Settings::algorithmSelected(int index) -{ - if (index != -1) { - m_mazes_preview->setPixmap( QString(":/preview%1.png").arg( m_mazes_algorithm->itemData(index).toInt()) ); - } -} - -// ============================================================================ - void Settings::themeSelected(const QString& theme) { if (!theme.isEmpty()) { @@ -503,12 +448,6 @@ void Settings::loadSettings() m_gameplay_time->setChecked(settings.value("Show Time", true).toBool()); m_gameplay_smooth->setChecked(settings.value("Smooth Movement", true).toBool()); - // Read new maze settings from disk - int algorithm = settings.value("New/Algorithm", 4).toInt(); - m_mazes_algorithm->setCurrentIndex(m_mazes_algorithm->findData(algorithm)); - m_mazes_targets->setValue(settings.value("New/Targets", 3).toInt()); - m_mazes_size->setValue(settings.value("New/Size", 50).toInt()); - // Read control button settings from disk foreach (ControlButton* button, controls) { button->key = settings.value("Controls/" + button->objectName().mid(8), button->default_key).toUInt(); src/settings.cpp @@ -21,13 +21,11 @@ #define SETTINGS_H #include <QDialog> -#include <QList> class QCheckBox; class QComboBox; class QLabel; class QListWidget; class QPushButton; -class QSpinBox; class Theme; class Settings : public QDialog @@ -43,7 +41,8 @@ signals: public slots: virtual void accept(); virtual void reject(); - void algorithmSelected(int index); + +private slots: void themeSelected(const QString& theme); void addTheme(); void removeTheme(); @@ -57,11 +56,6 @@ private: QCheckBox* m_gameplay_time; QCheckBox* m_gameplay_smooth; - QLabel* m_mazes_preview; - QComboBox* m_mazes_algorithm; - QSpinBox* m_mazes_targets; - QSpinBox* m_mazes_size; - QListWidget* m_themes_selector; QLabel* m_themes_preview; QPushButton* m_themes_remove_button; src/settings.h @@ -20,6 +20,7 @@ #include "window.h" #include "board.h" +#include "new_game_dialog.h" #include "scores.h" #include "settings.h" @@ -139,7 +140,7 @@ void Window::initActions() m_hint_action = game_menu->addAction(tr("Hint"), m_board, SLOT(hint())); game_menu->addAction(tr("High Scores"), m_scores, SLOT(exec())); m_pause_action = game_menu->addAction(tr("Pause Game")); - game_menu->addAction(tr("New Game"), m_board, SLOT(newGame())); + game_menu->addAction(tr("New Game"), this, SLOT(newGame())); #else // Create menubar #if defined(Q_OS_MAC) @@ -147,7 +148,7 @@ void Window::initActions() #endif QMenu* game_menu = menuBar()->addMenu(tr("Game")); - QAction* new_action = game_menu->addAction(fetchIcon("document-new"), tr("New"), m_board, SLOT(newGame()), tr("Ctrl+N")); + QAction* new_action = game_menu->addAction(fetchIcon("document-new"), tr("New"), this, SLOT(newGame()), tr("Ctrl+N")); m_pause_action = game_menu->addAction(fetchIcon("media-playback-pause"), tr("Pause")); m_pause_action->setShortcut(tr("P")); m_hint_action = game_menu->addAction(fetchIcon("games-hint"), tr("Hint"), m_board, SLOT(hint()), tr("H")); @@ -200,3 +201,13 @@ void Window::about() } // ============================================================================ + +void Window::newGame() +{ + NewGameDialog dialog(this); + if (dialog.exec() == QDialog::Accepted) { + m_board->newGame(); + } +} + +// ============================================================================ src/window.cpp @@ -39,6 +39,7 @@ protected: private slots: void about(); + void newGame(); private: void initActions(); src/window.h 602f42b573dd6418c95198f9d84544cf6cf3fc6d Graeme Gott graeme@gottcode.org http://github.com/gottcode/cutemaze/commit/e6179cf831af20a1db19d977fb6d25c6b2e14bbd e6179cf831af20a1db19d977fb6d25c6b2e14bbd 2009-09-21T08:23:54-07:00 2009-09-19T07:16:19-07:00 Add new game dialog. 8219fcf9af9b7e7f2e8c5ee2ac01d0eca0891e47 Graeme Gott graeme@gottcode.org