Lubuntu/lubuntu-update
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manually incorporate changes from PR #2

Browse Source
This commit is contained in:
Aaron Rainbolt 2024-01-26 16:11:11 -06:00
parent 49ec545222
commit 7785808234
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mainwindow.cpp
View File

@ -39,13 +39,16 @@ void MainWindow::setUpdateInfo(QList<QStringList> updateInfo)
ui->progressBar->setVisible(false); ui->progressBar->setVisible(false);
ui->logView->setVisible(false); ui->logView->setVisible(false);
ui->closeButton->setEnabled(true); ui->closeButton->setEnabled(true);
ui->installButton->setEnabled(false); // Correct, it starts out false, we turn it to true if there are any updates.
ui->checkUpdatesButton->setEnabled(true); ui->checkUpdatesButton->setEnabled(true);
bool installEnabled = false
for (int i = 0;i < 4;i++) { for (int i = 0;i < 4;i++) {
if (updateInfo[i].count() > 0) { int count = updateInfo[i].count();
ui->installButton->setEnabled(true);
} if (count > 0) {
installEnabled = true;
} else { continue; }
QTreeWidgetItem *installItem; QTreeWidgetItem *installItem;
switch (i) { switch (i) {
@ -63,7 +66,7 @@ void MainWindow::setUpdateInfo(QList<QStringList> updateInfo)
break; break;
} }
for (int j = 0;j < updateInfo[i].count();j++) { for (int j = 0;j < count;j++) {
// TODO: Add security update detection here - security updates should be marked in some way // TODO: Add security update detection here - security updates should be marked in some way
installItem->addChild(new QTreeWidgetItem(QStringList() << updateInfo[i][j])); installItem->addChild(new QTreeWidgetItem(QStringList() << updateInfo[i][j]));
} }
@ -73,6 +76,8 @@ void MainWindow::setUpdateInfo(QList<QStringList> updateInfo)
ui->statLabel->setText(tr("%1 package(s) will be updated. %2 of these updates are security-related.") ui->statLabel->setText(tr("%1 package(s) will be updated. %2 of these updates are security-related.")
.arg(QString::number(updateInfo[0].count() + updateInfo[1].count() + updateInfo[2].count()), .arg(QString::number(updateInfo[0].count() + updateInfo[1].count() + updateInfo[2].count()),
QString::number(updateInfo[4].count()))); QString::number(updateInfo[4].count())));
ui->installButton->setEnabled(installEnabled);
} }
bool MainWindow::isLockedOpen() bool MainWindow::isLockedOpen()