Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
16254c78
Commit
16254c78
authored
Nov 01, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove non-working settings reset
parent
6507190a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
37 deletions
+0
-37
QGCSettingsWidget.cc
src/ui/QGCSettingsWidget.cc
+0
-13
QGCSettingsWidget.h
src/ui/QGCSettingsWidget.h
+0
-1
QGCSettingsWidget.ui
src/ui/QGCSettingsWidget.ui
+0
-23
No files found.
src/ui/QGCSettingsWidget.cc
View file @
16254c78
...
...
@@ -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)
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
();
}
src/ui/QGCSettingsWidget.h
View file @
16254c78
...
...
@@ -23,7 +23,6 @@ public slots:
void
setDefaultStyle
();
void
selectStylesheet
();
void
selectCustomMode
(
int
mode
);
void
resetSettings
();
private:
MainWindow
*
mainWindow
;
...
...
src/ui/QGCSettingsWidget.ui
View file @
16254c78
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment