zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Icon Tweaks 

Tweaking MapType and MapCenter icons
Added Zoom Plus/Minus icons to be used for maps
Added PiP icon for the upcoming Picture-in-Picture functionality
QGC4.4
dogmaphobic 10 years ago
parent
4e0990833d
commit
f9bcd4f250
8 changed files with 43 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      qgroundcontrol.qrc
  2. 2
      src/FlightMap/FlightMap.qml
  3. 12
      src/FlightMap/Images/MapCenter.svg
  4. 6
      src/FlightMap/Images/MapType.svg
  5. 10
      src/FlightMap/Images/PiP.svg
  6. 9
      src/FlightMap/Images/ZoomMinus.svg
  7. 8
      src/FlightMap/Images/ZoomPlus.svg
  8. 5
      src/QmlControls/DropButton.qml

2
qgroundcontrol.qrc
Unescape View File

@ -64,6 +64,8 @@ @@ -64,6 +64,8 @@
<file alias="airplaneOpaque.svg">src/FlightMap/Images/airplaneOpaque.svg</file>
<file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
<file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
<file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
<file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
</qresource>
<qresource prefix="/qml">
<file alias="test.qml">src/test.qml</file>

2
src/FlightMap/FlightMap.qml
Unescape View File

@ -114,6 +114,7 @@ Map { @@ -114,6 +114,7 @@ Map {
QGCButton {
width: parent._buttonWidth
//iconSource: "/qmlimages/ZoomPlus.svg"
text: "+"
onClicked: {
@ -129,6 +130,7 @@ Map { @@ -129,6 +130,7 @@ Map {
QGCButton {
width: parent._buttonWidth
//iconSource: "/qmlimages/ZoomMinus.svg"
text: "-"
onClicked: {

12
src/FlightMap/Images/MapCenter.svg
Unescape View File

@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
<!-- Generator: Adobe Illustrator 19.1.0, 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" enable-background="new 0 0 72 72" xml:space="preserve">
<circle opacity="0.75" cx="36" cy="36" r="34.2"/>
<circle opacity="0.95" cx="36" cy="36" r="34.2"/>
<g>
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="36" cy="36" r="27"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="8.899" y1="35.97" x2="22.219" y2="36.03"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="35.97" y1="63.101" x2="36.03" y2="49.781"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="63.101" y1="36.03" x2="49.781" y2="35.97"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="36.03" y1="8.899" x2="35.97" y2="22.219"/>
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="36" cy="36" r="22.38"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="13.536" y1="35.975" x2="24.577" y2="36.025"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="35.975" y1="58.464" x2="36.025" y2="47.423"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="58.464" y1="36.025" x2="47.423" y2="35.975"/>
<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="36.025" y1="13.536" x2="35.975" y2="24.577"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1014 B

After

Width:  |  Height:  |  Size: 1.0 KiB

6
src/FlightMap/Images/MapType.svg
Unescape View File

@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
<!-- Generator: Adobe Illustrator 19.1.0, 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" enable-background="new 0 0 72 72" xml:space="preserve">
<circle opacity="0.75" cx="36" cy="36" r="34.2"/>
<circle opacity="0.95" cx="36" cy="36" r="34.2"/>
<g>
<polygon fill="#414042" stroke="#FFFFFF" stroke-miterlimit="10" points="63,39.345 36,59.4 9,39.345 36,19.291 "/>
<polygon fill="#414042" stroke="#FFFFFF" stroke-miterlimit="10" points="63,32.655 36,52.709 9,32.655 36,12.6 "/>
<polygon stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" points="58.5,38.788 36,55.5 13.5,38.788 36,22.076 "/>
<polygon stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" points="58.5,33.212 36,49.924 13.5,33.212 36,16.5 "/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 658 B

10
src/FlightMap/Images/PiP.svg
Unescape View File

@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, 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" enable-background="new 0 0 72 72" xml:space="preserve">
<path opacity="0.85" d="M0,72V0l72,0C72,39.797,39.797,72,0,72z"/>
<g>
<rect x="14.4" y="15.401" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" width="36" height="27"/>
<rect x="5.4" y="6.401" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" width="36" height="27"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 646 B

9
src/FlightMap/Images/ZoomMinus.svg
Unescape View File

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, 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" enable-background="new 0 0 72 72" xml:space="preserve">
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="29.573" cy="30.04" r="22.416"/>
<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="64.8" y1="64.83" x2="45.801" y2="45.765"/>
<line fill="none" x1="16.973" y1="30.04" x2="42.173" y2="30.04"/>
<line fill="none" stroke="#FFFFFF" stroke-width="5" stroke-miterlimit="10" x1="16.973" y1="30.134" x2="42.173" y2="29.946"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 780 B

8
src/FlightMap/Images/ZoomPlus.svg
Unescape View File

@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, 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" enable-background="new 0 0 72 72" xml:space="preserve">
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="29.573" cy="30.04" r="22.416"/>
<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="64.8" y1="64.83" x2="45.801" y2="45.765"/>
<path fill="#FFFFFF" d="M27.36,42.653V32.187H16.973v-4.374H27.36V17.426h4.426v10.387h10.387v4.374H31.786v10.466H27.36z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 710 B

5
src/QmlControls/DropButton.qml
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import QtQuick 2.2
import QtQuick 2.4
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
@ -149,7 +149,8 @@ Item { @@ -149,7 +149,8 @@ Item {
anchors.fill: parent
fillMode: Image.PreserveAspectFit
opacity: _showDropDown ? 1.0 : 0.75
mipmap: true
smooth: true
MouseArea {
anchors.fill: parent

Write Preview
Loading…
Cancel
Save