From 8886674379c507fe46bfc6cb2ef013537567441b Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 17 Nov 2020 14:28:43 +0100
Subject: Better dialog for warning when disabling proxy plugin.

---
 src/disableproxyplugindialog.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/disableproxyplugindialog.cpp

(limited to 'src/disableproxyplugindialog.cpp')

diff --git a/src/disableproxyplugindialog.cpp b/src/disableproxyplugindialog.cpp
new file mode 100644
index 00000000..f392113b
--- /dev/null
+++ b/src/disableproxyplugindialog.cpp
@@ -0,0 +1,30 @@
+#include "disableproxyplugindialog.h"
+
+#include "ui_proxyplugindialog.h"
+
+using namespace MOBase;
+
+DisableProxyPluginDialog::DisableProxyPluginDialog(
+  MOBase::IPlugin* proxyPlugin, std::vector<MOBase::IPlugin*> const& required, QWidget* parent)
+  : QDialog(parent), ui(new Ui::DisableProxyPluginDialog)
+{
+  ui->setupUi(this);
+
+  ui->topLabel->setText(QObject::tr(
+    "Disabling the '%1' plugin will prevent the following %2 plugin(s) from working:", "", required.size())
+    .arg(proxyPlugin->localizedName())
+    .arg(required.size()));
+
+  connect(ui->noBtn, &QPushButton::clicked, this, &QDialog::reject);
+  connect(ui->yesBtn, &QPushButton::clicked, this, &QDialog::accept);
+
+  ui->requiredPlugins->setSelectionMode(QAbstractItemView::NoSelection);
+  ui->requiredPlugins->setRowCount(required.size());
+  for (int i = 0; i < required.size(); ++i) {
+    ui->requiredPlugins->setItem(i, 0, new QTableWidgetItem(required[i]->localizedName()));
+    ui->requiredPlugins->setItem(i, 1, new QTableWidgetItem(required[i]->description()));
+    ui->requiredPlugins->setRowHeight(i, 9);
+  }
+  ui->requiredPlugins->verticalHeader()->setVisible(false);
+  ui->requiredPlugins->sortByColumn(0, Qt::AscendingOrder);
+}
-- 
cgit v1.3.1


From 1d6d01dec887126b70d1de4bbf562d3803072f68 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 17 Nov 2020 18:24:10 +0100
Subject: Disable checkbox when plugin cannot be enabled.

---
 src/disableproxyplugindialog.cpp |  2 +-
 src/settingsdialogplugins.cpp    | 46 ++++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 19 deletions(-)

(limited to 'src/disableproxyplugindialog.cpp')

diff --git a/src/disableproxyplugindialog.cpp b/src/disableproxyplugindialog.cpp
index f392113b..c05e30e3 100644
--- a/src/disableproxyplugindialog.cpp
+++ b/src/disableproxyplugindialog.cpp
@@ -1,6 +1,6 @@
 #include "disableproxyplugindialog.h"
 
-#include "ui_proxyplugindialog.h"
+#include "ui_disableproxyplugindialog.h"
 
 using namespace MOBase;
 
diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index 4313b85e..16f6fb0a 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -217,20 +217,6 @@ void PluginsSettingsTab::on_checkboxEnabled_clicked(bool checked)
 
   // User wants to enable:
   if (checked) {
-    auto problems = requirements.problems();
-    if (!problems.empty()) {
-      QStringList descriptions;
-      for (auto& problem : problems) {
-        descriptions.append(problem.shortDescription());
-      }
-      QMessageBox::warning(
-        parentWidget(), QObject::tr("Cannot enable plugin"),
-        QObject::tr("<p>This plugin cannot be enabled:<p><ul>%1</ul>")
-        .arg("<li>" + descriptions.join("</li><li>") + "</li>"), QMessageBox::Ok);
-      ui->enabledCheckbox->setChecked(false);
-      return;
-    }
-
     m_pluginContainer->setEnabled(plugin, true, false);
   }
   else {
@@ -302,18 +288,42 @@ void PluginsSettingsTab::on_pluginsList_currentItemChanged(QTreeWidgetItem *curr
   ui->versionLabel->setText(plugin->version().canonicalString());
   ui->descriptionLabel->setText(plugin->description());
 
-  ui->enabledCheckbox->setDisabled(false);
-  ui->enabledCheckbox->setToolTip("");
+  // Checkbox, do not show for children or game plugins, disable
+  // if the plugin cannot be enabled.
   ui->enabledCheckbox->setVisible(
     !m_pluginContainer->implementInterface<IPluginGame>(plugin)
     && plugin->master().isEmpty());
+
+  bool enabled = m_pluginContainer->isEnabled(plugin);
+  auto& requirements = m_pluginContainer->requirements(plugin);
+  auto problems = requirements.problems();
+
   if (m_pluginContainer->requirements(plugin).isCorePlugin()) {
     ui->enabledCheckbox->setDisabled(true);
     ui->enabledCheckbox->setToolTip(
       QObject::tr("This plugin is required for Mod Organizer to work properly and cannot be disabled."));
   }
-
-  ui->enabledCheckbox->setChecked(m_pluginContainer->isEnabled(plugin));
+  // Plugin is enable or can be enabled.
+  else if (enabled || problems.empty()) {
+    ui->enabledCheckbox->setDisabled(false);
+    ui->enabledCheckbox->setToolTip("");
+    ui->enabledCheckbox->setChecked(enabled);
+  }
+  // Plugin is disable and cannot be enabled.
+  else {
+    ui->enabledCheckbox->setDisabled(true);
+    ui->enabledCheckbox->setChecked(false);
+    if (problems.size() == 1) {
+      ui->enabledCheckbox->setToolTip(problems[0].shortDescription());
+    }
+    else {
+      QStringList descriptions;
+      for (auto& problem : problems) {
+        descriptions.append(problem.shortDescription());
+      }
+      ui->enabledCheckbox->setToolTip("<ul><li>" + descriptions.join("</li><li>") + "</li></ul>");
+    }
+  }
 
   QVariantMap settings = current->data(0, ROLE_SETTINGS).toMap();
   QVariantMap descriptions = current->data(0, ROLE_DESCRIPTIONS).toMap();
-- 
cgit v1.3.1