Add resetting new game to defaults

Author: gottcode

src/new_game_dialog.cpp

@@ -22,70 +22,6 @@
 
 //-----------------------------------------------------------------------------
 
-namespace
-{
-
-/**
- * @brief The TimerDescription class describes a timer.
- */
-class TimerDescription
-{
-public:
-	/**
-	 * Constructs a timer description.
-	 * @param id the timer mode to load details of
-	 */
-	TimerDescription(int id)
-		: m_name(Clock::timerToString(id))
-		, m_description(Clock::timerDescription(id))
-		, m_id(id)
-	{
-	}
-
-	/**
-	 * @return translated name of timer
-	 */
-	QString name() const
-	{
-		return m_name;
-	}
-
-	/**
-	 * @return translated description of timer
-	 */
-	QString description() const
-	{
-		return m_description;
-	}
-
-	/**
-	 * @return the timer mode represented by this description
-	 */
-	int id() const
-	{
-		return m_id;
-	}
-
-	/**
-	 * Locale-aware sorts the descriptions.
-	 * @param timer the description to compare to
-	 * @return whether this description sorts first
-	 */
-	bool operator<(const TimerDescription& timer) const
-	{
-		return m_name.localeAwareCompare(timer.m_name) < 0;
-	}
-
-private:
-	QString m_name; /**< translated name of timer */
-	QString m_description; /**< translated description of timer */
-	int m_id; /**< the timer mode */
-};
-
-}
-
-//-----------------------------------------------------------------------------
-
 NewGameDialog::NewGameDialog(QWidget* parent)
 	: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint)
 	, m_minimum(3)
@@ -161,50 +97,56 @@ NewGameDialog::NewGameDialog(QWidget* parent)
 	layout->addSpacing(6);
 
 	// Create timer buttons
-	QScrollArea* area = new QScrollArea(this);
-	layout->addWidget(area);
+	m_timers_area = new QScrollArea(this);
+	layout->addWidget(m_timers_area);
 
-	QWidget* timers_widget = new QWidget(area);
+	QWidget* timers_widget = new QWidget(m_timers_area);
 	QVBoxLayout* timers_layout = new QVBoxLayout(timers_widget);
-	area->setWidget(timers_widget);
-	area->setWidgetResizable(true);
-	area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	m_timers_area->setWidget(timers_widget);
+	m_timers_area->setWidgetResizable(true);
+	m_timers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
 	QCommandLinkButton* active_timer = nullptr;
-	QList<TimerDescription> timers;
-	for (int i = Clock::Tanglet; i < Clock::TotalTimers; ++i) {
-		timers.append(i);
-	}
-	std::sort(timers.begin(), timers.end());
-	for (const TimerDescription& timer : timers) {
-		QCommandLinkButton* button = new QCommandLinkButton(timer.name(), timer.description(), timers_widget);
+	for (int timer = 0; timer < Clock::TotalTimers; ++timer) {
+		const QString name = Clock::timerToString(timer);
+
+		QCommandLinkButton* button = new QCommandLinkButton(name, Clock::timerDescription(timer), timers_widget);
 		button->setMinimumWidth(500);
-		connect(button, &QCommandLinkButton::clicked, this, [this, timer] { timerChosen(timer.id()); });
-		timers_layout->addWidget(button);
+		connect(button, &QCommandLinkButton::clicked, this, [this, timer] { timerChosen(timer); });
+
+		int i;
+		for (i = 0; i < m_timers.size(); ++i) {
+			if (m_timers[i]->text().localeAwareCompare(name) >= 0) {
+				break;
+			}
+		}
+		m_timers.insert(i, button);
+		timers_layout->insertWidget(i, button);
 
-		if (timer.id() == previous_timer) {
+		if (timer == previous_timer) {
 			button->setDefault(true);
 			button->setFocus();
 			active_timer = button;
 		}
 	}
 
 	// Create cancel button
-	QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
-	connect(buttons, &QDialogButtonBox::rejected, this, &NewGameDialog::reject);
+	m_buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults, Qt::Horizontal, this);
+	connect(m_buttons, &QDialogButtonBox::rejected, this, &NewGameDialog::reject);
+	connect(m_buttons, &QDialogButtonBox::clicked, this, &NewGameDialog::restoreDefaults);
 	layout->addSpacing(6);
-	layout->addWidget(buttons);
+	layout->addWidget(m_buttons);
 
 	// Show contents
-	area->setMinimumWidth(timers_widget->sizeHint().width()
-			+ area->verticalScrollBar()->sizeHint().width()
-			+ (area->frameWidth() * 2));
+	m_timers_area->setMinimumWidth(timers_widget->sizeHint().width()
+			+ m_timers_area->verticalScrollBar()->sizeHint().width()
+			+ (m_timers_area->frameWidth() * 2));
 	QSize size = sizeHint();
-	size.setHeight(size.height() - (area->sizeHint().height() / 3));
+	size.setHeight(size.height() - (m_timers_area->sizeHint().height() / 3));
 	resize(QSettings().value("NewGameDialog/Size", size).toSize());
 	show();
 	if (active_timer) {
-		area->ensureWidgetVisible(active_timer);
+		m_timers_area->ensureWidgetVisible(active_timer);
 	}
 }
 
@@ -256,3 +198,31 @@ void NewGameDialog::timerChosen(int timer)
 }
 
 //-----------------------------------------------------------------------------
+
+void NewGameDialog::restoreDefaults(QAbstractButton* button)
+{
+	if (m_buttons->buttonRole(button) != QDialogButtonBox::ResetRole) {
+		return;
+	}
+
+	m_normal_size->setChecked(true);
+	m_density->setCurrentIndex(1);
+	sizeChanged();
+	m_length->setCurrentIndex(0);
+
+	const QString name = Clock::timerToString(Clock::Tanglet);
+	QCommandLinkButton* timer = nullptr;
+	for (QCommandLinkButton* b : qAsConst(m_timers)) {
+		if (b->text() == name) {
+			timer = b;
+			break;
+		}
+	}
+	if (timer) {
+		timer->setDefault(true);
+		timer->setFocus();
+		m_timers_area->ensureWidgetVisible(timer);
+	}
+}
+
+//-----------------------------------------------------------------------------

src/new_game_dialog.h

@@ -1,5 +1,5 @@
 /*
-	SPDX-FileCopyrightText: 2010-2011 Graeme Gott <[email protected]>
+	SPDX-FileCopyrightText: 2010-2021 Graeme Gott <[email protected]>
 
 	SPDX-License-Identifier: GPL-3.0-or-later
 */
@@ -8,7 +8,11 @@
 #define TANGLET_NEW_GAME_DIALOG_H
 
 #include <QDialog>
+class QAbstractButton;
+class QCommandLinkButton;
 class QComboBox;
+class QDialogButtonBox;
+class QScrollArea;
 class QToolButton;
 
 /**
@@ -50,12 +54,21 @@ private slots:
 	 */
 	void timerChosen(int timer);
 
+	/**
+	 * Checks if the player has activated the restore button and resets if they have.
+	 * @param button which dialog button the player activated
+	 */
+	void restoreDefaults(QAbstractButton* button);
+
 private:
 	QToolButton* m_normal_size; /**< option for a normal board */
 	QToolButton* m_large_size; /**< option for a large board */
 	QComboBox* m_density; /**< option to select the amount of words on the board */
 	QComboBox* m_length; /**< option to select minimum word length */
 	int m_minimum; /**< length of the shortest word allowed */
+	QScrollArea* m_timers_area; /**< scrollarea containing timer buttons */
+	QList<QCommandLinkButton*> m_timers; /**< actions to choose timer mode and start game */
+	QDialogButtonBox* m_buttons; /**< buttons to control dialog */
 };
 
 #endif // TANGLET_NEW_GAME_DIALOG_H