From f809bae34453cf5485a3812424b1fb31a1a53522 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Fri, 27 Sep 2013 12:34:06 -0400 Subject: [PATCH] Change icon for the application, and also changed what serial port name shows up in the firmware screen below the combo box --- deploy/apm_installer_crossplat.nsi | 2 +- qgroundcontrol.pro | 2 +- qgroundcontrol.rc | 2 +- src/ui/configuration/ApmFirmwareConfig.cc | 2 +- src/ui/configuration/PX4FirmwareUploader.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/apm_installer_crossplat.nsi b/deploy/apm_installer_crossplat.nsi index 8df5ef61c0..2d195b871d 100644 --- a/deploy/apm_installer_crossplat.nsi +++ b/deploy/apm_installer_crossplat.nsi @@ -1,5 +1,5 @@ !include "MUI2.nsh" -!define MUI_ICON "..\files\images\icons\apmplanner.ico" +!define MUI_ICON "..\files\APMIcons\ap_rc.ico" Name "APM Planner 2" !ifndef QTDIR diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 0674c39a83..f5e59818dd 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -719,7 +719,7 @@ SOURCES += src/main.cc \ src/ui/configuration/AdvancedParamConfig.cc \ src/ui/configuration/ArduCopterPidConfig.cc \ src/ui/ApmToolBar.cc \ - src/ui/configuration/PX4FirmwareUploader.cpp \ + src/ui/configuration/PX4FirmwareUploader.cc \ src/ui/configuration/ApmPlaneLevel.cc \ src/ui/configuration/ParamWidget.cc \ src/ui/configuration/ArduPlanePidConfig.cc \ diff --git a/qgroundcontrol.rc b/qgroundcontrol.rc index 94ced2f079..7bfea780e5 100644 --- a/qgroundcontrol.rc +++ b/qgroundcontrol.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "files/images/icons/apmplanner.ico" +IDI_ICON1 ICON DISCARDABLE "files/APMIcons/ap_rc.ico" diff --git a/src/ui/configuration/ApmFirmwareConfig.cc b/src/ui/configuration/ApmFirmwareConfig.cc index 439a8c84e3..c66d61182a 100644 --- a/src/ui/configuration/ApmFirmwareConfig.cc +++ b/src/ui/configuration/ApmFirmwareConfig.cc @@ -723,7 +723,7 @@ void ApmFirmwareConfig::setLink(int index) #ifdef Q_OS_WIN ui.comPortNameLabel->setText(ui.linkComboBox->itemData(index).toStringList()[1] + "\n" + ui.linkComboBox->itemData(index).toStringList()[2]); #else - ui.comPortNameLabel->setText(ui.linkComboBox->itemData(index).toStringList()[0] + "\n" + ui.linkComboBox->itemData(index).toStringList()[2]); + ui.comPortNameLabel->setText(ui.linkComboBox->itemData(index).toStringList()[1] + "\n" + ui.linkComboBox->itemData(index).toStringList()[2]); #endif foreach(QSerialPortInfo info,QSerialPortInfo::availablePorts()) { diff --git a/src/ui/configuration/PX4FirmwareUploader.cc b/src/ui/configuration/PX4FirmwareUploader.cc index 0238d818eb..4f6d6f5c71 100644 --- a/src/ui/configuration/PX4FirmwareUploader.cc +++ b/src/ui/configuration/PX4FirmwareUploader.cc @@ -290,7 +290,7 @@ void PX4FirmwareUploader::run() if (bootloaderrev >= 4) { QLOG_FATAL() << "PX4Firmware Uploader does not yet support V4 bootloaders"; - //return; + return; } msleep(500); emit statusUpdate("Requesting board ID");