From 4bc72ccca47d121a4979c3926eefa3d2464dc52f Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Sun, 23 Nov 2025 20:08:55 +0000 Subject: [PATCH] My tweaks Use a tree view instead of table view, remove toggle button (janky) Signed-off-by: TheKodeToad --- launcher/net/NetJob.cpp | 4 +- .../ui/dialogs/NetworkJobFailedDialog.cpp | 47 ++++++++----------- launcher/ui/dialogs/NetworkJobFailedDialog.h | 12 +---- launcher/ui/dialogs/NetworkJobFailedDialog.ui | 14 ++---- 4 files changed, 27 insertions(+), 50 deletions(-) diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp index 05bbdfa23..3e310d0dc 100644 --- a/launcher/net/NetJob.cpp +++ b/launcher/net/NetJob.cpp @@ -167,10 +167,8 @@ void NetJob::emitFailed(QString reason) auto failed = getFailedActions(); auto dialog = NetworkJobFailedDialog(objectName(), m_try, m_done.size(), failed.size(), nullptr); - int i = 0; for (const auto& request : failed) { - dialog.addFailedRequest(i, request->url(), request->errorString()); - ++i; + dialog.addFailedRequest(request->url(), request->errorString()); } if (dialog.exec() == QDialog::Accepted) { diff --git a/launcher/ui/dialogs/NetworkJobFailedDialog.cpp b/launcher/ui/dialogs/NetworkJobFailedDialog.cpp index 314c984d3..6dbbedf57 100644 --- a/launcher/ui/dialogs/NetworkJobFailedDialog.cpp +++ b/launcher/ui/dialogs/NetworkJobFailedDialog.cpp @@ -20,46 +20,37 @@ #include "ui_NetworkJobFailedDialog.h" -NetworkJobFailedDialog::NetworkJobFailedDialog(QString jobName, int attempts, int requests, int failed, QWidget* parent) : QDialog(parent), ui(new Ui::NetworkJobFailedDialog) +#include + +NetworkJobFailedDialog::NetworkJobFailedDialog(QString jobName, int attempts, int requests, int failed, QWidget* parent) + : QDialog(parent), m_ui(new Ui::NetworkJobFailedDialog) { - ui->setupUi(this); - ui->failLabel->setText(ui->failLabel->text().arg(jobName)); + m_ui->setupUi(this); + m_ui->failLabel->setText(m_ui->failLabel->text().arg(jobName)); if (failed == requests) { - ui->requestCountLabel->setText(tr("All %1 requests have failed after %2 attempts").arg(failed).arg(attempts)); + m_ui->requestCountLabel->setText(tr("All %1 requests have failed after %2 attempts").arg(failed).arg(attempts)); } else if (failed < requests / 2) { - ui->requestCountLabel->setText(tr("Out of %1 requests, %2 have failed after %3 attempts").arg(requests).arg(failed).arg(attempts)); + m_ui->requestCountLabel->setText( + tr("Out of %1 requests, %2 have failed after %3 attempts").arg(requests).arg(failed).arg(attempts)); } else { - ui->requestCountLabel->setText(tr("Out of %1 requests, only %2 succeeded after %3 attempts").arg(requests).arg(requests - failed).arg(attempts)); + m_ui->requestCountLabel->setText( + tr("Out of %1 requests, only %2 succeeded after %3 attempts").arg(requests).arg(requests - failed).arg(attempts)); } - ui->detailsTable->setRowCount(failed); - setShowDetails(failed < 5); + m_ui->detailsTable->header()->setSectionResizeMode(0, QHeaderView::Stretch); + m_ui->detailsTable->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents); - connect(ui->dialogButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); - connect(ui->dialogButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + connect(m_ui->dialogButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(m_ui->dialogButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } NetworkJobFailedDialog::~NetworkJobFailedDialog() { - delete ui; + delete m_ui; } -void NetworkJobFailedDialog::addFailedRequest(int row, QUrl url, QString error) const +void NetworkJobFailedDialog::addFailedRequest(QUrl url, QString error) const { - const auto urlItem = new QTableWidgetItem(url.toString()); - const auto errorItem = new QTableWidgetItem(error); - ui->detailsTable->setItem(row, 0, urlItem); - ui->detailsTable->setItem(row, 1, errorItem); -} - -void NetworkJobFailedDialog::setShowDetails(bool showDetails) -{ - m_showDetails = showDetails; - ui->detailsTable->setVisible(m_showDetails); - ui->detailsButton->setText(!m_showDetails ? tr("Show details") : tr("Hide details")); -} - -void NetworkJobFailedDialog::on_detailsButton_clicked() -{ - setShowDetails(!m_showDetails); + auto item = new QTreeWidgetItem(m_ui->detailsTable, { url.toString(), error }); + m_ui->detailsTable->addTopLevelItem(item); } diff --git a/launcher/ui/dialogs/NetworkJobFailedDialog.h b/launcher/ui/dialogs/NetworkJobFailedDialog.h index e0bd01b00..eff117679 100644 --- a/launcher/ui/dialogs/NetworkJobFailedDialog.h +++ b/launcher/ui/dialogs/NetworkJobFailedDialog.h @@ -33,16 +33,8 @@ class NetworkJobFailedDialog : public QDialog { explicit NetworkJobFailedDialog(QString jobName, int attempts, int requests, int failed, QWidget* parent = nullptr); ~NetworkJobFailedDialog() override; - void addFailedRequest(int row, QUrl url, QString error) const; + void addFailedRequest(QUrl url, QString error) const; private: - void setShowDetails(bool showDetails); - - private slots: - void on_detailsButton_clicked(); - - private: - Ui::NetworkJobFailedDialog* ui; - - bool m_showDetails = false; + Ui::NetworkJobFailedDialog* m_ui; }; diff --git a/launcher/ui/dialogs/NetworkJobFailedDialog.ui b/launcher/ui/dialogs/NetworkJobFailedDialog.ui index 50deb5fb7..26e364da6 100644 --- a/launcher/ui/dialogs/NetworkJobFailedDialog.ui +++ b/launcher/ui/dialogs/NetworkJobFailedDialog.ui @@ -39,22 +39,18 @@ - TextLabel + (request count) - - - PushButton - - - - - + QAbstractItemView::EditTrigger::NoEditTriggers + + false + URL