From eb72caa7c14f3de512afa0e7fc5d05787f232cca Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Mon, 28 Sep 2020 22:55:55 +0200
Subject: Use localizedName() instead of name() for the list of plugins in the
 UI.

---
 src/settingsdialogplugins.cpp | 23 ++++++++++++++---------
 src/settingsdialogplugins.h   | 10 ++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index c84d0556..41430f1f 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -15,10 +15,10 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, SettingsDialog& d)
   for (IPlugin *plugin : settings().plugins().plugins()) {
     if (handledNames.contains(plugin->name()))
       continue;
-    QListWidgetItem *listItem = new QListWidgetItem(plugin->name(), ui->pluginsList);
-    listItem->setData(Qt::UserRole, QVariant::fromValue((void*)plugin));
-    listItem->setData(Qt::UserRole + 1, settings().plugins().settings(plugin->name()));
-    listItem->setData(Qt::UserRole + 2, settings().plugins().descriptions(plugin->name()));
+    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);
     handledNames.insert(plugin->name());
   }
@@ -37,13 +37,18 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, SettingsDialog& d)
   QObject::connect(delShortcut, &QShortcut::activated, &dialog(), [&]{ deleteBlacklistItem(); });
 }
 
+IPlugin* PluginsSettingsTab::plugin(QListWidgetItem* pluginItem) const
+{
+  return static_cast<IPlugin*>(qvariant_cast<void*>(pluginItem->data(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(
-      item->text(), item->data(Qt::UserRole + 1).toMap());
+      plugin(item)->name(), item->data(ROLE_SETTINGS).toMap());
   }
 
   // set plugin blacklist
@@ -72,8 +77,8 @@ void PluginsSettingsTab::on_pluginsList_currentItemChanged(QListWidgetItem *curr
   ui->versionLabel->setText(plugin->version().canonicalString());
   ui->descriptionLabel->setText(plugin->description());
 
-  QVariantMap settings = current->data(Qt::UserRole + 1).toMap();
-  QVariantMap descriptions = current->data(Qt::UserRole + 2).toMap();
+  QVariantMap settings = current->data(ROLE_SETTINGS).toMap();
+  QVariantMap descriptions = current->data(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()));
@@ -107,13 +112,13 @@ void PluginsSettingsTab::deleteBlacklistItem()
 void PluginsSettingsTab::storeSettings(QListWidgetItem *pluginItem)
 {
   if (pluginItem != nullptr) {
-    QVariantMap settings = pluginItem->data(Qt::UserRole + 1).toMap();
+    QVariantMap settings = pluginItem->data(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(Qt::UserRole + 1, settings);
+    pluginItem->setData(ROLE_SETTINGS, settings);
   }
 }
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
index 8e2dae2a..b793e5fd 100644
--- a/src/settingsdialogplugins.h
+++ b/src/settingsdialogplugins.h
@@ -16,6 +16,16 @@ private:
   void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
   void deleteBlacklistItem();
   void storeSettings(QListWidgetItem *pluginItem);
+
+  /**
+   * @brief Retrieve the plugin associated to the given item in the list.
+   *
+   */
+  MOBase::IPlugin* plugin(QListWidgetItem *pluginItem) const;
+
+  constexpr static int ROLE_PLUGIN = Qt::UserRole;
+  constexpr static int ROLE_SETTINGS = Qt::UserRole + 1;
+  constexpr static int ROLE_DESCRIPTIONS = Qt::UserRole + 2;
 };
 
 #endif // SETTINGSDIALOGPLUGINS_H
-- 
cgit v1.3.1


From 69625912b822f5e7630648d76af2408f013f23ba Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Mon, 28 Sep 2020 22:56:12 +0200
Subject: Add a method to retrieve the localized names of the implemented
 plugin interfaces.

---
 src/plugincontainer.cpp | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/plugincontainer.h   | 32 +++++++++++++++++++
 2 files changed, 114 insertions(+)

(limited to 'src')

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index d989fac9..e6a4e877 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -21,6 +21,88 @@ using namespace MOShared;
 
 namespace bf = boost::fusion;
 
+template <class T>
+struct PluginTypeName;
+
+template <> struct PluginTypeName<QObject> { static QString get() { return {}; } };
+template <> struct PluginTypeName<MOBase::IPlugin> { static QString get() { return QT_TR_NOOP("Plugin"); } };
+template <> struct PluginTypeName<MOBase::IPluginDiagnose> { static QString get() { return QT_TR_NOOP("Diagnose"); } };
+template <> struct PluginTypeName<MOBase::IPluginGame> { static QString get() { return QT_TR_NOOP("Game"); } };
+template <> struct PluginTypeName<MOBase::IPluginInstaller> { static QString get() { return QT_TR_NOOP("Installer"); } };
+template <> struct PluginTypeName<MOBase::IPluginModPage> { static QString get() { return QT_TR_NOOP("Mod Page"); } };
+template <> struct PluginTypeName<MOBase::IPluginPreview> { static QString get() { return QT_TR_NOOP("Preview"); } };
+template <> struct PluginTypeName<MOBase::IPluginTool> { static QString get() { return QT_TR_NOOP("Tool"); } };
+template <> struct PluginTypeName<MOBase::IPluginProxy> { static QString get() { return QT_TR_NOOP("Proxy"); } };
+template <> struct PluginTypeName<MOBase::IPluginFileMapper> { static QString get() { return QT_TR_NOOP("File Mapper"); } };
+
+template <class Reducer, template <class> class Mapper, class BfMap>
+struct plugin_map_iterate_impl;
+
+template <class Reducer, template <class> class Mapper>
+struct plugin_map_iterate_impl<Reducer, Mapper, bf::map<>>
+{
+  template <class U, class... Args>
+  static auto apply(Reducer const& r, U &&u, Args const&... args) {
+    return std::forward<U>(u);
+  }
+};
+
+template <
+  class Reducer,
+  template <class> class Mapper, 
+  class K, class V, class... Ps
+>
+struct plugin_map_iterate_impl<Reducer, Mapper, bf::map<bf::pair<K, V>, Ps... >>
+{
+  template <class U, class... Args>
+  static auto apply(Reducer const& r, U&& u, Args const&... args) {
+    return plugin_map_iterate_impl<Reducer, Mapper, bf::map<Ps... >>::apply(r, r(Mapper<K>::get(args... ), u), args... );
+  }
+};
+
+template <template <class> class M, class B, class R, class U, class... Args>
+auto plugin_map_iterate(R const& r, U &&init, Args const&... args) {
+  return plugin_map_iterate_impl<R, M, B>::apply(r, std::forward<U>(init), args... );
+}
+
+template <class T>
+struct PluginTypeNameIf {
+  static QString get(QObject* plugin) {
+    if (qobject_cast<T*>(plugin)) {
+      return PluginTypeName<T>::get();
+    }
+    return {};
+  }
+};
+
+
+QStringList PluginContainer::implementedInterfaces(const IPlugin* plugin) const
+{
+  // Find the correspond QObject - Can this be done safely with a cast?
+  auto& objects = bf::at_key<QObject>(m_Plugins);
+  auto it = std::find_if(std::begin(objects), std::end(objects), [plugin](QObject *obj) {
+    return qobject_cast<IPlugin*>(obj) == plugin;
+  });
+
+  if (it == std::end(objects)) {
+    return {};
+  }
+
+  // Find all the names:
+  auto names = plugin_map_iterate<PluginTypeNameIf, PluginMap>([](QString name, QStringList value) {
+    if (name.isEmpty()) {
+      return value;
+    }
+    return value << name;
+  }, QStringList(), *it);
+
+  // If the plugin implements at least one interface other than IPlugin, remove IPlugin:
+  if (names.size() > 1) {
+    names.removeAll(PluginTypeName<IPlugin>::get());
+  }
+
+  return names;
+}
 
 PluginContainer::PluginContainer(OrganizerCore *organizer)
   : m_Organizer(organizer)
diff --git a/src/plugincontainer.h b/src/plugincontainer.h
index d405198a..7eb59a0f 100644
--- a/src/plugincontainer.h
+++ b/src/plugincontainer.h
@@ -48,6 +48,16 @@ private:
 
 public:
 
+  /**
+   * @brief Retrieved the (localized) names of interfaces implemented by the given
+   *     plugin.
+   *
+   * @param plugin The plugin to retrieve interface for.
+   *
+   * @return the (localized) names of interfaces implemented by this plugin.
+   */
+  QStringList implementedInterfaces(const MOBase::IPlugin *plugin) const;
+
   PluginContainer(OrganizerCore *organizer);
   virtual ~PluginContainer();
 
@@ -56,16 +66,38 @@ public:
   void loadPlugins();
   void unloadPlugins();
 
+  /**
+   * @brief Find the game plugin corresponding to the given name.
+   *
+   * @param name The name of the game to find a plugin for (as returned by
+   *     IPluginGame::gameName()).
+   *
+   * @return the game plugin for the given name, or a null pointer if no
+   *     plugin exists for this game.
+   */
   MOBase::IPluginGame *managedGame(const QString &name) const;
 
+  /**
+   * @brief Retrieve the list of plugins of the given type.
+   *
+   * @return the list of plugins of the specified type.
+   *
+   * @tparam T The type of plugin to retrieve.
+   */
   template <typename T>
   const std::vector<T*> &plugins() const {
     typename boost::fusion::result_of::at_key<const PluginMap, T>::type temp = boost::fusion::at_key<T>(m_Plugins);
     return temp;
   }
 
+  /**
+   * @return the preview generator.
+   */
   const PreviewGenerator &previewGenerator() const;
 
+  /**
+   * @return the list of plugin file names, including proxied plugins.
+   */
   QStringList pluginFileNames() const;
 
 public: // IPluginDiagnose interface
-- 
cgit v1.3.1


From cf828cd77b41e75b6adb3dc79908aa27142fa0af Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 29 Sep 2020 21:20:10 +0200
Subject: Use bf::for_each instead of custom templates.

---
 src/plugincontainer.cpp | 78 +++++++++++++------------------------------------
 1 file changed, 21 insertions(+), 57 deletions(-)

(limited to 'src')

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index e6a4e877..1af8487f 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -24,57 +24,16 @@ namespace bf = boost::fusion;
 template <class T>
 struct PluginTypeName;
 
-template <> struct PluginTypeName<QObject> { static QString get() { return {}; } };
-template <> struct PluginTypeName<MOBase::IPlugin> { static QString get() { return QT_TR_NOOP("Plugin"); } };
-template <> struct PluginTypeName<MOBase::IPluginDiagnose> { static QString get() { return QT_TR_NOOP("Diagnose"); } };
-template <> struct PluginTypeName<MOBase::IPluginGame> { static QString get() { return QT_TR_NOOP("Game"); } };
-template <> struct PluginTypeName<MOBase::IPluginInstaller> { static QString get() { return QT_TR_NOOP("Installer"); } };
-template <> struct PluginTypeName<MOBase::IPluginModPage> { static QString get() { return QT_TR_NOOP("Mod Page"); } };
-template <> struct PluginTypeName<MOBase::IPluginPreview> { static QString get() { return QT_TR_NOOP("Preview"); } };
-template <> struct PluginTypeName<MOBase::IPluginTool> { static QString get() { return QT_TR_NOOP("Tool"); } };
-template <> struct PluginTypeName<MOBase::IPluginProxy> { static QString get() { return QT_TR_NOOP("Proxy"); } };
-template <> struct PluginTypeName<MOBase::IPluginFileMapper> { static QString get() { return QT_TR_NOOP("File Mapper"); } };
-
-template <class Reducer, template <class> class Mapper, class BfMap>
-struct plugin_map_iterate_impl;
-
-template <class Reducer, template <class> class Mapper>
-struct plugin_map_iterate_impl<Reducer, Mapper, bf::map<>>
-{
-  template <class U, class... Args>
-  static auto apply(Reducer const& r, U &&u, Args const&... args) {
-    return std::forward<U>(u);
-  }
-};
-
-template <
-  class Reducer,
-  template <class> class Mapper, 
-  class K, class V, class... Ps
->
-struct plugin_map_iterate_impl<Reducer, Mapper, bf::map<bf::pair<K, V>, Ps... >>
-{
-  template <class U, class... Args>
-  static auto apply(Reducer const& r, U&& u, Args const&... args) {
-    return plugin_map_iterate_impl<Reducer, Mapper, bf::map<Ps... >>::apply(r, r(Mapper<K>::get(args... ), u), args... );
-  }
-};
-
-template <template <class> class M, class B, class R, class U, class... Args>
-auto plugin_map_iterate(R const& r, U &&init, Args const&... args) {
-  return plugin_map_iterate_impl<R, M, B>::apply(r, std::forward<U>(init), args... );
-}
-
-template <class T>
-struct PluginTypeNameIf {
-  static QString get(QObject* plugin) {
-    if (qobject_cast<T*>(plugin)) {
-      return PluginTypeName<T>::get();
-    }
-    return {};
-  }
-};
-
+template <> struct PluginTypeName<QObject> { static QString value() { return {}; } };
+template <> struct PluginTypeName<MOBase::IPlugin> { static QString value() { return QT_TR_NOOP("Plugin"); } };
+template <> struct PluginTypeName<MOBase::IPluginDiagnose> { static QString value() { return QT_TR_NOOP("Diagnose"); } };
+template <> struct PluginTypeName<MOBase::IPluginGame> { static QString value() { return QT_TR_NOOP("Game"); } };
+template <> struct PluginTypeName<MOBase::IPluginInstaller> { static QString value() { return QT_TR_NOOP("Installer"); } };
+template <> struct PluginTypeName<MOBase::IPluginModPage> { static QString value() { return QT_TR_NOOP("Mod Page"); } };
+template <> struct PluginTypeName<MOBase::IPluginPreview> { static QString value() { return QT_TR_NOOP("Preview"); } };
+template <> struct PluginTypeName<MOBase::IPluginTool> { static QString value() { return QT_TR_NOOP("Tool"); } };
+template <> struct PluginTypeName<MOBase::IPluginProxy> { static QString value() { return QT_TR_NOOP("Proxy"); } };
+template <> struct PluginTypeName<MOBase::IPluginFileMapper> { static QString value() { return QT_TR_NOOP("File Mapper"); } };
 
 QStringList PluginContainer::implementedInterfaces(const IPlugin* plugin) const
 {
@@ -88,17 +47,22 @@ QStringList PluginContainer::implementedInterfaces(const IPlugin* plugin) const
     return {};
   }
 
+  // We need a QObject to be able to qobject_cast<> to the plugin types:
+  const QObject* oPlugin = *it;
+
   // Find all the names:
-  auto names = plugin_map_iterate<PluginTypeNameIf, PluginMap>([](QString name, QStringList value) {
-    if (name.isEmpty()) {
-      return value;
+  QStringList names;
+  bf::for_each(m_Plugins, [oPlugin, &names](auto const& p) {
+    using key_type = typename std::decay_t<decltype(p)>::first_type;
+    auto name = PluginTypeName<key_type>::value();
+    if (!name.isEmpty()) {
+      names.append(name);
     }
-    return value << name;
-  }, QStringList(), *it);
+  });
 
   // If the plugin implements at least one interface other than IPlugin, remove IPlugin:
   if (names.size() > 1) {
-    names.removeAll(PluginTypeName<IPlugin>::get());
+    names.removeAll(PluginTypeName<IPlugin>::value());
   }
 
   return names;
-- 
cgit v1.3.1


From e9be288f7ce6ed7861a5ed381e2e16ae730524ad Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 29 Sep 2020 21:55:44 +0200
Subject: Add topImplementedInterface(). Minor cleaning.

---
 src/plugincontainer.cpp | 67 +++++++++++++++++++++++++++++++++++++------------
 src/plugincontainer.h   | 47 +++++++++++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 1af8487f..90a7e95f 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -24,7 +24,6 @@ namespace bf = boost::fusion;
 template <class T>
 struct PluginTypeName;
 
-template <> struct PluginTypeName<QObject> { static QString value() { return {}; } };
 template <> struct PluginTypeName<MOBase::IPlugin> { static QString value() { return QT_TR_NOOP("Plugin"); } };
 template <> struct PluginTypeName<MOBase::IPluginDiagnose> { static QString value() { return QT_TR_NOOP("Diagnose"); } };
 template <> struct PluginTypeName<MOBase::IPluginGame> { static QString value() { return QT_TR_NOOP("Game"); } };
@@ -35,28 +34,24 @@ template <> struct PluginTypeName<MOBase::IPluginTool> { static QString value()
 template <> struct PluginTypeName<MOBase::IPluginProxy> { static QString value() { return QT_TR_NOOP("Proxy"); } };
 template <> struct PluginTypeName<MOBase::IPluginFileMapper> { static QString value() { return QT_TR_NOOP("File Mapper"); } };
 
-QStringList PluginContainer::implementedInterfaces(const IPlugin* plugin) const
+QStringList PluginContainer::implementedInterfaces(IPlugin* plugin) const
 {
-  // Find the correspond QObject - Can this be done safely with a cast?
-  auto& objects = bf::at_key<QObject>(m_Plugins);
-  auto it = std::find_if(std::begin(objects), std::end(objects), [plugin](QObject *obj) {
-    return qobject_cast<IPlugin*>(obj) == plugin;
-  });
+  // We need a QObject to be able to qobject_cast<> to the plugin types:
+  QObject* oPlugin = as_qobject(plugin);
 
-  if (it == std::end(objects)) {
+  if (!oPlugin) {
     return {};
   }
 
-  // We need a QObject to be able to qobject_cast<> to the plugin types:
-  const QObject* oPlugin = *it;
-
   // Find all the names:
   QStringList names;
-  bf::for_each(m_Plugins, [oPlugin, &names](auto const& p) {
-    using key_type = typename std::decay_t<decltype(p)>::first_type;
-    auto name = PluginTypeName<key_type>::value();
-    if (!name.isEmpty()) {
-      names.append(name);
+  boost::mp11::mp_for_each<PluginTypeOrder>([oPlugin, &names](const auto *p) {
+    using plugin_type = std::decay_t<decltype(*p)>;
+    if (qobject_cast<plugin_type*>(oPlugin)) {
+      auto name = PluginTypeName<plugin_type>::value();
+      if (!name.isEmpty()) {
+        names.append(name);
+      }
     }
   });
 
@@ -68,6 +63,30 @@ QStringList PluginContainer::implementedInterfaces(const IPlugin* plugin) const
   return names;
 }
 
+QString PluginContainer::topImplementedInterface(IPlugin* plugin) const
+{
+  // We need a QObject to be able to qobject_cast<> to the plugin types:
+  QObject* oPlugin = as_qobject(plugin);
+
+  if (!oPlugin) {
+    return {};
+  }
+
+  // Find all the names:
+  QString name;
+  boost::mp11::mp_for_each<PluginTypeOrder>([oPlugin, &name](auto *p) {
+    using plugin_type = std::decay_t<decltype(*p)>;
+    if (name.isEmpty() && qobject_cast<plugin_type*>(oPlugin)) {
+      auto tname = PluginTypeName<plugin_type>::value();
+      if (!tname.isEmpty()) {
+        name = tname;
+      }
+    }
+  });
+
+  return name;
+}
+
 PluginContainer::PluginContainer(OrganizerCore *organizer)
   : m_Organizer(organizer)
   , m_UserInterface(nullptr)
@@ -79,6 +98,7 @@ PluginContainer::~PluginContainer() {
   unloadPlugins();
 }
 
+
 void PluginContainer::setUserInterface(IUserInterface *userInterface, QWidget *widget)
 {
   for (IPluginProxy *proxy : bf::at_key<IPluginProxy>(m_Plugins)) {
@@ -115,6 +135,21 @@ QStringList PluginContainer::pluginFileNames() const
 }
 
 
+QObject* PluginContainer::as_qobject(MOBase::IPlugin* plugin) const
+{
+  // Find the correspond QObject - Can this be done safely with a cast?
+  auto& objects = bf::at_key<QObject>(m_Plugins);
+  auto it = std::find_if(std::begin(objects), std::end(objects), [plugin](QObject* obj) {
+    return qobject_cast<IPlugin*>(obj) == plugin;
+    });
+
+  if (it == std::end(objects)) {
+    return nullptr;
+  }
+
+  return *it;
+}
+
 bool PluginContainer::verifyPlugin(IPlugin *plugin)
 {
   if (plugin == nullptr) {
diff --git a/src/plugincontainer.h b/src/plugincontainer.h
index 7eb59a0f..8672606b 100644
--- a/src/plugincontainer.h
+++ b/src/plugincontainer.h
@@ -19,6 +19,7 @@ class IUserInterface;
 #ifndef Q_MOC_RUN
 #include <boost/fusion/container.hpp>
 #include <boost/fusion/include/at_key.hpp>
+#include <boost/mp11.hpp>
 #endif // Q_MOC_RUN
 #include <vector>
 
@@ -46,6 +47,28 @@ private:
 
   static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;
 
+  /**
+  * This typedefs defines the order of plugin interface. This is increasing order of
+  * importance".
+  *
+  * @note IPlugin is the less important interface, followed by IPluginDiagnose and
+  *     IPluginFileMapper as those are usually implemented together with another interface.
+  *     Other interfaces are in a alphabetical order since it is unlikely a plugin will
+  *     implement multiple ones.
+  */
+  using PluginTypeOrder =
+    boost::mp11::mp_transform<
+      std::add_pointer_t,
+      boost::mp11::mp_list<
+        MOBase::IPluginGame, MOBase::IPluginInstaller, MOBase::IPluginModPage, MOBase::IPluginPreview,
+        MOBase::IPluginProxy, MOBase::IPluginTool, MOBase::IPluginDiagnose, MOBase::IPluginFileMapper,
+        MOBase::IPlugin
+      >
+    >;
+
+  static_assert(
+    boost::mp11::mp_size<PluginTypeOrder>::value == boost::mp11::mp_size<PluginContainer::PluginMap>::value - 1);
+
 public:
 
   /**
@@ -56,7 +79,19 @@ public:
    *
    * @return the (localized) names of interfaces implemented by this plugin.
    */
-  QStringList implementedInterfaces(const MOBase::IPlugin *plugin) const;
+  QStringList implementedInterfaces(MOBase::IPlugin *plugin) const;
+
+  /**
+   * @brief Return the (localized) name of the most important interface implemented by
+   *     the given plugin.
+   *
+   * The order of interfaces is defined in X.
+   *
+   * @param plugin The plugin to retrieve the interface for.
+   *
+   * @return the (localized) name of the most important interface implemented by this plugin.
+   */
+  QString topImplementedInterface(MOBase::IPlugin* plugin) const;
 
   PluginContainer(OrganizerCore *organizer);
   virtual ~PluginContainer();
@@ -114,6 +149,16 @@ signals:
 
 private:
 
+  /**
+   * @brief Find the QObject* corresponding to the given plugin.
+   *
+   * @param plugin The plugin to find the QObject* for.
+   *
+   * @return a QObject* for the given plugin.
+   */
+  QObject* as_qobject(MOBase::IPlugin* plugin) const;
+
+
   bool verifyPlugin(MOBase::IPlugin *plugin);
   void registerGame(MOBase::IPluginGame *game);
   bool registerPlugin(QObject *pluginObj, const QString &fileName);
-- 
cgit v1.3.1


From 4b1a89648fffea98b447e4289dbc559d717d0b52 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 29 Sep 2020 22:47:38 +0200
Subject: Display plugins in a tree instead of a list in the settings dialog.

---
 src/plugincontainer.cpp       | 89 ++++++++++++++++++++++++++-----------------
 src/plugincontainer.h         | 43 ++++++++++++---------
 src/settingsdialog.cpp        |  2 +-
 src/settingsdialog.ui         | 12 +++---
 src/settingsdialogplugins.cpp | 73 +++++++++++++++++++++++++----------
 src/settingsdialogplugins.h   |  8 ++--
 6 files changed, 144 insertions(+), 83 deletions(-)

(limited to 'src')

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 90a7e95f..60acc63c 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -34,6 +34,55 @@ template <> struct PluginTypeName<MOBase::IPluginTool> { static QString value()
 template <> struct PluginTypeName<MOBase::IPluginProxy> { static QString value() { return QT_TR_NOOP("Proxy"); } };
 template <> struct PluginTypeName<MOBase::IPluginFileMapper> { static QString value() { return QT_TR_NOOP("File Mapper"); } };
 
+
+QStringList PluginContainer::pluginInterfaces()
+{
+  // Find all the names:
+  QStringList names;
+  boost::mp11::mp_for_each<PluginTypeOrder>([&names](const auto* p) {
+    using plugin_type = std::decay_t<decltype(*p)>;
+    auto name = PluginTypeName<plugin_type>::value();
+    if (!name.isEmpty()) {
+      names.append(name);
+    }
+  });
+
+  return names;
+}
+
+
+PluginContainer::PluginContainer(OrganizerCore *organizer)
+  : m_Organizer(organizer)
+  , m_UserInterface(nullptr)
+{
+}
+
+PluginContainer::~PluginContainer() {
+  m_Organizer = nullptr;
+  unloadPlugins();
+}
+
+
+void PluginContainer::setUserInterface(IUserInterface *userInterface, QWidget *widget)
+{
+  for (IPluginProxy *proxy : bf::at_key<IPluginProxy>(m_Plugins)) {
+    proxy->setParentWidget(widget);
+  }
+
+  if (userInterface != nullptr) {
+    for (IPluginModPage *modPage : bf::at_key<IPluginModPage>(m_Plugins)) {
+      userInterface->registerModPage(modPage);
+    }
+
+    for (IPluginTool *tool : bf::at_key<IPluginTool>(m_Plugins)) {
+      userInterface->registerPluginTool(tool);
+    }
+  }
+
+  m_UserInterface = userInterface;
+}
+
+
 QStringList PluginContainer::implementedInterfaces(IPlugin* plugin) const
 {
   // We need a QObject to be able to qobject_cast<> to the plugin types:
@@ -45,7 +94,7 @@ QStringList PluginContainer::implementedInterfaces(IPlugin* plugin) const
 
   // Find all the names:
   QStringList names;
-  boost::mp11::mp_for_each<PluginTypeOrder>([oPlugin, &names](const auto *p) {
+  boost::mp11::mp_for_each<PluginTypeOrder>([oPlugin, &names](const auto* p) {
     using plugin_type = std::decay_t<decltype(*p)>;
     if (qobject_cast<plugin_type*>(oPlugin)) {
       auto name = PluginTypeName<plugin_type>::value();
@@ -53,7 +102,7 @@ QStringList PluginContainer::implementedInterfaces(IPlugin* plugin) const
         names.append(name);
       }
     }
-  });
+    });
 
   // If the plugin implements at least one interface other than IPlugin, remove IPlugin:
   if (names.size() > 1) {
@@ -63,6 +112,7 @@ QStringList PluginContainer::implementedInterfaces(IPlugin* plugin) const
   return names;
 }
 
+
 QString PluginContainer::topImplementedInterface(IPlugin* plugin) const
 {
   // We need a QObject to be able to qobject_cast<> to the plugin types:
@@ -74,7 +124,7 @@ QString PluginContainer::topImplementedInterface(IPlugin* plugin) const
 
   // Find all the names:
   QString name;
-  boost::mp11::mp_for_each<PluginTypeOrder>([oPlugin, &name](auto *p) {
+  boost::mp11::mp_for_each<PluginTypeOrder>([oPlugin, &name](auto* p) {
     using plugin_type = std::decay_t<decltype(*p)>;
     if (name.isEmpty() && qobject_cast<plugin_type*>(oPlugin)) {
       auto tname = PluginTypeName<plugin_type>::value();
@@ -82,42 +132,11 @@ QString PluginContainer::topImplementedInterface(IPlugin* plugin) const
         name = tname;
       }
     }
-  });
+    });
 
   return name;
 }
 
-PluginContainer::PluginContainer(OrganizerCore *organizer)
-  : m_Organizer(organizer)
-  , m_UserInterface(nullptr)
-{
-}
-
-PluginContainer::~PluginContainer() {
-  m_Organizer = nullptr;
-  unloadPlugins();
-}
-
-
-void PluginContainer::setUserInterface(IUserInterface *userInterface, QWidget *widget)
-{
-  for (IPluginProxy *proxy : bf::at_key<IPluginProxy>(m_Plugins)) {
-    proxy->setParentWidget(widget);
-  }
-
-  if (userInterface != nullptr) {
-    for (IPluginModPage *modPage : bf::at_key<IPluginModPage>(m_Plugins)) {
-      userInterface->registerModPage(modPage);
-    }
-
-    for (IPluginTool *tool : bf::at_key<IPluginTool>(m_Plugins)) {
-      userInterface->registerPluginTool(tool);
-    }
-  }
-
-  m_UserInterface = userInterface;
-}
-
 
 QStringList PluginContainer::pluginFileNames() const
 {
diff --git a/src/plugincontainer.h b/src/plugincontainer.h
index 8672606b..07363ee7 100644
--- a/src/plugincontainer.h
+++ b/src/plugincontainer.h
@@ -72,26 +72,13 @@ private:
 public:
 
   /**
-   * @brief Retrieved the (localized) names of interfaces implemented by the given
-   *     plugin.
+   * @brief Retrieved the (localized) names of the various plugin interfaces.
    *
-   * @param plugin The plugin to retrieve interface for.
-   *
-   * @return the (localized) names of interfaces implemented by this plugin.
+   * @return the (localized) names of the various plugin interfaces.
    */
-  QStringList implementedInterfaces(MOBase::IPlugin *plugin) const;
+  static QStringList pluginInterfaces();
 
-  /**
-   * @brief Return the (localized) name of the most important interface implemented by
-   *     the given plugin.
-   *
-   * The order of interfaces is defined in X.
-   *
-   * @param plugin The plugin to retrieve the interface for.
-   *
-   * @return the (localized) name of the most important interface implemented by this plugin.
-   */
-  QString topImplementedInterface(MOBase::IPlugin* plugin) const;
+public:
 
   PluginContainer(OrganizerCore *organizer);
   virtual ~PluginContainer();
@@ -125,6 +112,28 @@ public:
     return temp;
   }
 
+  /**
+   * @brief Retrieved the (localized) names of interfaces implemented by the given
+   *     plugin.
+   *
+   * @param plugin The plugin to retrieve interface for.
+   *
+   * @return the (localized) names of interfaces implemented by this plugin.
+   */
+  QStringList implementedInterfaces(MOBase::IPlugin* plugin) const;
+
+  /**
+   * @brief Return the (localized) name of the most important interface implemented by
+   *     the given plugin.
+   *
+   * The order of interfaces is defined in X.
+   *
+   * @param plugin The plugin to retrieve the interface for.
+   *
+   * @return the (localized) name of the most important interface implemented by this plugin.
+   */
+  QString topImplementedInterface(MOBase::IPlugin* plugin) const;
+
   /**
    * @return the preview generator.
    */
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index daccfba9..87c7201d 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -43,7 +43,7 @@ SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings& setti
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new DiagnosticsSettingsTab(settings, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(settings, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new SteamSettingsTab(settings, *this)));
-  m_tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsSettingsTab(settings, *this)));
+  m_tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsSettingsTab(settings, m_pluginContainer, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsSettingsTab(settings, *this)));
 }
 
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 2ceb91db..97fa01bd 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">
@@ -1042,16 +1042,18 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_9">
          <item>
-          <widget class="QListWidget" name="pluginsList">
+          <widget class="QTreeWidget" name="pluginsList">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="sortingEnabled">
-            <bool>true</bool>
-           </property>
+           <column>
+            <property name="text">
+             <string notr="true">1</string>
+            </property>
+           </column>
           </widget>
          </item>
          <item>
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 <iplugin.h>
 
+#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<QString, QTreeWidgetItem*> 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<QString> 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<IPlugin*>(qvariant_cast<void*>(pluginItem->data(ROLE_PLUGIN)));
+  return static_cast<IPlugin*>(qvariant_cast<void*>(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<IPlugin*>(current->data(Qt::UserRole).value<void*>());
+  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);
   }
 }
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
index b793e5fd..f9069be1 100644
--- a/src/settingsdialogplugins.h
+++ b/src/settingsdialogplugins.h
@@ -7,21 +7,21 @@
 class PluginsSettingsTab : public SettingsTab
 {
 public:
-  PluginsSettingsTab(Settings& settings, SettingsDialog& dialog);
+  PluginsSettingsTab(Settings& settings, PluginContainer* pluginContainer, SettingsDialog& dialog);
 
   void update();
   void closing() override;
 
 private:
-  void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  void on_pluginsList_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
   void deleteBlacklistItem();
-  void storeSettings(QListWidgetItem *pluginItem);
+  void storeSettings(QTreeWidgetItem *pluginItem);
 
   /**
    * @brief Retrieve the plugin associated to the given item in the list.
    *
    */
-  MOBase::IPlugin* plugin(QListWidgetItem *pluginItem) const;
+  MOBase::IPlugin* plugin(QTreeWidgetItem *pluginItem) const;
 
   constexpr static int ROLE_PLUGIN = Qt::UserRole;
   constexpr static int ROLE_SETTINGS = Qt::UserRole + 1;
-- 
cgit v1.3.1


From 04c8409bf5eb41475064c0dbb69f431e43917593 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Wed, 30 Sep 2020 18:58:01 +0200
Subject: Add filter for plugin list.

---
 src/settingsdialog.ui         | 36 ++++++++++++++++++++++--------------
 src/settingsdialogplugins.cpp |  6 +++++-
 src/settingsdialogplugins.h   |  6 ++++++
 3 files changed, 33 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 97fa01bd..67df1ec9 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1042,19 +1042,28 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_9">
          <item>
-          <widget class="QTreeWidget" name="pluginsList">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <column>
-            <property name="text">
-             <string notr="true">1</string>
-            </property>
-           </column>
-          </widget>
+          <layout class="QVBoxLayout" name="verticalLayout_15">
+           <item>
+            <widget class="QTreeWidget" name="pluginsList">
+             <column>
+              <property name="text">
+               <string notr="true">1</string>
+              </property>
+             </column>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <item>
+              <widget class="QLineEdit" name="pluginFilterEdit">
+               <property name="placeholderText">
+                <string/>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,1">
@@ -1615,7 +1624,6 @@ programs you are intentionally running.</string>
   <tabstop>preferredServersList</tabstop>
   <tabstop>steamUserEdit</tabstop>
   <tabstop>steamPassEdit</tabstop>
-  <tabstop>pluginsList</tabstop>
   <tabstop>pluginSettingsList</tabstop>
   <tabstop>pluginBlacklist</tabstop>
   <tabstop>appIDEdit</tabstop>
diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index cb306f36..e13f727e 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -33,7 +33,8 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginConta
     if (handledNames.contains(plugin->name()))
       continue;
     QTreeWidgetItem* listItem = new QTreeWidgetItem(
-      topItems.at(pluginContainer->topImplementedInterface(plugin)), { plugin->localizedName() });
+      topItems.at(pluginContainer->topImplementedInterface(plugin)));
+    listItem->setData(0, Qt::DisplayRole, 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()));
@@ -52,6 +53,9 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginConta
     ui->pluginBlacklist->addItem(pluginName);
   }
 
+  m_filter.setEdit(ui->pluginFilterEdit);
+  m_filter.setList(ui->pluginsList);
+
   QObject::connect(
     ui->pluginsList, &QTreeWidget::currentItemChanged,
     [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
index f9069be1..e284b271 100644
--- a/src/settingsdialogplugins.h
+++ b/src/settingsdialogplugins.h
@@ -1,6 +1,8 @@
 #ifndef SETTINGSDIALOGPLUGINS_H
 #define SETTINGSDIALOGPLUGINS_H
 
+#include "filterwidget.h"
+
 #include "settings.h"
 #include "settingsdialog.h"
 
@@ -26,6 +28,10 @@ private:
   constexpr static int ROLE_PLUGIN = Qt::UserRole;
   constexpr static int ROLE_SETTINGS = Qt::UserRole + 1;
   constexpr static int ROLE_DESCRIPTIONS = Qt::UserRole + 2;
+
+private:
+
+  MOBase::FilterWidget m_filter;
 };
 
 #endif // SETTINGSDIALOGPLUGINS_H
-- 
cgit v1.3.1


From 7786a75feef8f012e9a403bb83319f2d306fe3df Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Wed, 30 Sep 2020 19:57:54 +0200
Subject: Make filter work and reorganize layout with QSplitters.

---
 src/settingsdialog.ui         | 271 ++++++++++++++++++++++++------------------
 src/settingsdialogplugins.cpp |  61 ++++++----
 src/settingsdialogplugins.h   |   9 ++
 3 files changed, 205 insertions(+), 136 deletions(-)

(limited to 'src')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 67df1ec9..05a648de 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>586</width>
-    <height>491</height>
+    <width>820</width>
+    <height>652</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1038,130 +1038,172 @@
       <attribute name="title">
        <string>Plugins</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_9" stretch="0,0,0">
+      <layout class="QVBoxLayout" name="verticalLayout_9">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_9">
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_15">
+        <widget class="QSplitter" name="splitter">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="handleWidth">
+          <number>2</number>
+         </property>
+         <widget class="QWidget" name="" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>4</verstretch>
+           </sizepolicy>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_6">
            <item>
-            <widget class="QTreeWidget" name="pluginsList">
-             <column>
-              <property name="text">
-               <string notr="true">1</string>
-              </property>
-             </column>
+            <widget class="QSplitter" name="splitter_2">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="handleWidth">
+              <number>2</number>
+             </property>
+             <widget class="QWidget" name="" native="true">
+              <layout class="QVBoxLayout" name="verticalLayout_15">
+               <item>
+                <widget class="QTreeWidget" name="pluginsList">
+                 <column>
+                  <property name="text">
+                   <string notr="true">1</string>
+                  </property>
+                 </column>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="horizontalLayout_4">
+                 <item>
+                  <widget class="QLineEdit" name="pluginFilterEdit">
+                   <property name="placeholderText">
+                    <string/>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </widget>
+             <widget class="QWidget" name="" native="true">
+              <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,1">
+               <item>
+                <layout class="QFormLayout" name="formLayout_2">
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="label_13">
+                   <property name="text">
+                    <string>Author:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="1">
+                  <widget class="QLabel" name="authorLabel">
+                   <property name="text">
+                    <string/>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="0">
+                  <widget class="QLabel" name="label_15">
+                   <property name="text">
+                    <string>Version:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QLabel" name="versionLabel">
+                   <property name="text">
+                    <string/>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="1">
+                  <widget class="QLabel" name="descriptionLabel">
+                   <property name="text">
+                    <string/>
+                   </property>
+                   <property name="wordWrap">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="0">
+                  <widget class="QLabel" name="label_14">
+                   <property name="text">
+                    <string>Description:</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QTreeWidget" name="pluginSettingsList">
+                 <property name="indentation">
+                  <number>0</number>
+                 </property>
+                 <property name="rootIsDecorated">
+                  <bool>false</bool>
+                 </property>
+                 <property name="itemsExpandable">
+                  <bool>false</bool>
+                 </property>
+                 <property name="expandsOnDoubleClick">
+                  <bool>false</bool>
+                 </property>
+                 <attribute name="headerVisible">
+                  <bool>false</bool>
+                 </attribute>
+                 <attribute name="headerDefaultSectionSize">
+                  <number>170</number>
+                 </attribute>
+                 <column>
+                  <property name="text">
+                   <string>Key</string>
+                  </property>
+                 </column>
+                 <column>
+                  <property name="text">
+                   <string>Value</string>
+                  </property>
+                 </column>
+                </widget>
+               </item>
+              </layout>
+             </widget>
             </widget>
            </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <widget class="QLineEdit" name="pluginFilterEdit">
-               <property name="placeholderText">
-                <string/>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
           </layout>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,1">
-           <item>
-            <layout class="QFormLayout" name="formLayout_2">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_13">
-               <property name="text">
-                <string>Author:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="authorLabel">
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_15">
-               <property name="text">
-                <string>Version:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLabel" name="versionLabel">
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="label_14">
-               <property name="text">
-                <string>Description:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QLabel" name="descriptionLabel">
-               <property name="text">
-                <string/>
-               </property>
-               <property name="wordWrap">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
+         </widget>
+         <widget class="QWidget" name="verticalWidget" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>1</verstretch>
+           </sizepolicy>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_16">
            <item>
-            <widget class="QTreeWidget" name="pluginSettingsList">
-             <property name="indentation">
-              <number>0</number>
-             </property>
-             <property name="rootIsDecorated">
-              <bool>false</bool>
-             </property>
-             <property name="itemsExpandable">
-              <bool>false</bool>
-             </property>
-             <property name="expandsOnDoubleClick">
-              <bool>false</bool>
+            <widget class="QLabel" name="label_18">
+             <property name="text">
+              <string>Blacklisted Plugins (use &lt;del&gt; to remove):</string>
              </property>
-             <attribute name="headerVisible">
-              <bool>false</bool>
-             </attribute>
-             <attribute name="headerDefaultSectionSize">
-              <number>170</number>
-             </attribute>
-             <column>
-              <property name="text">
-               <string>Key</string>
-              </property>
-             </column>
-             <column>
-              <property name="text">
-               <string>Value</string>
-              </property>
-             </column>
             </widget>
            </item>
+           <item>
+            <widget class="QListWidget" name="pluginBlacklist"/>
+           </item>
           </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_18">
-         <property name="text">
-          <string>Blacklisted Plugins (use &lt;del&gt; to remove):</string>
-         </property>
+         </widget>
         </widget>
        </item>
-       <item>
-        <widget class="QListWidget" name="pluginBlacklist"/>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="workaroundTab">
@@ -1625,7 +1667,6 @@ programs you are intentionally running.</string>
   <tabstop>steamUserEdit</tabstop>
   <tabstop>steamPassEdit</tabstop>
   <tabstop>pluginSettingsList</tabstop>
-  <tabstop>pluginBlacklist</tabstop>
   <tabstop>appIDEdit</tabstop>
   <tabstop>mechanismBox</tabstop>
   <tabstop>hideUncheckedBox</tabstop>
diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index e13f727e..75344ecf 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -8,16 +8,39 @@
 using MOBase::IPlugin;
 
 PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginContainer, SettingsDialog& d)
-  : SettingsTab(s, d)
+  : SettingsTab(s, d), m_pluginContainer(pluginContainer)
 {
   ui->pluginSettingsList->setStyleSheet("QTreeWidget::item {padding-right: 10px;}");
 
+  populatePluginList();
+
+  // display plugin blacklist
+  for (const QString &pluginName : settings().plugins().blacklist()) {
+    ui->pluginBlacklist->addItem(pluginName);
+  }
+
+  m_filter.setEdit(ui->pluginFilterEdit);
+
+  QObject::connect(
+    ui->pluginsList, &QTreeWidget::currentItemChanged,
+    [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
+
+  QShortcut *delShortcut = new QShortcut(
+    QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
+  QObject::connect(delShortcut, &QShortcut::activated, &dialog(), [&] { deleteBlacklistItem(); });
+  QObject::connect(&m_filter, &MOBase::FilterWidget::changed, [&] { populatePluginList(); });
+}
+
+void PluginsSettingsTab::populatePluginList()
+{
+  ui->pluginsList->clear();
+
   // Create top-level tree widget:
-  QStringList pluginInterfaces = pluginContainer->pluginInterfaces();
+  QStringList pluginInterfaces = m_pluginContainer->pluginInterfaces();
   pluginInterfaces.sort(Qt::CaseInsensitive);
   std::map<QString, QTreeWidgetItem*> topItems;
   for (QString interfaceName : pluginInterfaces) {
-    auto *item = new QTreeWidgetItem(ui->pluginsList, { interfaceName });
+    auto* item = new QTreeWidgetItem(ui->pluginsList, { interfaceName });
     item->setFlags(item->flags() & ~Qt::ItemIsSelectable);
     auto font = item->font(0);
     font.setBold(true);
@@ -29,11 +52,17 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginConta
 
   // display plugin settings
   QSet<QString> handledNames;
-  for (IPlugin *plugin : settings().plugins().plugins()) {
-    if (handledNames.contains(plugin->name()))
+  for (IPlugin* plugin : settings().plugins().plugins()) {
+    if (handledNames.contains(plugin->name())) {
       continue;
+    }
+    if (!m_filter.matches([plugin](const QRegularExpression& regex) {
+        return regex.match(plugin->localizedName()).hasMatch();
+      })) {
+      continue;
+    }
     QTreeWidgetItem* listItem = new QTreeWidgetItem(
-      topItems.at(pluginContainer->topImplementedInterface(plugin)));
+      topItems.at(m_pluginContainer->topImplementedInterface(plugin)));
     listItem->setData(0, Qt::DisplayRole, plugin->localizedName());
     listItem->setData(0, ROLE_PLUGIN, QVariant::fromValue((void*)plugin));
     listItem->setData(0, ROLE_SETTINGS, settings().plugins().settings(plugin->name()));
@@ -46,23 +75,13 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginConta
     handledNames.insert(plugin->name());
   }
 
-  ui->pluginsList->sortByColumn(0, Qt::AscendingOrder);
-
-  // display plugin blacklist
-  for (const QString &pluginName : settings().plugins().blacklist()) {
-    ui->pluginBlacklist->addItem(pluginName);
+  for (auto& [k, item] : topItems) {
+    if (item->childCount() == 0) {
+      item->setHidden(true);
+    }
   }
 
-  m_filter.setEdit(ui->pluginFilterEdit);
-  m_filter.setList(ui->pluginsList);
-
-  QObject::connect(
-    ui->pluginsList, &QTreeWidget::currentItemChanged,
-    [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
-
-  QShortcut *delShortcut = new QShortcut(
-    QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
-  QObject::connect(delShortcut, &QShortcut::activated, &dialog(), [&]{ deleteBlacklistItem(); });
+  ui->pluginsList->sortByColumn(0, Qt::AscendingOrder);
 }
 
 IPlugin* PluginsSettingsTab::plugin(QTreeWidgetItem* pluginItem) const
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
index e284b271..a09c34f1 100644
--- a/src/settingsdialogplugins.h
+++ b/src/settingsdialogplugins.h
@@ -19,6 +19,13 @@ private:
   void deleteBlacklistItem();
   void storeSettings(QTreeWidgetItem *pluginItem);
 
+private slots:
+  /**
+   * @brief Clear and repopulate the plugin list.
+   *
+   */
+  void populatePluginList();
+
   /**
    * @brief Retrieve the plugin associated to the given item in the list.
    *
@@ -31,6 +38,8 @@ private:
 
 private:
 
+  PluginContainer* m_pluginContainer;
+
   MOBase::FilterWidget m_filter;
 };
 
-- 
cgit v1.3.1


From fb3d22a04d0a354e26966ca5bea4648b66e0b933 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Wed, 30 Sep 2020 20:10:34 +0200
Subject: Only hide QTreeWidgetItem in plugin list when filtering.

---
 src/settingsdialogplugins.cpp | 89 +++++++++++++++++++++++++++++--------------
 src/settingsdialogplugins.h   |  4 +-
 2 files changed, 63 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index 75344ecf..5faa0dc9 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -12,29 +12,6 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginConta
 {
   ui->pluginSettingsList->setStyleSheet("QTreeWidget::item {padding-right: 10px;}");
 
-  populatePluginList();
-
-  // display plugin blacklist
-  for (const QString &pluginName : settings().plugins().blacklist()) {
-    ui->pluginBlacklist->addItem(pluginName);
-  }
-
-  m_filter.setEdit(ui->pluginFilterEdit);
-
-  QObject::connect(
-    ui->pluginsList, &QTreeWidget::currentItemChanged,
-    [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
-
-  QShortcut *delShortcut = new QShortcut(
-    QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
-  QObject::connect(delShortcut, &QShortcut::activated, &dialog(), [&] { deleteBlacklistItem(); });
-  QObject::connect(&m_filter, &MOBase::FilterWidget::changed, [&] { populatePluginList(); });
-}
-
-void PluginsSettingsTab::populatePluginList()
-{
-  ui->pluginsList->clear();
-
   // Create top-level tree widget:
   QStringList pluginInterfaces = m_pluginContainer->pluginInterfaces();
   pluginInterfaces.sort(Qt::CaseInsensitive);
@@ -57,7 +34,7 @@ void PluginsSettingsTab::populatePluginList()
       continue;
     }
     if (!m_filter.matches([plugin](const QRegularExpression& regex) {
-        return regex.match(plugin->localizedName()).hasMatch();
+      return regex.match(plugin->localizedName()).hasMatch();
       })) {
       continue;
     }
@@ -68,10 +45,6 @@ void PluginsSettingsTab::populatePluginList()
     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());
   }
 
@@ -82,6 +55,66 @@ void PluginsSettingsTab::populatePluginList()
   }
 
   ui->pluginsList->sortByColumn(0, Qt::AscendingOrder);
+
+  // display plugin blacklist
+  for (const QString &pluginName : settings().plugins().blacklist()) {
+    ui->pluginBlacklist->addItem(pluginName);
+  }
+
+  m_filter.setEdit(ui->pluginFilterEdit);
+
+  QObject::connect(
+    ui->pluginsList, &QTreeWidget::currentItemChanged,
+    [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
+
+  QShortcut *delShortcut = new QShortcut(
+    QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
+  QObject::connect(delShortcut, &QShortcut::activated, &dialog(), [&] { deleteBlacklistItem(); });
+  QObject::connect(&m_filter, &MOBase::FilterWidget::changed, [&] { filterPluginList(); });
+
+  filterPluginList();
+}
+
+void PluginsSettingsTab::filterPluginList()
+{
+  QTreeWidgetItem* firstNotHidden = nullptr;
+
+  for (auto i = 0; i < ui->pluginsList->topLevelItemCount(); ++i) {
+    auto* topLevelItem = ui->pluginsList->topLevelItem(i);
+
+    bool found = false;
+    for (auto j = 0; j < topLevelItem->childCount(); ++j) {
+      auto* item = topLevelItem->child(j);
+      auto* plugin = this->plugin(item);
+
+      if (m_filter.matches([plugin](const QRegularExpression& regex) {
+        return regex.match(plugin->localizedName()).hasMatch();
+        })) {
+        found = true;
+        item->setHidden(false);
+
+        if (firstNotHidden == nullptr) {
+          firstNotHidden = item;
+        }
+      }
+      else {
+        item->setHidden(true);
+      }
+    }
+
+    topLevelItem->setHidden(!found);
+  }
+
+  // Unselect item if hidden:
+  auto selectedItems = ui->pluginsList->selectedItems();
+  if (!selectedItems.isEmpty() && selectedItems[0]->isHidden()) {
+    selectedItems[0]->setSelected(false);
+  
+    if (firstNotHidden) {
+      firstNotHidden->setSelected(true);
+    }
+  }
+
 }
 
 IPlugin* PluginsSettingsTab::plugin(QTreeWidgetItem* pluginItem) const
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
index a09c34f1..add8fede 100644
--- a/src/settingsdialogplugins.h
+++ b/src/settingsdialogplugins.h
@@ -21,10 +21,10 @@ private:
 
 private slots:
   /**
-   * @brief Clear and repopulate the plugin list.
+   * @brief Filter the plugin list according to the filter widget.
    *
    */
-  void populatePluginList();
+  void filterPluginList();
 
   /**
    * @brief Retrieve the plugin associated to the given item in the list.
-- 
cgit v1.3.1


From 475fc0b813497d81aed92b0659cb2213dd9ce14f Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 1 Oct 2020 18:42:17 +0200
Subject: Fix default tab index of settings dialog.

---
 src/settingsdialog.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 05a648de..33c1c2ee 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>4</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">
@@ -1047,7 +1047,7 @@
          <property name="handleWidth">
           <number>2</number>
          </property>
-         <widget class="QWidget" name="" native="true">
+         <widget class="QWidget" name="widget" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -1069,7 +1069,7 @@
              <property name="handleWidth">
               <number>2</number>
              </property>
-             <widget class="QWidget" name="" native="true">
+             <widget class="QWidget" name="widget" native="true">
               <layout class="QVBoxLayout" name="verticalLayout_15">
                <item>
                 <widget class="QTreeWidget" name="pluginsList">
@@ -1093,7 +1093,7 @@
                </item>
               </layout>
              </widget>
-             <widget class="QWidget" name="" native="true">
+             <widget class="QWidget" name="widget" native="true">
               <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,1">
                <item>
                 <layout class="QFormLayout" name="formLayout_2">
-- 
cgit v1.3.1