Update following change to PluginSetting in uibase.

Author: Holt59

src/mobase/wrappers/basic_classes.cpp

@@ -798,12 +798,37 @@ namespace mo2::python {
         add_modinterface_classes(m);
         add_modrepository_classes(m);
 
-        py::class_<PluginSetting>(m, "PluginSetting")
-            .def(py::init<const QString&, const QString&, const QVariant&>(), "key"_a,
-                 "description"_a, "default_value"_a)
-            .def_readwrite("key", &PluginSetting::key)
-            .def_readwrite("description", &PluginSetting::description)
-            .def_readwrite("default_value", &PluginSetting::defaultValue);
+        py::class_<Setting>(m, "Setting")
+            .def(py::init([](const QString& name, const QString& description,
+                             const QVariant& defaultValue) {
+                     mo2::python::show_deprecation_warning(
+                         "Setting(key, description, default)",
+                         "Setting(key, description, default) is deprecated, use "
+                         "Setting(name, title, description, default) instead.");
+                     return Setting(name, description, defaultValue);
+                 }),
+                 "key"_a, "description"_a, "default_value"_a)
+            .def(py::init<const QString&, const QString&, const QString&,
+                          const QVariant&>(),
+                 "name"_a, "title"_a, "description"_a, "default_value"_a)
+            .def(py::init<const QString&, const QString&, const QString&,
+                          const QString&, const QVariant&>(),
+                 "name"_a, "title"_a, "description"_a, "group"_a, "default_value"_a)
+            .def_property_readonly("name", &Setting::name)
+            .def_property_readonly("title", &Setting::title)
+            .def_property_readonly("description", &Setting::description)
+            .def_property_readonly("group", &Setting::group)
+            .def_property_readonly("default_value", &Setting::defaultValue);
+
+        // deprecated alias
+        m.attr("PluginSetting") = m.attr("Setting");
+
+        py::class_<SettingGroup>(m, "SettingGroup")
+            .def(py::init<const QString&, const QString&, const QString&>(), "name"_a,
+                 "title"_a, "description"_a)
+            .def_property_readonly("name", &SettingGroup::name)
+            .def_property_readonly("title", &SettingGroup::title)
+            .def_property_readonly("description", &SettingGroup::description);
 
         py::class_<PluginRequirementFactory>(m, "PluginRequirementFactory")
             // pluginDependency

src/mobase/wrappers/pyplugins.cpp

@@ -145,6 +145,7 @@ namespace mo2::python {
             .def("name", &IPlugin::name)
             .def("localizedName", &IPlugin::localizedName)
             .def("settings", &IPlugin::settings)
+            .def("settingGroups", &IPlugin::settingGroups)
             .def("enabledByDefault", &IPlugin::enabledByDefault);
 
         py::class_<IPyPlugin, PyPlugin, IPlugin,

src/mobase/wrappers/pyplugins.h

@@ -45,9 +45,13 @@ namespace mo2::python {
         {
             PYBIND11_OVERRIDE(QString, PluginBase, localizedName, );
         }
-        QList<PluginSetting> settings() const override
+        QList<Setting> settings() const override
         {
-            PYBIND11_OVERRIDE_PURE(QList<PluginSetting>, PluginBase, settings, );
+            PYBIND11_OVERRIDE_PURE(QList<Setting>, PluginBase, settings, );
+        }
+        QList<SettingGroup> settingGroups() const override
+        {
+            PYBIND11_OVERRIDE(QList<SettingGroup>, PluginBase, settingGroups, );
         }
     };
 

tests/runner/plugins/dummy-iplugin.py

@@ -20,7 +20,7 @@ def version(self) -> mobase.VersionInfo:
     def settings(self) -> list[mobase.PluginSetting]:
         return [
             mobase.PluginSetting(
-                "a setting", "the setting description", default_value=12
+                "a_setting", "A Setting", "the setting description", default_value=12
             )
         ]
 

tests/runner/test_iplugin.cpp

@@ -31,10 +31,11 @@ TEST(IPlugin, Basic)
     // settings
     const auto settings = plugin->settings();
     EXPECT_EQ(settings.size(), 1);
-    EXPECT_EQ(settings[0].key, "a setting");
-    EXPECT_EQ(settings[0].description, "the setting description");
-    EXPECT_EQ(settings[0].defaultValue.userType(), QMetaType::Type::Int);
-    EXPECT_EQ(settings[0].defaultValue.toInt(), 12);
+    EXPECT_EQ(settings[0].name(), "a_setting");
+    EXPECT_EQ(settings[0].title(), "A Setting");
+    EXPECT_EQ(settings[0].description(), "the setting description");
+    EXPECT_EQ(settings[0].defaultValue().userType(), QMetaType::Type::Int);
+    EXPECT_EQ(settings[0].defaultValue().toInt(), 12);
 
     // no translation, no custom implementation -> name()
     EXPECT_EQ(plugin->localizedName(), "The Name");