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

chore(cpn): Refactor component updates (#3218)

Browse Source 
* Refactoring

* Fix current release id and process dlg events

* enh: Process updates dialog add select/deselect all components

* Change Expression to Pattern
This commit is contained in:
Neil Horne
2023-03-19 16:13:56 +10:00
committed by GitHub
parent fc1d6ba3a0
commit a1178f83a6
47 changed files with 3370 additions and 2813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/updates/updatesdialog.cpp
+28 -13
View File
@@ -139,7 +139,7 @@ UpdatesDialog::UpdatesDialog(QWidget * parent, UpdateFactories * factories) :
QGridLayout *grid = new QGridLayout();
QLabel *h1 = new QLabel();
QCheckBox *h1 = new QCheckBox();
grid->addWidget(h1, row, col++);
QLabel *h2 = new QLabel(tr("Name"));
@@ -166,13 +166,15 @@ UpdatesDialog::UpdatesDialog(QWidget * parent, UpdateFactories * factories) :
const int i = it.value();
const QString name = it.key();
UpdateInterface *iface = factories->instance(i);
row++;
col = 0;
msg->setText(tr("Retrieving latest release information for %1").arg(name));
chkUpdate[i] = new QCheckBox();
chkUpdate[i]->setProperty("index", i);
chkUpdate[i]->setChecked(!factories->isLatestRelease(i));
chkUpdate[i]->setChecked(!iface->isReleaseLatest());
grid->addWidget(chkUpdate[i], row, col++);
grid->setAlignment(chkUpdate[i], Qt::AlignHCenter);
@@ -184,26 +186,31 @@ UpdatesDialog::UpdatesDialog(QWidget * parent, UpdateFactories * factories) :
cboRelChannel[i]->setCurrentIndex(g.component[i].releaseChannel());
grid->addWidget(cboRelChannel[i], row, col++);
lblCurrentRel[i] = new QLabel(factories->currentRelease(i));
lblCurrentRel[i] = new QLabel(iface->releaseCurrent());
grid->addWidget(lblCurrentRel[i], row, col++);
cboUpdateRel[i] = new QComboBox();
cboUpdateRel[i]->addItems(factories->releases(i));
cboUpdateRel[i]->addItems(iface->releaseList());
grid->addWidget(cboUpdateRel[i], row, col++);
connect(cboRelChannel[i], QOverload<int>::of(&QComboBox::currentIndexChanged), [=] (const int index) {
factories->setReleaseChannel(i, index);
iface->setReleaseChannel(index);
chkUpdate[i]->setChecked(!iface->isReleaseLatest());
cboUpdateRel[i]->clear();
cboUpdateRel[i]->addItems(factories->releases(i));
cboUpdateRel[i]->addItems(iface->releaseList());
});
connect(cboUpdateRel[i], QOverload<int>::of(&QComboBox::currentIndexChanged), [=] (const int index) {
chkUpdate[i]->setChecked(cboUpdateRel[i]->currentText() != lblCurrentRel[i]->text());
});
btnOptions[i] = new QPushButton(tr("Options"));
connect(btnOptions[i], &QPushButton::clicked, [=]() {
UpdateOptionsDialog *dlg = new UpdateOptionsDialog(this, factories, i, true);
UpdateOptionsDialog *dlg = new UpdateOptionsDialog(this, iface, i, true);
connect(dlg, &UpdateOptionsDialog::changed, [=](const int i) {
chkUpdate[i]->setChecked(!factories->isLatestRelease(i));
lblCurrentRel[i]->setText(factories->currentRelease(i));
cboUpdateRel[i]->setCurrentText(factories->updateRelease(i));
chkUpdate[i]->setChecked(!iface->isReleaseLatest());
lblCurrentRel[i]->setText(iface->releaseCurrent());
cboUpdateRel[i]->setCurrentText(iface->releaseUpdate());
});
dlg->exec();
dlg->deleteLater();
@@ -214,6 +221,14 @@ UpdatesDialog::UpdatesDialog(QWidget * parent, UpdateFactories * factories) :
ui->grpComponents->setLayout(grid);
connect(h1, &QCheckBox::clicked, [=] (bool checked) {
QMapIterator<QString, int> it(sortedCompList);
while (it.hasNext()) {
it.next();
chkUpdate[it.value()]->setChecked(checked);
}
});
QPushButton *btnSaveAsDefaults = new QPushButton(tr("Save as Defaults"));
ui->buttonBox->addButton(btnSaveAsDefaults, QDialogButtonBox::ActionRole);
connect(btnSaveAsDefaults, &QPushButton::clicked, [=]() {
@@ -272,8 +287,8 @@ void UpdatesDialog::accept()
if (chkUpdate[i]->isChecked()) {
cnt++;
UpdateParameters *params = factories->getParams(i);
params->updateRelease = cboUpdateRel[i]->currentText();
UpdateParameters *params = factories->instance(i)->params();
params->releaseUpdate = cboUpdateRel[i]->currentText();
params->flags |= UpdateInterface::UPDFLG_Update;
params->downloadDir = ui->leDownloadDir->text();
params->decompressDirUseDwnld = ui->chkDecompressDirUseDwnld->isChecked();
@@ -315,6 +330,6 @@ void UpdatesDialog::saveAsDefaults()
it.next();
const int i = it.value();
g.component[i].releaseChannel((ComponentData::ReleaseChannel)cboRelChannel[i]->currentIndex());
factories->saveAssetSettings(i);
factories->instance(i)->assetSettingsSave();
}
}