Browse Source

Merge pull request #4327 from bluerobotics/compassIcon

Change airplane compass icon to generic arrow icon
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
23eb60d374
  1. 3
      qgcresources.qrc
  2. 9
      src/FlightMap/Images/compassInstrumentArrow.svg
  3. 9
      src/FlightMap/Images/vehicleArrowOpaque.svg
  4. 9
      src/FlightMap/Images/vehicleArrowOutline.svg
  5. 2
      src/FlightMap/MapItems/VehicleMapItem.qml
  6. 2
      src/FlightMap/Widgets/QGCCompassWidget.qml

3
qgcresources.qrc

@ -97,6 +97,7 @@ @@ -97,6 +97,7 @@
<file alias="buttonHome.svg">src/FlightMap/Images/buttonHome.svg</file>
<file alias="buttonMore.svg">src/FlightMap/Images/buttonMore.svg</file>
<file alias="compassInstrumentAirplane.svg">src/FlightMap/Images/compassInstrumentAirplane.svg</file>
<file alias="compassInstrumentArrow.svg">src/FlightMap/Images/compassInstrumentArrow.svg</file>
<file alias="compassInstrumentDial.svg">src/FlightMap/Images/compassInstrumentDial.svg</file>
<file alias="crossHair.svg">src/FlightMap/Images/crossHair.svg</file>
<file alias="PiP.svg">src/FlightMap/Images/PiP.svg</file>
@ -108,6 +109,8 @@ @@ -108,6 +109,8 @@
<file alias="scale_endLight.png">src/FlightMap/Images/scale_endLight.png</file>
<file alias="airplaneOutline.svg">src/FlightMap/Images/airplaneOutline.svg</file>
<file alias="airplaneOpaque.svg">src/FlightMap/Images/airplaneOpaque.svg</file>
<file alias="vehicleArrowOutline.svg">src/FlightMap/Images/vehicleArrowOutline.svg</file>
<file alias="vehicleArrowOpaque.svg">src/FlightMap/Images/vehicleArrowOpaque.svg</file>
<file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
<file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
<file alias="ArrowHead.svg">src/FlightMap/Images/ArrowHead.svg</file>

9
src/FlightMap/Images/compassInstrumentArrow.svg

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 288" style="enable-background:new 0 0 288 288;" xml:space="preserve">
<style type="text/css">
.st0{fill:#231F20;stroke:#D23528;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;}
</style>
<polygon class="st0" points="144,173.6 137.1,240.2 76.9,252 144,36 144,36 211,252 151,240.2 "/>
</svg>

After

Width:  |  Height:  |  Size: 579 B

9
src/FlightMap/Images/vehicleArrowOpaque.svg

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 288" style="enable-background:new 0 0 288 288;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FF460A;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;}
</style>
<polygon class="st0" points="144,173.6 137.1,240.2 76.9,252 144,36 144,36 211,252 151,240.2 "/>
</svg>

After

Width:  |  Height:  |  Size: 579 B

9
src/FlightMap/Images/vehicleArrowOutline.svg

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 288" style="enable-background:new 0 0 288 288;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;}
</style>
<polygon class="st0" points="144,173.6 137.1,240.2 76.9,252 144,36 144,36 211,252 151,240.2 "/>
</svg>

After

Width:  |  Height:  |  Size: 576 B

2
src/FlightMap/MapItems/VehicleMapItem.qml

@ -30,7 +30,7 @@ MapQuickItem { @@ -30,7 +30,7 @@ MapQuickItem {
sourceItem: Image {
id: vehicleIcon
source: isSatellite ? "/qmlimages/airplaneOpaque.svg" : "/qmlimages/airplaneOutline.svg"
source: isSatellite ? "/qmlimages/vehicleArrowOpaque.svg" : "/qmlimages/vehicleArrowOutline.svg"
mipmap: true
width: size
sourceSize.width: size

2
src/FlightMap/Widgets/QGCCompassWidget.qml

@ -48,7 +48,7 @@ Item { @@ -48,7 +48,7 @@ Item {
Image {
id: pointer
source: "/qmlimages/compassInstrumentAirplane.svg"
source: "/qmlimages/compassInstrumentArrow.svg"
mipmap: true
width: size * 0.75
sourceSize.width: width

Loading…
Cancel
Save