Skip to content

Commit

Permalink
Merge pull request #8651 from mavlink/ValueIcons
Browse files Browse the repository at this point in the history
Icon support for instrument values
  • Loading branch information
DonLakeFlyer committed Apr 10, 2020
2 parents 0121a26 + 71149ea commit d8ba733
Show file tree
Hide file tree
Showing 308 changed files with 905 additions and 64 deletions.
301 changes: 301 additions & 0 deletions InstrumentValueIcons.qrc

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion qgroundcontrol.pro
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ CustomBuild {
RESOURCES += \
$$PWD/qgroundcontrol.qrc \
$$PWD/qgcresources.qrc \
$$PWD/qgcimages.qrc
$$PWD/qgcimages.qrc \
$$PWD/InstrumentValueIcons.qrc \
}

# On Qt 5.9 android versions there is the following bug: https://bugreports.qt.io/browse/QTBUG-61424
Expand Down
21 changes: 21 additions & 0 deletions resources/InstrumentValueIcons/UpdateResourceFile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env python
import os

def main():
qrcFile = open("InstrumentValueIcons.qrc", 'wt')

qrcFile.write("<RCC>\n")
qrcFile.write("\t<qresource prefix=\"/InstrumentValueIcons\">\n")

files = os.listdir(".")
for filename in files:
if filename.endswith(".svg"):
qrcFile.write("\t\t<file alias=\"%s\">resources/InstrumentValueIcons/%s</file>\n" % (filename, filename))

qrcFile.write("\t</qresource>\n")
qrcFile.write("</RCC>\n")

qrcFile.close()

if __name__ == '__main__':
main()
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/add-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/add-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/adjust.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/airplane.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/album.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/align-center.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/align-justified.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/align-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/align-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/anchor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/announcement.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/apparel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-outline-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-outline-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-outline-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-outline-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thick-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thick-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thick-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thick-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thin-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thin-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thin-right.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-thin-up.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/arrow-up.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/artist.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/at-symbol.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/attachment.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/backspace.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/backward-step.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/backward.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/badge.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/battery-full.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/battery-half.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/battery-low.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/beverage.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/block.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bluetooth.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bolt.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/book-reference.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bookmark copy 2.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bookmark copy 3.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bookmark-outline-add.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bookmark-outline.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bookmark.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-all.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-bottom.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-horizontal.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-inner.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-left.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-none.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-outer.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-right.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-top.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/border-vertical.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/box.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/brightness-down.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/brightness-up.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/browser-window-new.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/browser-window-open.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/browser-window.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/bug.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/buoy.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/calculator.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/calendar.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/camera.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/chart-bar.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/chart-pie.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/chart.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/chat-bubble-dots.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/checkmark-outline.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/checkmark.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/cheveron-down.svg
1 change: 1 addition & 0 deletions resources/InstrumentValueIcons/cheveron-left.svg
Loading

0 comments on commit d8ba733

Please sign in to comment.