From 94420ee9d29d5c53fcfc9e0700c5bfc9faf9a797 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 2 May 2014 12:55:50 +0200 Subject: [PATCH] Added option to reset all settings --- src/ui/QGCSettingsWidget.cc | 13 +++++++++++++ src/ui/QGCSettingsWidget.h | 1 + src/ui/QGCSettingsWidget.ui | 29 ++++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/ui/QGCSettingsWidget.cc b/src/ui/QGCSettingsWidget.cc index 0e1d56b7e..fa61cc75d 100644 --- a/src/ui/QGCSettingsWidget.cc +++ b/src/ui/QGCSettingsWidget.cc @@ -35,6 +35,9 @@ QGCSettingsWidget::QGCSettingsWidget(QWidget *parent, Qt::WindowFlags flags) : this->window()->setWindowTitle(tr("QGroundControl Settings")); + // Settings reset + connect(ui->resetSettingsButton, SIGNAL(clicked()), this, SLOT(resetSettings())); + // Audio preferences ui->audioMuteCheckBox->setChecked(GAudioOutput::instance()->isMuted()); connect(ui->audioMuteCheckBox, SIGNAL(toggled(bool)), GAudioOutput::instance(), SLOT(mute(bool))); @@ -193,3 +196,13 @@ void QGCSettingsWidget::selectCustomMode(int mode) MainWindow::instance()->setCustomMode(static_cast(ui->customModeComboBox->itemData(mode).toInt())); MainWindow::instance()->showInfoMessage(tr("Please restart QGroundControl"), tr("The optimization selection was changed. The application needs to be closed and restarted to put all optimizations into effect.")); } + +void QGCSettingsWidget::resetSettings() +{ + QSettings settings; + settings.sync(); + settings.clear(); + // Write current application version + settings.setValue("QGC_APPLICATION_VERSION", QGC_APPLICATION_VERSION); + settings.sync(); +} diff --git a/src/ui/QGCSettingsWidget.h b/src/ui/QGCSettingsWidget.h index e77bbec17..b9fa70d7e 100644 --- a/src/ui/QGCSettingsWidget.h +++ b/src/ui/QGCSettingsWidget.h @@ -23,6 +23,7 @@ public slots: void setDefaultStyle(); void selectStylesheet(); void selectCustomMode(int mode); + void resetSettings(); private: MainWindow* mainWindow; diff --git a/src/ui/QGCSettingsWidget.ui b/src/ui/QGCSettingsWidget.ui index e5ba63d43..4b0536d7d 100644 --- a/src/ui/QGCSettingsWidget.ui +++ b/src/ui/QGCSettingsWidget.ui @@ -6,8 +6,8 @@ 0 0 - 528 - 455 + 534 + 517 @@ -159,11 +159,34 @@ 20 - 0 + 20 + + + + Danger Zone + + + + + + Delete all settings, layouts and restore defaults + + + + + + + Reset Settings + + + + + + -- 2.22.0