diff --git a/companion/src/avroutputdialog.cpp b/companion/src/avroutputdialog.cpp index b1b6827c0..40c0d0012 100644 --- a/companion/src/avroutputdialog.cpp +++ b/companion/src/avroutputdialog.cpp @@ -438,7 +438,7 @@ void avrOutputDialog::doFinished(int code=0) if (hasErrors || code) { if (!cmdLine.isEmpty()) { if (getProgrammer()!="AVRDUDE") { - QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly")); + QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly")); } else { int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No); @@ -446,8 +446,9 @@ void avrOutputDialog::doFinished(int code=0) errorWizard(); } } - } else { - QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly")); + } + else { + QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly")); } // reject(); } @@ -467,8 +468,6 @@ void avrOutputDialog::doFinished(int code=0) default: //AVR_DIALOG_KEEP_OPEN break; } - - } void avrOutputDialog::doProcessStarted() diff --git a/companion/src/avroutputdialog.h b/companion/src/avroutputdialog.h index b62a69cef..52099ace7 100644 --- a/companion/src/avroutputdialog.h +++ b/companion/src/avroutputdialog.h @@ -20,7 +20,7 @@ class avrOutputDialog : public QDialog { Q_OBJECT -public: + public: explicit avrOutputDialog(QWidget *parent, QString prog, QStringList arg, QString wTitle, int closeBehaviour=AVR_DIALOG_CLOSE_IF_SUCCESSFUL, bool displayDetails=false); ~avrOutputDialog(); @@ -29,7 +29,7 @@ public: void waitForFinish(); void addReadFuses(); -protected slots: + protected slots: void doAddTextStdOut(); void doAddTextStdErr(); void doProcessStarted(); @@ -41,7 +41,7 @@ protected slots: void killTimerElapsed(); void errorWizard(); -private: + private: QString getProgrammer(); Ui::avrOutputDialog *ui; diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index c3488e296..d26b33997 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1025,7 +1025,6 @@ bool MainWindow::writeFirmwareToRadio(const QString filename) ad->setWindowIcon(CompanionIcon("write_flash.png")); ad->exec(); delete ad; - sleep(1); result = true; } } @@ -1113,22 +1112,20 @@ bool MainWindow::writeEepromToRadio(const QString filename, const QString messag if (!path.isEmpty()) { QStringList str; str << filename << path; - avrOutputDialog *ad = new avrOutputDialog(this, "", str, message); - ad->setWindowIcon(CompanionIcon("read_eeprom.png")); + avrOutputDialog *ad = new avrOutputDialog(this, "", str, message, AVR_DIALOG_SHOW_DONE); + ad->setWindowIcon(CompanionIcon("write_eeprom.png")); ad->exec(); delete ad; - sleep(1); result = true; } } if (result == false && !IS_TARANIS(GetCurrentFirmware()->getBoard())) { QStringList str = GetSendEEpromCommand(filename); - avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Write Backup To Radio", AVR_DIALOG_SHOW_DONE); + avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Write EEPROM To Radio", AVR_DIALOG_SHOW_DONE); ad->setWindowIcon(CompanionIcon("write_eeprom.png")); ad->exec(); delete ad; - sleep(1); result = true; }