rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release

Browse Source
This commit is contained in:
PT_Dreamer 2012-08-01 09:32:59 +01:00
commit 4f2522cd0a
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/libs/utils/svgimageprovider.h
View File

@ -33,7 +33,9 @@
#include <QSvgRenderer>
#include <QMap>
class Q_DECL_EXPORT SvgImageProvider : public QObject, public QDeclarativeImageProvider
#include "utils_global.h"
class QTCREATOR_UTILS_EXPORT SvgImageProvider : public QObject, public QDeclarativeImageProvider
{
Q_OBJECT
public:

4
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
View File

@ -2701,10 +2701,10 @@
<Icon1>:\core\images\ah.png</Icon1>
<Icon10>:/core/images/openpilot_logo_64.png</Icon10>
<Icon2>:/core/images/config.png</Icon2>
<Icon3>:/core/images/cpu.png</Icon3>
<Icon3>:/core/images/cog.png</Icon3>
<Icon4>:/core/images/scopes.png</Icon4>
<Icon5>:/core/images/joystick.png</Icon5>
<Icon6>:/core/images/cog.png</Icon6>
<Icon6>:/core/images/cpu.png</Icon6>
<Icon7>:/core/images/openpilot_logo_64.png</Icon7>
<Icon8>:/core/images/openpilot_logo_64.png</Icon8>
<Icon9>:/core/images/openpilot_logo_64.png</Icon9>

BIN
ground/openpilotgcs/src/plugins/welcome/qml/images/system-off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
ground/openpilotgcs/src/plugins/welcome/qml/images/system-on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

4
ground/openpilotgcs/src/plugins/welcome/qml/main.qml
View File

@ -61,8 +61,8 @@ Rectangle {
}
WelcomePageButton {
baseIconName: "planner"
label: "Flight Planner"
baseIconName: "system"
label: "System"
onClicked: welcomePlugin.openPage("System")
}

2
ground/openpilotgcs/src/plugins/welcome/welcome.qrc
View File

@ -22,5 +22,7 @@
<file>qml/images/planner-off.png</file>
<file>qml/images/scopes-on.png</file>
<file>qml/images/scopes-off.png</file>
<file>qml/images/system-on.png</file>
<file>qml/images/system-off.png</file>
</qresource>
</RCC>