Peter M. Groen / openhantek

Commit 8d620a742e6ad9610265a47a5d1fab8733dc685b

Authored by David Graeff
Committed by David Gräff
1 parent 600b1dcf

Fix firmware upload. Fixes #113

Inline Side-by-side
Showing 1 changed file with 10 additions and 6 deletions
openhantek/src/main.cpp
  View file @8d620a7
@@ -84,6 +84,8 @@ int main(int argc, char *argv[]) { @@ -84,6 +84,8 @@ int main(int argc, char *argv[]) {
84 } 84 }
85 devices.clear(); 85 devices.clear();
86 86
  87 +#define TR(str) QCoreApplication::translate("Firmware upload dialog", str)
  88 +
87 //////// Select device - Autoselect if only one device is ready //////// 89 //////// Select device - Autoselect if only one device is ready ////////
88 std::unique_ptr<QDialog> dialog = std::unique_ptr<QDialog>(new QDialog); 90 std::unique_ptr<QDialog> dialog = std::unique_ptr<QDialog>(new QDialog);
89 QListWidget *w = new QListWidget(dialog.get()); 91 QListWidget *w = new QListWidget(dialog.get());
@@ -93,18 +95,20 @@ int main(int argc, char *argv[]) { @@ -93,18 +95,20 @@ int main(int argc, char *argv[]) {
93 QString modelName = QString::fromStdString(i->getModel().name); 95 QString modelName = QString::fromStdString(i->getModel().name);
94 96
95 if (i->needsFirmware()) { 97 if (i->needsFirmware()) {
96 - w->addItem(  
97 - QCoreApplication::translate("Firmware upload dialog", "%1: Firmware upload failed").arg(modelName)); 98 + if (UploadFirmware().startUpload(&*i)) {
  99 + w->addItem(TR("%1: Upload failed").arg(modelName));
  100 + } else {
  101 + w->addItem(TR("%1: Upload failed").arg(modelName));
  102 +
  103 + }
98 continue; 104 continue;
99 } 105 }
100 QString errorMessage; 106 QString errorMessage;
101 if (i->connectDevice(errorMessage)) { 107 if (i->connectDevice(errorMessage)) {
102 - w->addItem(QCoreApplication::translate("Firmware upload dialog", "%1: Ready").arg(modelName)); 108 + w->addItem(TR("%1: Ready").arg(modelName));
103 w->setCurrentRow(w->count() - 1); 109 w->setCurrentRow(w->count() - 1);
104 } else { 110 } else {
105 - w->addItem(QCoreApplication::translate("Firmware upload dialog", "%1: %2")  
106 - .arg(modelName)  
107 - .arg(findDevices.getErrorMessage())); 111 + w->addItem(TR("%1: %2").arg(modelName).arg(findDevices.getErrorMessage()));
108 } 112 }
109 } 113 }
110 114