Skip to content

Q
qgroundcontrol
Commit 2e7364da authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #4940 from dogmaphobic/flightIcons 

Replace flight view icons
parents c01bb431 a87c70d7
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 24 deletions
qgcresources.qrc
View file @ 2e7364da
......@@ -164,6 +164,7 @@
<file alias="PX4/BrandImage">src/FirmwarePlugin/PX4/PX4BrandImage.png</file>
</qresource>
<qresource prefix="/res">
<file alias="action.svg">resources/action.svg</file>
<file alias="AntennaRC">resources/Antenna_RC.svg</file>
<file alias="AntennaT">resources/Antenna_T.svg</file>
<file alias="ArrowDown.svg">resources/ArrowDown.svg</file>
......@@ -178,6 +179,7 @@
<file alias="land.svg">resources/land.svg</file>
<file alias="notile.png">resources/notile.png</file>
<file alias="Pause.svg">resources/Pause.svg</file>
<file alias="pause-mission.svg">resources/pause-mission.svg</file>
<file alias="Play">resources/Play.svg</file>
<file alias="PowerButton">resources/PowerButton.svg</file>
<file alias="QGCLogoBlack">resources/QGCLogoBlack.svg</file>
......
resources/action.svg 0 → 100644
View file @ 2e7364da
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<polygon class="st0" points="52.284,36 19.716,17.197 19.716,54.803 "/>
</svg>
resources/land.svg
View file @ 2e7364da
......@@ -4,16 +4,17 @@
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:8;stroke-miterlimit:10;}
.st2{fill:#FFFFFF;}
</style>
<path class="st0" d="M54.244,25.2c3.345,0,6.056,1.958,6.056,4.374v26.353c0,2.416-2.711,4.374-6.056,4.374H17.756
c-3.345,0-6.056-1.958-6.056-4.374V29.574c0-2.416,2.711-4.374,6.056-4.374"/>
<g>
<path class="st0" d="M11.301,25.324c-0.002,0-0.003-0.001-0.005-0.002c-0.661-0.209-1.373,0.125-1.635,0.767
c-0.263,0.645,0.015,1.383,0.637,1.694l17.549,8.787l-6.483,1.559c-0.471,0.113-0.809,0.527-0.826,1.011
c-0.017,0.484,0.291,0.92,0.753,1.066l3.924,1.24c0.113,0.036,0.23,0.053,0.349,0.05l15.64-0.341l14.367,4.514
c5.503,1.648,6.57-0.248,6.766-0.868c0.152-0.481,0.209-1.273-0.383-2.314c-0.601-1.056-1.738-2.157-3.476-3.365
c-0.58-0.403-0.844-0.682-1.124-0.978c-0.983-1.038-1.736-1.656-6.908-3.291l-28.289-8.941l-3.472-10.965
c-0.131-0.413-0.455-0.737-0.869-0.868l-1.849-0.584c-0.381-0.12-0.795-0.064-1.129,0.154c-0.334,0.218-0.553,0.575-0.597,0.971
l-1.231,11.251L11.301,25.324z"/>
<line class="st1" x1="7.607" y1="58.566" x2="64.393" y2="58.566"/>
<g>
<line class="st1" x1="36.003" y1="11.7" x2="36.003" y2="36.691"/>
<g>
<polygon class="st2" points="22.041,32.606 36.003,56.785 49.964,32.606 "/>
</g>
</g>
</g>
</svg>
resources/pause-mission.svg 0 → 100644
View file @ 2e7364da
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:8;stroke-miterlimit:10;}
</style>
<line class="st0" x1="28.836" y1="17.171" x2="28.836" y2="54.829"/>
<line class="st0" x1="43.164" y1="17.171" x2="43.164" y2="54.829"/>
</svg>
resources/rtl.svg
View file @ 2e7364da
......@@ -3,14 +3,17 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
.st1{fill:#FFFFFF;}
.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:8;stroke-miterlimit:10;}
.st2{fill:#FFFFFF;}
</style>
<path class="st0" d="M54.244,25.2c3.345,0,6.056,1.958,6.056,4.374v26.353c0,2.416-2.711,4.374-6.056,4.374H17.756
c-3.345,0-6.056-1.958-6.056-4.374V29.574c0-2.416,2.711-4.374,6.056-4.374"/>
<g>
<g>
<path class="st0" d="M55.141,11.618H33.159c-12.14,0-21.982,9.842-21.982,21.982v0c0,12.14,9.842,21.982,21.982,21.982h7.629"/>
<path class="st1" d="M62.002,15.64H45.574c-5.291,0-9.58,4.289-9.58,9.58l0.003,11.472"/>
<g>
<polygon class="st1" points="37.871,65.554 55.141,55.581 37.871,45.609 "/>
<polygon class="st2" points="22.035,32.61 36.003,56.785 49.958,32.603 "/>
</g>
</g>
</g>
......
resources/takeoff.svg
View file @ 2e7364da
......@@ -4,16 +4,17 @@
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:8;stroke-miterlimit:10;}
.st2{fill:#FFFFFF;}
</style>
<path class="st0" d="M54.244,25.2c3.345,0,6.056,1.958,6.056,4.374v26.353c0,2.416-2.711,4.374-6.056,4.374H17.756
c-3.345,0-6.056-1.958-6.056-4.374V29.574c0-2.416,2.711-4.374,6.056-4.374"/>
<g>
<path class="st0" d="M13.866,40.628c-0.002,0.001-0.003,0.002-0.005,0.003c-0.615,0.32-0.883,1.059-0.614,1.699
c0.27,0.642,0.988,0.967,1.649,0.748l18.622-6.196l-3.482,5.686c-0.253,0.413-0.199,0.944,0.131,1.299
c0.33,0.354,0.856,0.445,1.286,0.221l3.652-1.898c0.105-0.054,0.2-0.126,0.282-0.211l10.818-11.301l13.351-6.966
c5.056-2.726,4.471-4.821,4.171-5.398c-0.232-0.447-0.752-1.048-1.907-1.365c-1.171-0.322-2.754-0.296-4.837,0.079
c-0.696,0.125-1.079,0.114-1.486,0.103c-1.429-0.039-2.398,0.057-7.212,2.558L21.959,33.369L11.751,28.07
c-0.385-0.2-0.843-0.2-1.228,0.001l-1.72,0.894c-0.354,0.184-0.607,0.517-0.689,0.908c-0.082,0.391,0.015,0.797,0.265,1.109
l7.086,8.826L13.866,40.628z"/>
<line class="st1" x1="7.607" y1="55.275" x2="64.393" y2="55.275"/>
<g>
<line class="st1" x1="36" y1="56.546" x2="36" y2="31.554"/>
<g>
<polygon class="st2" points="49.962,35.639 36,11.461 22.038,35.639 "/>
</g>
</g>
</g>
</svg>
src/FlightDisplay/FlightDisplayView.qml
View file @ 2e7364da
......@@ -408,12 +408,12 @@ QGCView {
},
{
name: guidedController.pauseTitle,
iconSource: "/res/Pause.svg",
iconSource: "/res/pause-mission.svg",
action: guidedController.actionPause
},
{
name: qsTr("Action"),
iconSource: "/qmlimages/MapCenter.svg",
iconSource: "/res/action.svg",
action: -1
},
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment