Change icon for the application, and also changed what serial port name shows up in the firmware screen below the combo box

malcom2073 · malcom2073 · commit f809bae34453 · 2013-09-27T12:34:06.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-IDI_ICON1 ICON DISCARDABLE "files/images/icons/apmplanner.ico"`
	`1`	`+IDI_ICON1 ICON DISCARDABLE "files/APMIcons/ap_rc.ico"`
Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ void ApmFirmwareConfig::setLink(int index)`
`723`	`723`	`#ifdef Q_OS_WIN`
`724`	`724`	`ui.comPortNameLabel->setText(ui.linkComboBox->itemData(index).toStringList()[1] + "\n" + ui.linkComboBox->itemData(index).toStringList()[2]);`
`725`	`725`	`#else`
`726`		`- ui.comPortNameLabel->setText(ui.linkComboBox->itemData(index).toStringList()[0] + "\n" + ui.linkComboBox->itemData(index).toStringList()[2]);`
	`726`	`+ ui.comPortNameLabel->setText(ui.linkComboBox->itemData(index).toStringList()[1] + "\n" + ui.linkComboBox->itemData(index).toStringList()[2]);`
`727`	`727`	`#endif`
`728`	`728`	`foreach(QSerialPortInfo info,QSerialPortInfo::availablePorts())`
`729`	`729`	`{`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void PX4FirmwareUploader::run()`
`290`	`290`	`if (bootloaderrev >= 4)`
`291`	`291`	`{`
`292`	`292`	`QLOG_FATAL() << "PX4Firmware Uploader does not yet support V4 bootloaders";`
`293`		`- //return;`
	`293`	`+ return;`
`294`	`294`	`}`
`295`	`295`	`msleep(500);`
`296`	`296`	`emit statusUpdate("Requesting board ID");`