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
a7774737
Commit
a7774737
authored
Aug 31, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish removal of APM mode selection
parent
99737600
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
36 deletions
+1
-36
QGCViewModeSelection.cc
src/ui/main/QGCViewModeSelection.cc
+1
-11
QGCViewModeSelection.h
src/ui/main/QGCViewModeSelection.h
+0
-1
QGCViewModeSelection.ui
src/ui/main/QGCViewModeSelection.ui
+0
-24
No files found.
src/ui/main/QGCViewModeSelection.cc
View file @
a7774737
...
@@ -13,11 +13,7 @@ QGCViewModeSelection::QGCViewModeSelection(QWidget *parent) :
...
@@ -13,11 +13,7 @@ QGCViewModeSelection::QGCViewModeSelection(QWidget *parent) :
connect
(
ui
->
viewModeGeneric
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectGeneric
()));
connect
(
ui
->
viewModeGeneric
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectGeneric
()));
connect
(
ui
->
viewModeAR
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectWifi
()));
connect
(
ui
->
viewModeAR
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectWifi
()));
connect
(
ui
->
viewModePX4
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectPX4
()));
connect
(
ui
->
viewModePX4
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectPX4
()));
connect
(
ui
->
viewModeAPM
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
selectAPM
()));
connect
(
ui
->
notAgainCheckBox
,
SIGNAL
(
clicked
(
bool
)),
this
,
SIGNAL
(
settingsStorageRequested
(
bool
)));
connect
(
ui
->
notAgainCheckBox
,
SIGNAL
(
clicked
(
bool
)),
this
,
SIGNAL
(
settingsStorageRequested
(
bool
)));
// XXX we need to revive the APM support or remove it completely
ui
->
viewModeAPM
->
hide
();
}
}
QGCViewModeSelection
::~
QGCViewModeSelection
()
QGCViewModeSelection
::~
QGCViewModeSelection
()
...
@@ -49,9 +45,3 @@ void QGCViewModeSelection::selectPX4() {
...
@@ -49,9 +45,3 @@ void QGCViewModeSelection::selectPX4() {
mode
=
MainWindow
::
CUSTOM_MODE_PX4
;
mode
=
MainWindow
::
CUSTOM_MODE_PX4
;
selected
=
true
;
selected
=
true
;
}
}
\ No newline at end of file
void
QGCViewModeSelection
::
selectAPM
()
{
emit
customViewModeSelected
(
MainWindow
::
CUSTOM_MODE_APM
);
mode
=
MainWindow
::
CUSTOM_MODE_APM
;
selected
=
true
;
}
src/ui/main/QGCViewModeSelection.h
View file @
a7774737
...
@@ -22,7 +22,6 @@ public slots:
...
@@ -22,7 +22,6 @@ public slots:
void
selectGeneric
();
void
selectGeneric
();
void
selectPX4
();
void
selectPX4
();
void
selectAPM
();
void
selectWifi
();
void
selectWifi
();
signals:
signals:
...
...
src/ui/main/QGCViewModeSelection.ui
View file @
a7774737
...
@@ -67,13 +67,6 @@
...
@@ -67,13 +67,6 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"2"
column=
"3"
>
<widget
class=
"QLabel"
name=
"label_3"
>
<property
name=
"text"
>
<string>
APM Autopilot
</string>
</property>
</widget>
</item>
<item
row=
"2"
column=
"2"
>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QLabel"
name=
"label_2"
>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -81,23 +74,6 @@
...
@@ -81,23 +74,6 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
row=
"1"
column=
"3"
>
<widget
class=
"QPushButton"
name=
"viewModeAPM"
>
<property
name=
"text"
>
<string/>
</property>
<property
name=
"icon"
>
<iconset
resource=
"../../../qgroundcontrol.qrc"
>
<normaloff>
:/files/images/actions/qgroundcontrol-apm.svg
</normaloff>
:/files/images/actions/qgroundcontrol-apm.svg
</iconset>
</property>
<property
name=
"iconSize"
>
<size>
<width>
120
</width>
<height>
120
</height>
</size>
</property>
</widget>
</item>
<item
row=
"2"
column=
"1"
>
<item
row=
"2"
column=
"1"
>
<widget
class=
"QLabel"
name=
"label_4"
>
<widget
class=
"QLabel"
name=
"label_4"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
...
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