From 54eb567770dff076c7670a9c213528d892fd5d5e Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Thu, 27 Mar 2014 13:57:15 +0100 Subject: [PATCH] Fix for #874. Also killed some unused defines that were only confusing. --- companion/src/burndialog.cpp | 2 +- companion/src/burndialog.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index e02cf9b02..fcc96ff85 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -146,7 +146,7 @@ void burnDialog::on_FlashLoadButton_clicked() checkFw(fileName); } else { - QString fileName = QFileDialog::getOpenFileName(this,tr("Choose file to load Models and Settings from"), g.eepromDir(), tr(EXTERNAL_EEPROM_FILES_FILTER)); + QString fileName = QFileDialog::getOpenFileName(this,tr("Choose file to load Models and Settings from"), g.eepromDir(), tr(EEPE_FILES_FILTER)); if (checkeEprom(fileName)) { if (burnraw==false) { ui->BurnFlashButton->setEnabled(true); diff --git a/companion/src/burndialog.h b/companion/src/burndialog.h index 1ffac2b92..28e568d3b 100644 --- a/companion/src/burndialog.h +++ b/companion/src/burndialog.h @@ -7,12 +7,9 @@ #include "flashinterface.h" #include "xmlinterface.h" -#define XML_FILES_FILTER "XML files (*.xml);;" #define HEX_FILES_FILTER "HEX files (*.hex);;" #define BIN_FILES_FILTER "BIN files (*.bin);;" #define EEPE_FILES_FILTER "EEPE EEPROM files (*.eepe);;" -#define EEPM_FILES_FILTER "EEPE MODEL files (*.eepm);;" -// #define EEPROM_FILES_FILTER "EEPE files (*.xml *.eepe *.eepm *.bin *.hex);;" XML_FILES_FILTER EEPE_FILES_FILTER EEPM_FILES_FILTER BIN_FILES_FILTER HEX_FILES_FILTER #define EEPROM_FILES_FILTER "EEPE files (*.eepe *.bin *.hex);;" EEPE_FILES_FILTER BIN_FILES_FILTER HEX_FILES_FILTER #define FLASH_FILES_FILTER "FLASH files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER #define EXTERNAL_EEPROM_FILES_FILTER "EEPROM files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER