ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Replace QTreeWidget with QTreeView for cheat list

This commit is contained in:
Rares-Alexandru Fodor 2024-10-20 18:25:59 +03:00 committed by Ty
parent 47cf69d2b3
commit d89b051e6d
3 changed files with 87 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
pcsx2-qt/Settings/GameCheatSettingsWidget.cpp
View File

@ -13,11 +13,22 @@
#include "common/HeterogeneousContainers.h" #include "common/HeterogeneousContainers.h"
#include <QtGui/QStandardItemModel>
GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget* parent) GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget* parent)
: m_dialog(dialog) : m_dialog(dialog)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
m_model = new QStandardItemModel(this);
QStringList headers;
headers.push_back(tr("Name"));
headers.push_back(tr("Author"));
headers.push_back(tr("Description"));
m_model->setHorizontalHeaderLabels(headers);
m_ui.cheatList->setModel(m_model);
reloadList(); reloadList();
SettingsInterface* sif = m_dialog->getSettingsInterface(); SettingsInterface* sif = m_dialog->getSettingsInterface();
@ -26,8 +37,8 @@ GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget
updateListEnabled(); updateListEnabled();
connect(m_ui.enableCheats, &QCheckBox::checkStateChanged, this, &GameCheatSettingsWidget::updateListEnabled); connect(m_ui.enableCheats, &QCheckBox::checkStateChanged, this, &GameCheatSettingsWidget::updateListEnabled);
connect(m_ui.cheatList, &QTreeWidget::itemDoubleClicked, this, &GameCheatSettingsWidget::onCheatListItemDoubleClicked); connect(m_ui.cheatList, &QTreeView::doubleClicked, this, &GameCheatSettingsWidget::onCheatListItemDoubleClicked);
connect(m_ui.cheatList, &QTreeWidget::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged); connect(m_model, &QStandardItemModel::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged);
connect(m_ui.reloadCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onReloadClicked); connect(m_ui.reloadCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onReloadClicked);
connect(m_ui.enableAll, &QPushButton::clicked, this, [this]() { setStateForAll(true); }); connect(m_ui.enableAll, &QPushButton::clicked, this, [this]() { setStateForAll(true); });
connect(m_ui.disableAll, &QPushButton::clicked, this, [this]() { setStateForAll(false); }); connect(m_ui.disableAll, &QPushButton::clicked, this, [this]() { setStateForAll(false); });
@ -39,28 +50,43 @@ GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget
GameCheatSettingsWidget::~GameCheatSettingsWidget() = default; GameCheatSettingsWidget::~GameCheatSettingsWidget() = default;
void GameCheatSettingsWidget::onCheatListItemDoubleClicked(QTreeWidgetItem* item, int column) void GameCheatSettingsWidget::onCheatListItemDoubleClicked(const QModelIndex& index)
{ {
QVariant data = item->data(0, Qt::UserRole); QModelIndex sibling_index = index.sibling(index.row(), 0);
QStandardItem* item = m_model->itemFromIndex(sibling_index);
if (!item)
return;
if (item->hasChildren() && index.column() != 0)
{
bool isExpanded = m_ui.cheatList->isExpanded(sibling_index);
if (isExpanded)
m_ui.cheatList->collapse(sibling_index);
else
m_ui.cheatList->expand(sibling_index);
return;
}
QVariant data = item->data(Qt::UserRole);
if (!data.isValid()) if (!data.isValid())
return; return;
std::string cheat_name = data.toString().toStdString(); std::string cheat_name = data.toString().toStdString();
const bool new_state = !(item->checkState(0) == Qt::Checked); const bool new_state = !(item->checkState() == Qt::Checked);
item->setCheckState(0, new_state ? Qt::Checked : Qt::Unchecked); item->setCheckState(new_state ? Qt::Checked : Qt::Unchecked);
setCheatEnabled(std::move(cheat_name), new_state, true); setCheatEnabled(std::move(cheat_name), new_state, true);
} }
void GameCheatSettingsWidget::onCheatListItemChanged(QTreeWidgetItem* item, int column) void GameCheatSettingsWidget::onCheatListItemChanged(QStandardItem* item)
{ {
QVariant data = item->data(0, Qt::UserRole); QVariant data = item->data(Qt::UserRole);
if (!data.isValid()) if (!data.isValid())
return; return;
std::string cheat_name = data.toString().toStdString(); std::string cheat_name = data.toString().toStdString();
const bool current_enabled = const bool current_enabled =
(std::find(m_enabled_patches.begin(), m_enabled_patches.end(), cheat_name) != m_enabled_patches.end()); (std::find(m_enabled_patches.begin(), m_enabled_patches.end(), cheat_name) != m_enabled_patches.end());
const bool current_checked = (item->checkState(0) == Qt::Checked); const bool current_checked = (item->checkState() == Qt::Checked);
if (current_enabled == current_checked) if (current_enabled == current_checked)
return; return;
@ -125,24 +151,28 @@ void GameCheatSettingsWidget::setCheatEnabled(std::string name, bool enabled, bo
void GameCheatSettingsWidget::setStateForAll(bool enabled) void GameCheatSettingsWidget::setStateForAll(bool enabled)
{ {
QSignalBlocker sb(m_ui.cheatList); // Temporarily disconnect from itemChanged to prevent redundant saves
disconnect(m_model, &QStandardItemModel::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged);
setStateRecursively(nullptr, enabled); setStateRecursively(nullptr, enabled);
m_dialog->getSettingsInterface()->Save(); m_dialog->getSettingsInterface()->Save();
g_emu_thread->reloadGameSettings(); g_emu_thread->reloadGameSettings();
connect(m_model, &QStandardItemModel::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged);
} }
void GameCheatSettingsWidget::setStateRecursively(QTreeWidgetItem* parent, bool enabled) void GameCheatSettingsWidget::setStateRecursively(QStandardItem* parent, bool enabled)
{ {
const int count = parent ? parent->childCount() : m_ui.cheatList->topLevelItemCount(); const int count = parent ? parent->rowCount() : m_model->rowCount();
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
QTreeWidgetItem* item = parent ? parent->child(i) : m_ui.cheatList->topLevelItem(i); QStandardItem* item = parent ? parent->child(i, 0) : m_model->item(i, 0);
QVariant data = item->data(0, Qt::UserRole); QVariant data = item->data(Qt::UserRole);
if (data.isValid()) if (data.isValid())
{ {
if ((item->checkState(0) == Qt::Checked) != enabled) if ((item->checkState() == Qt::Checked) != enabled)
{ {
item->setCheckState(0, enabled ? Qt::Checked : Qt::Unchecked); item->setCheckState(enabled ? Qt::Checked : Qt::Unchecked);
setCheatEnabled(data.toString().toStdString(), enabled, false); setCheatEnabled(data.toString().toStdString(), enabled, false);
} }
} }
@ -162,8 +192,7 @@ void GameCheatSettingsWidget::reloadList()
m_dialog->getSettingsInterface()->GetStringList(Patch::CHEATS_CONFIG_SECTION, Patch::PATCH_ENABLE_CONFIG_KEY); m_dialog->getSettingsInterface()->GetStringList(Patch::CHEATS_CONFIG_SECTION, Patch::PATCH_ENABLE_CONFIG_KEY);
m_parent_map.clear(); m_parent_map.clear();
while (m_ui.cheatList->topLevelItemCount() > 0) m_model->removeRows(0, m_model->rowCount());
delete m_ui.cheatList->takeTopLevelItem(0);
for (const Patch::PatchInfo& pi : m_patches) for (const Patch::PatchInfo& pi : m_patches)
{ {
@ -171,14 +200,12 @@ void GameCheatSettingsWidget::reloadList()
(std::find(m_enabled_patches.begin(), m_enabled_patches.end(), pi.name) != m_enabled_patches.end()); (std::find(m_enabled_patches.begin(), m_enabled_patches.end(), pi.name) != m_enabled_patches.end());
const std::string_view parent_part = pi.GetNameParentPart(); const std::string_view parent_part = pi.GetNameParentPart();
QStandardItem* parent = getTreeViewParent(parent_part);
QTreeWidgetItem* parent = getTreeWidgetParent(parent_part); QList<QStandardItem*> items = populateTreeViewRow(pi, enabled);
QTreeWidgetItem* item = new QTreeWidgetItem();
populateTreeWidgetItem(item, pi, enabled);
if (parent) if (parent)
parent->addChild(item); parent->appendRow(items);
else else
m_ui.cheatList->addTopLevelItem(item); m_model->appendRow(items);
} }
// Hide root indicator when there's no groups, frees up some whitespace. // Hide root indicator when there's no groups, frees up some whitespace.
@ -186,13 +213,13 @@ void GameCheatSettingsWidget::reloadList()
if (num_unlabelled_codes > 0) if (num_unlabelled_codes > 0)
{ {
QTreeWidgetItem* item = new QTreeWidgetItem(); QStandardItem* item = new QStandardItem();
item->setText(0, tr("%1 unlabelled patch codes will automatically activate.").arg(num_unlabelled_codes)); item->setText(tr("%1 unlabelled patch codes will automatically activate.").arg(num_unlabelled_codes));
m_ui.cheatList->addTopLevelItem(item); m_model->appendRow(item);
} }
} }
QTreeWidgetItem* GameCheatSettingsWidget::getTreeWidgetParent(const std::string_view parent) QStandardItem* GameCheatSettingsWidget::getTreeViewParent(const std::string_view parent)
{ {
if (parent.empty()) if (parent.empty())
return nullptr; return nullptr;
@ -202,37 +229,45 @@ QTreeWidgetItem* GameCheatSettingsWidget::getTreeWidgetParent(const std::string_
return it->second; return it->second;
std::string_view this_part = parent; std::string_view this_part = parent;
QTreeWidgetItem* parent_to_this = nullptr; QStandardItem* parent_to_this = nullptr;
const std::string_view::size_type pos = parent.rfind('\\'); const std::string_view::size_type pos = parent.rfind('\\');
if (pos != std::string::npos && pos != (parent.size() - 1)) if (pos != std::string::npos && pos != (parent.size() - 1))
{ {
// go up the chain until we find the real parent, then back down // go up the chain until we find the real parent, then back down
parent_to_this = getTreeWidgetParent(parent.substr(0, pos)); parent_to_this = getTreeViewParent(parent.substr(0, pos));
this_part = parent.substr(pos + 1); this_part = parent.substr(pos + 1);
} }
QTreeWidgetItem* item = new QTreeWidgetItem(); QStandardItem* item = new QStandardItem();
item->setText(0, QString::fromUtf8(this_part.data(), this_part.length())); item->setText(QString::fromUtf8(this_part.data(), this_part.length()));
if (parent_to_this) if (parent_to_this)
parent_to_this->addChild(item); parent_to_this->appendRow(item);
else else
m_ui.cheatList->addTopLevelItem(item); m_model->appendRow(item);
// Must be called after adding. m_ui.cheatList->expand(item->index());
item->setExpanded(true);
m_parent_map.emplace(parent, item); m_parent_map.emplace(parent, item);
return item; return item;
} }
void GameCheatSettingsWidget::populateTreeWidgetItem(QTreeWidgetItem* item, const Patch::PatchInfo& pi, bool enabled) QList<QStandardItem*> GameCheatSettingsWidget::populateTreeViewRow(const Patch::PatchInfo& pi, bool enabled)
{ {
QList<QStandardItem*> items;
QStandardItem* nameItem = new QStandardItem();
const std::string_view name_part = pi.GetNamePart(); const std::string_view name_part = pi.GetNamePart();
item->setFlags(item->flags() | Qt::ItemIsUserCheckable | Qt::ItemNeverHasChildren); nameItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemNeverHasChildren | Qt::ItemIsEnabled);
item->setCheckState(0, enabled ? Qt::Checked : Qt::Unchecked); nameItem->setCheckState(enabled ? Qt::Checked : Qt::Unchecked);
item->setData(0, Qt::UserRole, QString::fromStdString(pi.name)); nameItem->setData(QString::fromStdString(pi.name), Qt::UserRole);
if (!name_part.empty()) if (!name_part.empty())
item->setText(0, QString::fromUtf8(name_part.data(), name_part.length())); nameItem->setText(QString::fromUtf8(name_part.data(), name_part.length()));
item->setText(1, QString::fromStdString(pi.author));
item->setText(2, QString::fromStdString(pi.description)); QStandardItem* authorItem = new QStandardItem(QString::fromStdString(pi.author));
QStandardItem* descriptionItem = new QStandardItem(QString::fromStdString(pi.description));
items.push_back(nameItem);
items.push_back(authorItem);
items.push_back(descriptionItem);
return items;
} }

15
pcsx2-qt/Settings/GameCheatSettingsWidget.h
View File

@ -3,7 +3,7 @@
#pragma once #pragma once
#include <QtWidgets/QWidget> #include <QtGui/QStandardItemModel>
#include "ui_GameCheatSettingsWidget.h" #include "ui_GameCheatSettingsWidget.h"
@ -36,23 +36,24 @@ protected:
void resizeEvent(QResizeEvent* event) override; void resizeEvent(QResizeEvent* event) override;
private Q_SLOTS: private Q_SLOTS:
void onCheatListItemDoubleClicked(QTreeWidgetItem* item, int column); void onCheatListItemDoubleClicked(const QModelIndex& index);
void onCheatListItemChanged(QTreeWidgetItem* item, int column); void onCheatListItemChanged(QStandardItem* item);
void onReloadClicked(); void onReloadClicked();
void updateListEnabled(); void updateListEnabled();
void reloadList(); void reloadList();
private: private:
QTreeWidgetItem* getTreeWidgetParent(const std::string_view parent); QStandardItem* getTreeViewParent(const std::string_view parent);
void populateTreeWidgetItem(QTreeWidgetItem* item, const Patch::PatchInfo& pi, bool enabled); QList<QStandardItem*> populateTreeViewRow(const Patch::PatchInfo& pi, bool enabled);
void setCheatEnabled(std::string name, bool enabled, bool save_and_reload_settings); void setCheatEnabled(std::string name, bool enabled, bool save_and_reload_settings);
void setStateForAll(bool enabled); void setStateForAll(bool enabled);
void setStateRecursively(QTreeWidgetItem* parent, bool enabled); void setStateRecursively(QStandardItem* parent, bool enabled);
Ui::GameCheatSettingsWidget m_ui; Ui::GameCheatSettingsWidget m_ui;
SettingsWindow* m_dialog; SettingsWindow* m_dialog;
QStandardItemModel* m_model = nullptr;
UnorderedStringMap<QTreeWidgetItem*> m_parent_map; UnorderedStringMap<QStandardItem*> m_parent_map;
std::vector<Patch::PatchInfo> m_patches; std::vector<Patch::PatchInfo> m_patches;
std::vector<std::string> m_enabled_patches; std::vector<std::string> m_enabled_patches;
}; };

17
pcsx2-qt/Settings/GameCheatSettingsWidget.ui
View File

@ -41,7 +41,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTreeWidget" name="cheatList"> <widget class="QTreeView" name="cheatList">
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
@ -51,21 +51,6 @@
<property name="selectionBehavior"> <property name="selectionBehavior">
<enum>QAbstractItemView::SelectItems</enum> <enum>QAbstractItemView::SelectItems</enum>
</property> </property>
<column>
<property name="text">
<string>Name</string>
</property>
</column>
<column>
<property name="text">
<string>Author</string>
</property>
</column>
<column>
<property name="text">
<string>Description</string>
</property>
</column>
</widget> </widget>
</item> </item>
<item> <item>