piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to .otx extension instead of .eepe for new files

Browse Source
This commit is contained in:
Bertrand Songis
2017-01-18 10:22:37 +01:00
parent 125c301c56
commit cfdd37bbbb
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/mainwindow.cpp
+4 -4
View File
@@ -546,9 +546,9 @@ void MainWindow::setIconThemeSize(int index)
void MainWindow::newFile() void MainWindow::newFile()
{ {
MdiChild * child = createMdiChild(); MdiChild * child = createMdiChild();
child->newFile(); child->newFile();
child->show(); child->show();
} }
void MainWindow::openDocURL() void MainWindow::openDocURL()
@@ -771,7 +771,7 @@ void MainWindow::readEeprom()
qDebug() << "MainWindow::readEeprom(): using temp file: " << tempFile; qDebug() << "MainWindow::readEeprom(): using temp file: " << tempFile;
if (readEepromFromRadio(tempFile)) { if (readEepromFromRadio(tempFile)) {
MdiChild *child = createMdiChild(); MdiChild * child = createMdiChild();
child->newFile(); child->newFile();
child->loadFile(tempFile, false); child->loadFile(tempFile, false);
child->show(); child->show();
companion/src/mdichild.cpp
+20 -20
View File
@@ -418,7 +418,7 @@ void MdiChild::newFile()
{ {
static int sequenceNumber = 1; static int sequenceNumber = 1;
isUntitled = true; isUntitled = true;
curFile = QString("document%1.eepe").arg(sequenceNumber++); curFile = QString("document%1.otx").arg(sequenceNumber++);
updateTitle(); updateTitle();
} }
@@ -454,31 +454,31 @@ bool MdiChild::save()
bool MdiChild::saveAs(bool isNew) bool MdiChild::saveAs(bool isNew)
{ {
QString fileName; QString fileName;
if (IS_SKY9X(GetEepromInterface()->getBoard())) { if (IS_SKY9X(GetEepromInterface()->getBoard())) {
curFile.replace(".eepe", ".bin"); curFile.replace(".eepe", ".bin");
QFileInfo fi(curFile); QFileInfo fi(curFile);
#ifdef __APPLE__ #ifdef __APPLE__
fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName()); fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
#else #else
fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER)); fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER));
#endif #endif
} }
else { else {
QFileInfo fi(curFile); QFileInfo fi(curFile);
#ifdef __APPLE__ #ifdef __APPLE__
fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName()); fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
#else #else
fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER)); fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER));
#endif #endif
} }
if (fileName.isEmpty()) if (fileName.isEmpty())
return false; return false;
g.eepromDir( QFileInfo(fileName).dir().absolutePath() ); g.eepromDir( QFileInfo(fileName).dir().absolutePath() );
if (isNew) if (isNew)
return saveFile(fileName); return saveFile(fileName);
else else
return saveFile(fileName,true); return saveFile(fileName,true);
} }
bool MdiChild::saveFile(const QString & filename, bool setCurrent) bool MdiChild::saveFile(const QString & filename, bool setCurrent)