rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Merge branch 'kenz/erase2reset' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges

Browse Source
This commit is contained in:
chris pember 2012-09-24 20:26:30 -07:00
commit d7eb662761
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ground/openpilotgcs/src/plugins/uavobjectbrowser/images/reset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

1
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowser.qrc
View File

@ -6,5 +6,6 @@
<file>images/up_alt.png</file> <file>images/up_alt.png</file>
<file>images/trash.png</file> <file>images/trash.png</file>
<file>images/1343241276_eye.png</file> <file>images/1343241276_eye.png</file>
<file>images/reset.png</file>
</qresource> </qresource>
</RCC> </RCC>

4
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowser.ui
View File

@ -128,14 +128,14 @@
<item> <item>
<widget class="QToolButton" name="eraseSDButton"> <widget class="QToolButton" name="eraseSDButton">
<property name="toolTip"> <property name="toolTip">
<string>Erase</string> <string>Resets UAV object setting to default values at next boot</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="uavobjectbrowser.qrc"> <iconset resource="uavobjectbrowser.qrc">
<normaloff>:/uavobjectbrowser/images/trash.png</normaloff>:/uavobjectbrowser/images/trash.png</iconset> <normaloff>:/uavobjectbrowser/images/reset.png</normaloff>:/uavobjectbrowser/images/reset.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>