Compare commits

...

4 Commits

Author SHA1 Message Date
Tayou
7e8cf628e8 Override Ctrl+C functionality for ReviewMessageBox items (#4313) 2025-11-08 07:47:35 +01:00
Dylan Schooner
a16026828e Move shortcut connection to constructor
Add copy functionality for changelog on ResourceUpdateDialog

Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-11-07 13:40:54 -05:00
Dylan Schooner
6f4460b604 Apply override to ResourceUpdateDialog::appendResource
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-11-07 02:30:45 -05:00
Dylan Schooner
8c0e8a319b Overwrite Ctrl+C functionality for ReviewMessageBox items
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-11-07 00:53:41 -05:00
2 changed files with 37 additions and 3 deletions

View File

@@ -22,6 +22,8 @@
#include "modplatform/flame/FlameCheckUpdate.h"
#include "modplatform/modrinth/ModrinthCheckUpdate.h"
#include <QClipboard>
#include <QShortcut>
#include <QTextBrowser>
#include <QTreeWidgetItem>
@@ -437,17 +439,22 @@ void ResourceUpdateDialog::appendResource(CheckUpdateTask::Update const& info, Q
item_top->setExpanded(true);
auto provider_item = new QTreeWidgetItem(item_top);
provider_item->setText(0, tr("Provider: %1").arg(ModPlatform::ProviderCapabilities::readableName(info.provider)));
QString provider_name = ModPlatform::ProviderCapabilities::readableName(info.provider);
provider_item->setText(0, tr("Provider: %1").arg(provider_name));
provider_item->setData(0, Qt::UserRole, provider_name);
auto old_version_item = new QTreeWidgetItem(item_top);
old_version_item->setText(0, tr("Old version: %1").arg(info.old_version));
old_version_item->setData(0, Qt::UserRole, info.old_version);
auto new_version_item = new QTreeWidgetItem(item_top);
new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
new_version_item->setData(0, Qt::UserRole, info.new_version);
if (info.new_version_type.has_value()) {
auto new_version_type_itme = new QTreeWidgetItem(item_top);
new_version_type_itme->setText(0, tr("New Version Type: %1").arg(info.new_version_type.value().toString()));
auto new_version_type_item = new QTreeWidgetItem(item_top);
new_version_type_item->setText(0, tr("New Version Type: %1").arg(info.new_version_type.value().toString()));
new_version_type_item->setData(0, Qt::UserRole, info.new_version_type.value().toString());
}
if (!requiredBy.isEmpty()) {
@@ -475,6 +482,7 @@ void ResourceUpdateDialog::appendResource(CheckUpdateTask::Update const& info, Q
auto changelog_area = new QTextBrowser();
QString text = info.changelog;
changelog->setData(0, Qt::UserRole, text);
if (info.provider == ModPlatform::ResourceProvider::MODRINTH) {
text = markdownToHTML(info.changelog.toUtf8());
}

View File

@@ -1,7 +1,9 @@
#include "ReviewMessageBox.h"
#include "ui_ReviewMessageBox.h"
#include <QClipboard>
#include <QPushButton>
#include <QShortcut>
ReviewMessageBox::ReviewMessageBox(QWidget* parent, [[maybe_unused]] QString const& title, [[maybe_unused]] QString const& icon)
: QDialog(parent), ui(new Ui::ReviewMessageBox)
@@ -21,6 +23,26 @@ ReviewMessageBox::ReviewMessageBox(QWidget* parent, [[maybe_unused]] QString con
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK"));
// Overwrite Ctrl+C functionality to exclude the label when copying text from tree
auto shortcut = new QShortcut(QKeySequence::Copy, ui->modTreeWidget);
connect(shortcut, &QShortcut::activated, [this]() {
auto currentItem = this->ui->modTreeWidget->currentItem();
if (!currentItem)
return;
auto currentColumn = this->ui->modTreeWidget->currentColumn();
auto data = currentItem->data(currentColumn, Qt::UserRole);
QString txt;
if (data.isValid()) {
txt = data.toString();
} else {
txt = currentItem->text(currentColumn);
}
QApplication::clipboard()->setText(txt);
});
}
ReviewMessageBox::~ReviewMessageBox()
@@ -44,6 +66,7 @@ void ReviewMessageBox::appendResource(ResourceInformation&& info)
auto filenameItem = new QTreeWidgetItem(itemTop);
filenameItem->setText(0, tr("Filename: %1").arg(info.filename));
filenameItem->setData(0, Qt::UserRole, info.filename);
auto childIndx = 0;
itemTop->insertChildren(childIndx++, { filenameItem });
@@ -62,6 +85,7 @@ void ReviewMessageBox::appendResource(ResourceInformation&& info)
auto providerItem = new QTreeWidgetItem(itemTop);
providerItem->setText(0, tr("Provider: %1").arg(info.provider));
providerItem->setData(0, Qt::UserRole, info.provider);
itemTop->insertChildren(childIndx++, { providerItem });
@@ -86,6 +110,8 @@ void ReviewMessageBox::appendResource(ResourceInformation&& info)
auto versionTypeItem = new QTreeWidgetItem(itemTop);
versionTypeItem->setText(0, tr("Version Type: %1").arg(info.version_type));
versionTypeItem->setData(0, Qt::UserRole, info.version_type);
itemTop->insertChildren(childIndx++, { versionTypeItem });
ui->modTreeWidget->addTopLevelItem(itemTop);