@@ -1,4 +1,5 @@ 2009-09-19 Graeme Gott <graeme@gottcode.org> + * Improve settings dialog code. * Add saved game version check. * Add new game dialog. ChangeLog @@ -28,11 +28,10 @@ #if !defined(QTOPIA_PHONE) #include <QFileDialog> #endif -#include <QGridLayout> +#include <QFormLayout> #include <QHBoxLayout> #include <QKeyEvent> #include <QLabel> -#include <QListWidget> #include <QMessageBox> #include <QPainter> #include <QPushButton> @@ -221,16 +220,11 @@ Settings::Settings(QWidget* parent) m_gameplay_time->hide(); #endif - QGridLayout* gameplay_layout = new QGridLayout(gameplay_tab); - gameplay_layout->setSpacing(6); - gameplay_layout->setRowStretch(0, 1); - gameplay_layout->setRowStretch(5, 1); - gameplay_layout->setColumnStretch(0, 1); - gameplay_layout->setColumnStretch(2, 1); - gameplay_layout->addWidget(m_gameplay_path, 1, 1); - gameplay_layout->addWidget(m_gameplay_steps, 2, 1); - gameplay_layout->addWidget(m_gameplay_time, 3, 1); - gameplay_layout->addWidget(m_gameplay_smooth, 4, 1); + QFormLayout* gameplay_layout = new QFormLayout(gameplay_tab); + gameplay_layout->addRow(m_gameplay_path); + gameplay_layout->addRow(m_gameplay_steps); + gameplay_layout->addRow(m_gameplay_time); + gameplay_layout->addRow(m_gameplay_smooth); // Create Controls tab @@ -243,65 +237,41 @@ Settings::Settings(QWidget* parent) controls.append(new ControlButton("Right", Qt::Key_Right, this)); controls.append(new ControlButton("Flag", Qt::Key_Space, this)); - QGridLayout * controls_layout = new QGridLayout(controls_tab); - controls_layout->setSpacing(6); - controls_layout->setRowStretch(0, 1); - controls_layout->setRowStretch(6, 1); - controls_layout->setColumnStretch(0, 1); - controls_layout->setColumnStretch(3, 1); - controls_layout->addWidget(new QLabel(tr("Move Up"), controls_tab), 1, 1, Qt::AlignRight | Qt::AlignVCenter); - controls_layout->addWidget(controls[0], 1, 2); - controls_layout->addWidget(new QLabel(tr("Move Down"), controls_tab), 2, 1, Qt::AlignRight | Qt::AlignVCenter); - controls_layout->addWidget(controls[1], 2, 2); - controls_layout->addWidget(new QLabel(tr("Move Left"), controls_tab), 3, 1, Qt::AlignRight | Qt::AlignVCenter); - controls_layout->addWidget(controls[2], 3, 2); - controls_layout->addWidget(new QLabel(tr("Move Right"), controls_tab), 4, 1, Qt::AlignRight | Qt::AlignVCenter); - controls_layout->addWidget(controls[3], 4, 2); - controls_layout->addWidget(new QLabel(tr("Toggle Flag"), controls_tab), 5, 1, Qt::AlignRight | Qt::AlignVCenter); - controls_layout->addWidget(controls[4], 5, 2); + QFormLayout * controls_layout = new QFormLayout(controls_tab); + controls_layout->addRow(tr("Move Up:"), controls[0]); + controls_layout->addRow(tr("Move Down:"), controls[1]); + controls_layout->addRow(tr("Move Left:"), controls[2]); + controls_layout->addRow(tr("Move Right:"), controls[3]); + controls_layout->addRow(tr("Toggle Flag:"), controls[4]); // Create Themes tab QWidget* themes_tab = new QWidget; tabs->addTab(themes_tab, tr("Themes")); - m_themes_selector = new QListWidget(themes_tab); - connect(m_themes_selector, SIGNAL(currentTextChanged(const QString&)), this, SLOT(themeSelected(const QString&))); - m_themes_preview = new QLabel(themes_tab); + m_themes_selector = new QComboBox(themes_tab); + connect(m_themes_selector, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(themeSelected(const QString&))); + + QHBoxLayout* themes_selector_layout = new QHBoxLayout; + themes_selector_layout->setMargin(0); + themes_selector_layout->addWidget(m_themes_selector, 1); + #if !defined(QTOPIA_PHONE) - QPushButton* add_button = new QPushButton(tr("Add Theme"), themes_tab); + QPushButton* add_button = new QPushButton(tr("Add"), themes_tab); connect(add_button, SIGNAL(clicked()), this, SLOT(addTheme())); - m_themes_remove_button = new QPushButton(tr("Remove Theme"), themes_tab); + m_themes_remove_button = new QPushButton(tr("Remove"), themes_tab); connect(m_themes_remove_button, SIGNAL(clicked()), this, SLOT(removeTheme())); - QHBoxLayout* themes_preview_layout = new QHBoxLayout; - themes_preview_layout->setMargin(0); - themes_preview_layout->setSpacing(6); - themes_preview_layout->addWidget(m_themes_selector); - themes_preview_layout->addWidget(m_themes_preview); - - QHBoxLayout* themes_button_layout = new QHBoxLayout; - themes_button_layout->setMargin(0); - themes_button_layout->addWidget(add_button); - themes_button_layout->addWidget(m_themes_remove_button); - - QVBoxLayout* themes_layout = new QVBoxLayout(themes_tab); - themes_layout->addLayout(themes_preview_layout); - themes_layout->addLayout(themes_button_layout); -#else - QHBoxLayout* themes_layout = new QHBoxLayout(themes_tab); - themes_layout->addWidget(m_themes_selector); - themes_layout->addWidget(m_themes_preview); + themes_selector_layout->addWidget(add_button, 0); + themes_selector_layout->addWidget(m_themes_remove_button, 0); #endif + QVBoxLayout* themes_layout = new QVBoxLayout(themes_tab); + themes_layout->addWidget(m_themes_preview, 1, Qt::AlignCenter); + themes_layout->addLayout(themes_selector_layout); - // Set dialog's size -#if !defined(QTOPIA_PHONE) - adjustSize(); - setMinimumSize(size()); -#endif // Load current settings loadSettings(); @@ -311,6 +281,7 @@ Settings::Settings(QWidget* parent) Settings::~Settings() { + controls.clear(); delete m_theme; } @@ -332,7 +303,7 @@ void Settings::accept() } // Write theme to disk - settings.setValue("Theme", m_themes_selector->currentItem()->text()); + settings.setValue("Theme", m_themes_selector->currentText()); emit settingsChanged(); @@ -341,14 +312,6 @@ void Settings::accept() // ============================================================================ -void Settings::reject() -{ - loadSettings(); - QDialog::reject(); -} - -// ============================================================================ - void Settings::themeSelected(const QString& theme) { if (!theme.isEmpty()) { @@ -393,13 +356,13 @@ void Settings::addTheme() // Add theme to list QStringList themes = m_theme->available(); - int theme = themes.indexOf(m_themes_selector->currentItem()->text()); + int theme = themes.indexOf(m_themes_selector->currentText()); if (theme == -1) { theme = themes.indexOf("Mouse"); } m_themes_selector->clear(); m_themes_selector->addItems(themes); - m_themes_selector->setCurrentRow(theme); + m_themes_selector->setCurrentIndex(theme); } // ============================================================================ @@ -407,11 +370,11 @@ void Settings::addTheme() void Settings::removeTheme() { // Find theme - if (!m_themes_selector->currentItem()) { + if (m_themes_selector->currentIndex() == -1) { return; } QString dirpath = homeDataPath(); - QString file = m_themes_selector->currentItem()->text() + ".svg"; + QString file = m_themes_selector->currentText() + ".svg"; if (!QFileInfo(dirpath + '/' + file).exists()) { return; } @@ -425,13 +388,13 @@ void Settings::removeTheme() } // Delete theme from list - if (!m_theme->available().contains(m_themes_selector->currentItem()->text())) { - delete m_themes_selector->currentItem(); + if (!m_theme->available().contains(m_themes_selector->currentText())) { + m_themes_selector->removeItem(m_themes_selector->currentIndex()); } // Force change to next theme in list - themeSelected(m_themes_selector->currentItem()->text()); - QSettings().setValue("Theme", m_themes_selector->currentItem()->text()); + themeSelected(m_themes_selector->currentText()); + QSettings().setValue("Theme", m_themes_selector->currentText()); emit settingsChanged(); } } @@ -462,7 +425,7 @@ void Settings::loadSettings() } m_themes_selector->clear(); m_themes_selector->addItems(themes); - m_themes_selector->setCurrentRow(theme); + m_themes_selector->setCurrentIndex(theme); } // ============================================================================ src/settings.cpp @@ -24,7 +24,6 @@ class QCheckBox; class QComboBox; class QLabel; -class QListWidget; class QPushButton; class Theme; @@ -40,7 +39,6 @@ signals: public slots: virtual void accept(); - virtual void reject(); private slots: void themeSelected(const QString& theme); @@ -56,7 +54,7 @@ private: QCheckBox* m_gameplay_time; QCheckBox* m_gameplay_smooth; - QListWidget* m_themes_selector; + QComboBox* m_themes_selector; QLabel* m_themes_preview; QPushButton* m_themes_remove_button; Theme* m_theme; src/settings.h @@ -69,10 +69,6 @@ Window::Window() connect(qApp, SIGNAL(aboutToQuit()), m_board, SLOT(saveGame())); #endif - // Create settings window - m_settings = new Settings(this); - connect(m_settings, SIGNAL(settingsChanged()), m_board, SLOT(loadSettings())); - // Create scores window m_scores = new Scores(this); connect(m_board, SIGNAL(finished(int, int, int, int)), m_scores, SLOT(addScore(int, int, int, int))); @@ -136,7 +132,7 @@ void Window::initActions() QMenu* game_menu = QSoftMenuBar::menuFor(this); game_menu->addAction(tr("Quit Game"), qApp, SLOT(quit())); - game_menu->addAction(tr("Settings"), m_settings, SLOT(exec())); + game_menu->addAction(tr("Settings"), this, SLOT(showSettings())); 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")); @@ -155,7 +151,7 @@ void Window::initActions() game_menu->addSeparator(); game_menu->addAction(fetchIcon("games-highscores"), tr("High Scores"), m_scores, SLOT(exec())); game_menu->addSeparator(); - game_menu->addAction(fetchIcon("games-config-options"), tr("Settings"), m_settings, SLOT(exec())); + game_menu->addAction(fetchIcon("games-config-options"), tr("Settings"), this, SLOT(showSettings())); game_menu->addSeparator(); game_menu->addAction(fetchIcon("application-exit"), tr("Quit"), this, SLOT(close()), tr("Ctrl+Q")); @@ -211,3 +207,12 @@ void Window::newGame() } // ============================================================================ + +void Window::showSettings() +{ + Settings settings(this); + connect(&settings, SIGNAL(settingsChanged()), m_board, SLOT(loadSettings())); + settings.exec(); +} + +// ============================================================================ src/window.cpp @@ -23,7 +23,6 @@ #include <QMainWindow> class Board; class Scores; -class Settings; class QAction; class Window : public QMainWindow @@ -40,13 +39,13 @@ protected: private slots: void about(); void newGame(); + void showSettings(); private: void initActions(); Board* m_board; Scores* m_scores; - Settings* m_settings; QAction* m_pause_action; QAction* m_hint_action; }; src/window.h 65eb41af9532e59394dfcd9e2bf9184df2fbd340 Graeme Gott graeme@gottcode.org http://github.com/gottcode/cutemaze/commit/014544f1ab71c989cd64a77b908f4541eaaec63f 014544f1ab71c989cd64a77b908f4541eaaec63f 2009-09-21T08:23:54-07:00 2009-09-19T14:14:13-07:00 Improve settings dialog code. 09eec576d3996f5099e971937975f71159d412ae Graeme Gott graeme@gottcode.org