Cleanup Lua plugin implementation.

* Move the UI code out of the plugin logic.
* Add types where needed.
* Move into game package.
* Improve error handling.
* Simplify settings behavior.
* Don't load disabled plugins.
* Remove knowledge of non-base plugins from game generation.

Fixes https://github.com/Khopa/dcs_liberation/issues/311

qt_ui/windows/settings/QSettingsWindow.py

@@ -26,7 +26,8 @@ from game.infos.information import Information
 from qt_ui.widgets.QLabeledWidget import QLabeledWidget
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.finances.QFinancesMenu import QHorizontalSeparationLine
-from plugin import LuaPluginManager
+from qt_ui.windows.settings.plugins import PluginOptionsPage, PluginsPage
+
 
 class CheatSettingsBox(QGroupBox):
     def __init__(self, game: Game, apply_settings: Callable[[], None]) -> None:
@@ -97,21 +98,21 @@ class QSettingsWindow(QDialog):
         self.categoryModel.appendRow(cheat)
         self.right_layout.addWidget(self.cheatPage)
 
-        self.initPluginsLayout()
-        if self.pluginsPage:
-            plugins = QStandardItem("LUA Plugins")
-            plugins.setIcon(CONST.ICONS["Plugins"])
-            plugins.setEditable(False)
-            plugins.setSelectable(True)
-            self.categoryModel.appendRow(plugins)       
-            self.right_layout.addWidget(self.pluginsPage)
-        if self.pluginsOptionsPage:
-            pluginsOptions = QStandardItem("LUA Plugins Options")
-            pluginsOptions.setIcon(CONST.ICONS["PluginsOptions"])
-            pluginsOptions.setEditable(False)
-            pluginsOptions.setSelectable(True)
-            self.categoryModel.appendRow(pluginsOptions)
-            self.right_layout.addWidget(self.pluginsOptionsPage)
+        self.pluginsPage = PluginsPage()
+        plugins = QStandardItem("LUA Plugins")
+        plugins.setIcon(CONST.ICONS["Plugins"])
+        plugins.setEditable(False)
+        plugins.setSelectable(True)
+        self.categoryModel.appendRow(plugins)
+        self.right_layout.addWidget(self.pluginsPage)
+
+        self.pluginsOptionsPage = PluginOptionsPage()
+        pluginsOptions = QStandardItem("LUA Plugins Options")
+        pluginsOptions.setIcon(CONST.ICONS["PluginsOptions"])
+        pluginsOptions.setEditable(False)
+        pluginsOptions.setSelectable(True)
+        self.categoryModel.appendRow(pluginsOptions)
+        self.right_layout.addWidget(self.pluginsOptionsPage)
 
         self.categoryList.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.categoryList.setModel(self.categoryModel)
@@ -330,34 +331,6 @@ class QSettingsWindow(QDialog):
             self.moneyCheatBoxLayout.addWidget(btn, i/2, i%2)
         self.cheatLayout.addWidget(self.moneyCheatBox, stretch=1)
 
-    def initPluginsLayout(self):
-        uiPrepared = False
-        row:int = 0
-        for plugin in LuaPluginManager().getPlugins():
-            if plugin.hasUI():
-                if not uiPrepared:
-                    uiPrepared = True
-
-                    self.pluginsOptionsPage = QWidget()
-                    self.pluginsOptionsPageLayout = QVBoxLayout()
-                    self.pluginsOptionsPageLayout.setAlignment(Qt.AlignTop)
-                    self.pluginsOptionsPage.setLayout(self.pluginsOptionsPageLayout)
-
-                    self.pluginsPage = QWidget()
-                    self.pluginsPageLayout = QVBoxLayout()
-                    self.pluginsPageLayout.setAlignment(Qt.AlignTop)
-                    self.pluginsPage.setLayout(self.pluginsPageLayout)
-
-                    self.pluginsGroup = QGroupBox("Plugins")
-                    self.pluginsGroupLayout = QGridLayout();
-                    self.pluginsGroupLayout.setAlignment(Qt.AlignTop)
-                    self.pluginsGroup.setLayout(self.pluginsGroupLayout)
-
-                    self.pluginsPageLayout.addWidget(self.pluginsGroup)
-
-                plugin.setupUI(self, row)
-                row = row + 1
-
     def cheatLambda(self, amount):
         return lambda: self.cheatMoney(amount)
 

qt_ui/windows/settings/plugins.py

@@ -0,0 +1,71 @@
+from PySide2.QtCore import Qt
+from PySide2.QtWidgets import (
+    QCheckBox,
+    QGridLayout,
+    QGroupBox,
+    QLabel, QVBoxLayout,
+    QWidget,
+)
+
+from game.plugins import LuaPlugin, LuaPluginManager
+
+
+class PluginsBox(QGroupBox):
+    def __init__(self) -> None:
+        super().__init__("Plugins")
+
+        layout = QGridLayout()
+        layout.setAlignment(Qt.AlignTop)
+        self.setLayout(layout)
+
+        for row, plugin in enumerate(LuaPluginManager.plugins()):
+            if not plugin.show_in_ui:
+                continue
+
+            layout.addWidget(QLabel(plugin.name), row, 0)
+
+            checkbox = QCheckBox()
+            checkbox.setChecked(plugin.enabled)
+            checkbox.toggled.connect(plugin.set_enabled)
+            layout.addWidget(checkbox, row, 1)
+
+
+class PluginsPage(QWidget):
+    def __init__(self) -> None:
+        super().__init__()
+
+        layout = QVBoxLayout()
+        layout.setAlignment(Qt.AlignTop)
+        self.setLayout(layout)
+
+        layout.addWidget(PluginsBox())
+
+
+class PluginOptionsBox(QGroupBox):
+    def __init__(self, plugin: LuaPlugin) -> None:
+        super().__init__(plugin.name)
+
+        layout = QGridLayout()
+        layout.setAlignment(Qt.AlignTop)
+        self.setLayout(layout)
+
+        for row, option in enumerate(plugin.options):
+            layout.addWidget(QLabel(option.name), row, 0)
+
+            checkbox = QCheckBox()
+            checkbox.setChecked(option.enabled)
+            checkbox.toggled.connect(option.set_enabled)
+            layout.addWidget(checkbox, row, 1)
+
+
+class PluginOptionsPage(QWidget):
+    def __init__(self) -> None:
+        super().__init__()
+
+        layout = QVBoxLayout()
+        layout.setAlignment(Qt.AlignTop)
+        self.setLayout(layout)
+
+        for plugin in LuaPluginManager.plugins():
+            if plugin.options:
+                layout.addWidget(PluginOptionsBox(plugin))