Browse Source

Remove non-working settings reset

QGC4.4
Don Gagne 11 years ago
parent
commit
16254c78fd
  1. 13
      src/ui/QGCSettingsWidget.cc
  2. 1
      src/ui/QGCSettingsWidget.h
  3. 23
      src/ui/QGCSettingsWidget.ui

13
src/ui/QGCSettingsWidget.cc

@ -38,9 +38,6 @@ QGCSettingsWidget::QGCSettingsWidget(JoystickInput *joystick, QWidget *parent, Q @@ -38,9 +38,6 @@ QGCSettingsWidget::QGCSettingsWidget(JoystickInput *joystick, QWidget *parent, Q
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)));
@ -200,13 +197,3 @@ void QGCSettingsWidget::selectCustomMode(int mode) @@ -200,13 +197,3 @@ void QGCSettingsWidget::selectCustomMode(int mode)
MainWindow::instance()->setCustomMode(static_cast<enum MainWindow::CUSTOM_MODE>(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();
}

1
src/ui/QGCSettingsWidget.h

@ -23,7 +23,6 @@ public slots: @@ -23,7 +23,6 @@ public slots:
void setDefaultStyle();
void selectStylesheet();
void selectCustomMode(int mode);
void resetSettings();
private:
MainWindow* mainWindow;

23
src/ui/QGCSettingsWidget.ui

@ -164,29 +164,6 @@ @@ -164,29 +164,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Danger Zone</string>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="10,0">
<item row="1" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Delete all settings, layouts and restore defaults</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="resetSettingsButton">
<property name="text">
<string>Reset Settings</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>

Loading…
Cancel
Save