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

Remove the hardcoded .svg from the QLabel and load it dynamically. This will

Browse Source 
be useful for CC3D.
This commit is contained in:
James Cotton 2012-01-31 14:11:04 -06:00
parent 318354a115
commit a2979125b7
2 changed files with 306 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
View File

@ -30,9 +30,6 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap">
<pixmap resource="configgadget.qrc">:/configgadget/images/coptercontrol.svg</pixmap>
</property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -300,7 +297,6 @@ Beware of not locking yourself out!</string>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="configgadget.qrc"/>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>
</resources> </resources>
<connections/> <connections/>

3
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -40,6 +40,9 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{ {
m_telemetry = new Ui_CC_HW_Widget(); m_telemetry = new Ui_CC_HW_Widget();
m_telemetry->setupUi(this); m_telemetry->setupUi(this);
m_telemetry->label_2->setPixmap(QPixmap(":/configgadget/images/coptercontrol.svg"));
setupButtons(m_telemetry->saveTelemetryToRAM,m_telemetry->saveTelemetryToSD); setupButtons(m_telemetry->saveTelemetryToRAM,m_telemetry->saveTelemetryToSD);
addUAVObjectToWidgetRelation("HwSettings","CC_FlexiPort",m_telemetry->cbFlexi); addUAVObjectToWidgetRelation("HwSettings","CC_FlexiPort",m_telemetry->cbFlexi);
addUAVObjectToWidgetRelation("HwSettings","CC_MainPort",m_telemetry->cbTele); addUAVObjectToWidgetRelation("HwSettings","CC_MainPort",m_telemetry->cbTele);