From 4b1a89648fffea98b447e4289dbc559d717d0b52 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Tue, 29 Sep 2020 22:47:38 +0200 Subject: Display plugins in a tree instead of a list in the settings dialog. --- src/settingsdialogplugins.cpp | 73 ++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 21 deletions(-) (limited to 'src/settingsdialogplugins.cpp') diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp index 41430f1f..cb306f36 100644 --- a/src/settingsdialogplugins.cpp +++ b/src/settingsdialogplugins.cpp @@ -3,33 +3,57 @@ #include "noeditdelegate.h" #include +#include "plugincontainer.h" + using MOBase::IPlugin; -PluginsSettingsTab::PluginsSettingsTab(Settings& s, SettingsDialog& d) +PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginContainer, SettingsDialog& d) : SettingsTab(s, d) { ui->pluginSettingsList->setStyleSheet("QTreeWidget::item {padding-right: 10px;}"); + // Create top-level tree widget: + QStringList pluginInterfaces = pluginContainer->pluginInterfaces(); + pluginInterfaces.sort(Qt::CaseInsensitive); + std::map topItems; + for (QString interfaceName : pluginInterfaces) { + auto *item = new QTreeWidgetItem(ui->pluginsList, { interfaceName }); + item->setFlags(item->flags() & ~Qt::ItemIsSelectable); + auto font = item->font(0); + font.setBold(true); + item->setFont(0, font); + topItems[interfaceName] = item; + item->setExpanded(true); + } + ui->pluginsList->setHeaderHidden(true); + // display plugin settings QSet handledNames; for (IPlugin *plugin : settings().plugins().plugins()) { if (handledNames.contains(plugin->name())) continue; - QListWidgetItem *listItem = new QListWidgetItem(plugin->localizedName(), ui->pluginsList); - listItem->setData(ROLE_PLUGIN, QVariant::fromValue((void*)plugin)); - listItem->setData(ROLE_SETTINGS, settings().plugins().settings(plugin->name())); - listItem->setData(ROLE_DESCRIPTIONS, settings().plugins().descriptions(plugin->name())); - ui->pluginsList->addItem(listItem); + QTreeWidgetItem* listItem = new QTreeWidgetItem( + topItems.at(pluginContainer->topImplementedInterface(plugin)), { plugin->localizedName() }); + listItem->setData(0, ROLE_PLUGIN, QVariant::fromValue((void*)plugin)); + listItem->setData(0, ROLE_SETTINGS, settings().plugins().settings(plugin->name())); + listItem->setData(0, ROLE_DESCRIPTIONS, settings().plugins().descriptions(plugin->name())); + + if (handledNames.isEmpty()) { + listItem->setSelected(true); + } + handledNames.insert(plugin->name()); } + ui->pluginsList->sortByColumn(0, Qt::AscendingOrder); + // display plugin blacklist for (const QString &pluginName : settings().plugins().blacklist()) { ui->pluginBlacklist->addItem(pluginName); } QObject::connect( - ui->pluginsList, &QListWidget::currentItemChanged, + ui->pluginsList, &QTreeWidget::currentItemChanged, [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); }); QShortcut *delShortcut = new QShortcut( @@ -37,18 +61,21 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, SettingsDialog& d) QObject::connect(delShortcut, &QShortcut::activated, &dialog(), [&]{ deleteBlacklistItem(); }); } -IPlugin* PluginsSettingsTab::plugin(QListWidgetItem* pluginItem) const +IPlugin* PluginsSettingsTab::plugin(QTreeWidgetItem* pluginItem) const { - return static_cast(qvariant_cast(pluginItem->data(ROLE_PLUGIN))); + return static_cast(qvariant_cast(pluginItem->data(0, ROLE_PLUGIN))); } void PluginsSettingsTab::update() { // transfer plugin settings to in-memory structure - for (int i = 0; i < ui->pluginsList->count(); ++i) { - QListWidgetItem *item = ui->pluginsList->item(i); - settings().plugins().setSettings( - plugin(item)->name(), item->data(ROLE_SETTINGS).toMap()); + for (int i = 0; i < ui->pluginsList->topLevelItemCount(); ++i) { + auto *topLevelItem = ui->pluginsList->topLevelItem(i); + for (int j = 0; j < topLevelItem->childCount(); ++j) { + auto* item = topLevelItem->child(j); + settings().plugins().setSettings( + plugin(item)->name(), item->data(0, ROLE_SETTINGS).toMap()); + } } // set plugin blacklist @@ -67,18 +94,22 @@ void PluginsSettingsTab::closing() storeSettings(ui->pluginsList->currentItem()); } -void PluginsSettingsTab::on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous) +void PluginsSettingsTab::on_pluginsList_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) { storeSettings(previous); + if (!current->data(0, ROLE_PLUGIN).isValid()) { + return; + } + ui->pluginSettingsList->clear(); - IPlugin *plugin = static_cast(current->data(Qt::UserRole).value()); + IPlugin* plugin = this->plugin(current); ui->authorLabel->setText(plugin->author()); ui->versionLabel->setText(plugin->version().canonicalString()); ui->descriptionLabel->setText(plugin->description()); - QVariantMap settings = current->data(ROLE_SETTINGS).toMap(); - QVariantMap descriptions = current->data(ROLE_DESCRIPTIONS).toMap(); + QVariantMap settings = current->data(0, ROLE_SETTINGS).toMap(); + QVariantMap descriptions = current->data(0, ROLE_DESCRIPTIONS).toMap(); ui->pluginSettingsList->setEnabled(settings.count() != 0); for (auto iter = settings.begin(); iter != settings.end(); ++iter) { QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList(iter.key())); @@ -109,16 +140,16 @@ void PluginsSettingsTab::deleteBlacklistItem() ui->pluginBlacklist->takeItem(ui->pluginBlacklist->currentIndex().row()); } -void PluginsSettingsTab::storeSettings(QListWidgetItem *pluginItem) +void PluginsSettingsTab::storeSettings(QTreeWidgetItem *pluginItem) { - if (pluginItem != nullptr) { - QVariantMap settings = pluginItem->data(ROLE_SETTINGS).toMap(); + if (pluginItem != nullptr && pluginItem->data(0, ROLE_PLUGIN).isValid()) { + QVariantMap settings = pluginItem->data(0, ROLE_SETTINGS).toMap(); for (int i = 0; i < ui->pluginSettingsList->topLevelItemCount(); ++i) { const QTreeWidgetItem *item = ui->pluginSettingsList->topLevelItem(i); settings[item->text(0)] = item->data(1, Qt::DisplayRole); } - pluginItem->setData(ROLE_SETTINGS, settings); + pluginItem->setData(0, ROLE_SETTINGS, settings); } } -- cgit v1.3.1