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
9ee5dc16
Commit
9ee5dc16
authored
Sep 09, 2012
by
barthess
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support of new icons added to program
parent
e0633326
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
131 additions
and
14 deletions
+131
-14
qgroundcontrol.qrc
qgroundcontrol.qrc
+12
-0
MainWindow.cc
src/ui/MainWindow.cc
+36
-0
QGCToolBar.cc
src/ui/QGCToolBar.cc
+43
-7
UASView.cc
src/ui/uas/UASView.cc
+40
-7
No files found.
qgroundcontrol.qrc
View file @
9ee5dc16
...
...
@@ -39,6 +39,18 @@
<file>files/images/mavs/generic.svg</file>
<file>files/images/mavs/quadrotor.svg</file>
<file>files/images/mavs/coaxial.svg</file>
<file>files/images/mavs/airship.svg</file>
<file>files/images/mavs/antenna-tracker.svg</file>
<file>files/images/mavs/flapping-wing.svg</file>
<file>files/images/mavs/free-balloon.svg</file>
<file>files/images/mavs/ground-rover.svg</file>
<file>files/images/mavs/hexarotor.svg</file>
<file>files/images/mavs/kite.svg</file>
<file>files/images/mavs/octorotor.svg</file>
<file>files/images/mavs/rocket.svg</file>
<file>files/images/mavs/submarine.svg</file>
<file>files/images/mavs/surface-boat.svg</file>
<file>files/images/mavs/tricopter.svg</file>
<file>files/images/actions/system-shutdown.svg</file>
<file>files/images/actions/system-log-out.svg</file>
<file>files/images/actions/system-lock-screen.svg</file>
...
...
src/ui/MainWindow.cc
View file @
9ee5dc16
...
...
@@ -1259,9 +1259,45 @@ void MainWindow::UASCreated(UASInterface* uas)
case
MAV_TYPE_HELICOPTER
:
icon
=
QIcon
(
":files/images/mavs/helicopter.svg"
);
break
;
case
MAV_TYPE_ANTENNA_TRACKER
:
icon
=
QIcon
(
":files/images/mavs/antenna-tracker.svg"
);
break
;
case
MAV_TYPE_GCS
:
icon
=
QIcon
(
":files/images/mavs/groundstation.svg"
);
break
;
case
MAV_TYPE_AIRSHIP
:
icon
=
QIcon
(
":files/images/mavs/airship.svg"
);
break
;
case
MAV_TYPE_FREE_BALLOON
:
icon
=
QIcon
(
":files/images/mavs/free-balloon.svg"
);
break
;
case
MAV_TYPE_ROCKET
:
icon
=
QIcon
(
":files/images/mavs/rocket.svg"
);
break
;
case
MAV_TYPE_GROUND_ROVER
:
icon
=
QIcon
(
":files/images/mavs/ground-rover.svg"
);
break
;
case
MAV_TYPE_SURFACE_BOAT
:
icon
=
QIcon
(
":files/images/mavs/surface-boat.svg"
);
break
;
case
MAV_TYPE_SUBMARINE
:
icon
=
QIcon
(
":files/images/mavs/submarine.svg"
);
break
;
case
MAV_TYPE_HEXAROTOR
:
icon
=
QIcon
(
":files/images/mavs/hexarotor.svg"
);
break
;
case
MAV_TYPE_OCTOROTOR
:
icon
=
QIcon
(
":files/images/mavs/octorotor.svg"
);
break
;
case
MAV_TYPE_TRICOPTER
:
icon
=
QIcon
(
":files/images/mavs/tricopter.svg"
);
break
;
case
MAV_TYPE_FLAPPING_WING
:
icon
=
QIcon
(
":files/images/mavs/flapping-wing.svg"
);
break
;
case
MAV_TYPE_KITE
:
icon
=
QIcon
(
":files/images/mavs/kite.svg"
);
break
;
default:
icon
=
QIcon
(
":files/images/mavs/unknown.svg"
);
break
;
...
...
src/ui/QGCToolBar.cc
View file @
9ee5dc16
...
...
@@ -405,23 +405,59 @@ void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
Q_UNUSED
(
uas
);
// Set matching icon
switch
(
systemType
)
{
case
0
:
case
MAV_TYPE_GENERIC
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/generic.svg"
));
break
;
case
1
:
case
MAV_TYPE_FIXED_WING
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/fixed-wing.svg"
));
break
;
case
2
:
case
MAV_TYPE_QUADROTOR
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/quadrotor.svg"
));
break
;
case
3
:
case
MAV_TYPE_COAXIAL
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/coaxial.svg"
));
break
;
case
4
:
case
MAV_TYPE_HELICOPTER
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/helicopter.svg"
));
break
;
case
5
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/unknown.svg"
));
case
MAV_TYPE_ANTENNA_TRACKER
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/antenn-tracker.svg"
));
break
;
case
MAV_TYPE_GCS
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/groundstation.svg"
));
break
;
case
MAV_TYPE_AIRSHIP
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/airship.svg"
));
break
;
case
MAV_TYPE_FREE_BALLOON
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/free-balloon.svg"
));
break
;
case
MAV_TYPE_ROCKET
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/rocket.svg"
));
break
;
case
MAV_TYPE_GROUND_ROVER
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/ground-rover.svg"
));
break
;
case
MAV_TYPE_SURFACE_BOAT
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/surface-boat.svg"
));
break
;
case
MAV_TYPE_SUBMARINE
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/submarine.svg"
));
break
;
case
MAV_TYPE_HEXAROTOR
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/hexarotor.svg"
));
break
;
case
MAV_TYPE_OCTOROTOR
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/octorotor.svg"
));
break
;
case
MAV_TYPE_TRICOPTER
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/tricopter.svg"
));
break
;
case
MAV_TYPE_FLAPPING_WING
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/flapping-wing.svg"
));
break
;
case
MAV_TYPE_KITE
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/kite.svg"
));
break
;
default:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/unknown.svg"
));
...
...
src/ui/uas/UASView.cc
View file @
9ee5dc16
...
...
@@ -326,25 +326,25 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
// Set matching icon
switch
(
systemType
)
{
case
0
:
case
MAV_TYPE_GENERIC
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/generic.svg"
));
break
;
case
1
:
case
MAV_TYPE_FIXED_WING
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/fixed-wing.svg"
));
break
;
case
2
:
case
MAV_TYPE_QUADROTOR
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/quadrotor.svg"
));
break
;
case
3
:
case
MAV_TYPE_COAXIAL
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/coaxial.svg"
));
break
;
case
4
:
case
MAV_TYPE_HELICOPTER
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/helicopter.svg"
));
break
;
case
5
:
case
MAV_TYPE_ANTENNA_TRACKER
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/unknown.svg"
));
break
;
case
6
:
{
case
MAV_TYPE_GCS
:
{
// A groundstation is a special system type, update widget
QString
result
;
m_ui
->
nameLabel
->
setText
(
tr
(
"GCS "
)
+
result
.
sprintf
(
"%03d"
,
uas
->
getUASID
()));
...
...
@@ -363,6 +363,39 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/groundstation.svg"
));
}
break
;
case
MAV_TYPE_AIRSHIP
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/airship.svg"
));
break
;
case
MAV_TYPE_FREE_BALLOON
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/free-balloon.svg"
));
break
;
case
MAV_TYPE_ROCKET
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/rocket.svg"
));
break
;
case
MAV_TYPE_GROUND_ROVER
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/ground-rover.svg"
));
break
;
case
MAV_TYPE_SURFACE_BOAT
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/surface-boat.svg"
));
break
;
case
MAV_TYPE_SUBMARINE
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/submarine.svg"
));
break
;
case
MAV_TYPE_HEXAROTOR
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/hexarotor.svg"
));
break
;
case
MAV_TYPE_OCTOROTOR
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/octorotor.svg"
));
break
;
case
MAV_TYPE_TRICOPTER
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/tricopter.svg"
));
break
;
case
MAV_TYPE_FLAPPING_WING
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/flapping-wing.svg"
));
break
;
case
MAV_TYPE_KITE
:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":files/images/mavs/kite.svg"
));
break
;
default:
m_ui
->
typeButton
->
setIcon
(
QIcon
(
":/files/images/mavs/unknown.svg"
));
break
;
...
...
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