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

Do not prompt to use previous version settings when newer version

Browse Source
This commit is contained in:
elecpower
2021-12-31 10:53:11 +01:00
committed by Raphael Coeffic
parent e64f57768a
commit 7648dfc544
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/companion.cpp
+8 -14
View File
@@ -69,28 +69,22 @@ void checkSettingsImport(bool force = false)
if (!found && !force)
return;
const QString impFileBtn = QCoreApplication::translate("Companion", "Import from File");
const QString impPrevBtn = QCoreApplication::translate("Companion", "Import from v%1").arg(previousVersion);
const QString impNoneBtn = QCoreApplication::translate("Companion", "Do not import");
QString msg;
if (previousVersion.isEmpty()) {
const QString impFileBtn = QCoreApplication::translate("Companion", "Import from File");
const QString impNoneBtn = QCoreApplication::translate("Companion", "Do not import");
if (found)
msg = QCoreApplication::translate("Companion", "We have found possible Companion settings backup file(s).\nDo you want to import settings from a file?");
else
msg = QCoreApplication::translate("Companion", "Import settings from a file, or start with current values.");
const int ret = QMessageBox::question(nullptr, CPN_STR_APP_NAME, msg, impNoneBtn, impFileBtn, 0, 0);
if (!ret)
return;
}
else {
msg = QCoreApplication::translate("Companion", "We have found existing settings for Companion version: %1.\nDo you want to import them?\n\n" \
"If you have a settings backup file, you may import that instead.").arg(previousVersion);
}
const int ret = QMessageBox::question(nullptr, CPN_STR_APP_NAME, msg, impNoneBtn, impFileBtn, (previousVersion.isEmpty() ? QString() : impPrevBtn), 0, 0);
if (!ret)
return;
// Import from previous version
if (ret == 2) {
if (!g.importSettings(previousVersion)) {
// very unlikely, but just in case of unexpected error, restart the import
importError();
companion/src/storage/appdata.cpp
+1 -1
View File
@@ -471,7 +471,7 @@ void AppData::clearUnusedSettings(QSettings & settings)
bool AppData::findPreviousVersionSettings(QString * version) const
{
// TODO need a more dynamic method since ETX moves so quickly
static const QStringList versList({QStringLiteral("2.5"), QStringLiteral("2.4")});
static const QStringList versList({QStringLiteral("2.6"), QStringLiteral("2.5"), QStringLiteral("2.4")});
for (const QString &ver : versList) {
const QString prod("Companion " % ver);