Merge a6ff41f into ad0bae9

opencor · Dec 2, 2019 · 8becc2d · 8becc2d
2 parents ad0bae9 + a6ff41f
commit 8becc2d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -38,7 +38,7 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>General:</strong> added (initial) support for <a href=\"https://python.org/\">Python</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/1255\">#1255</a>). Replaced our use of <a href=\"https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/PackageMakerUserGuide/Introduction/Introduction.html\">PackageMaker</a> with that of productbuild on <a href=\"https://en.wikipedia.org/wiki/MacOS\">macOS</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2210\">#2210</a>)." },
-                       { "change": "<strong>Python support:</strong> now update the environment variable <code>PATH</code> using <code>\\</code> rather than <code>/</code> on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/2219\">#2219</a>). Merged our duplicated code (see issue <a href=\"https://github.com/opencor/opencor/issues/2225\">#2225</a>)." },
+                       { "change": "<strong>Python support:</strong> now update the environment variable <code>PATH</code> using <code>\\</code> rather than <code>/</code> on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/2219\">#2219</a>). Merged our duplicated code (see issue <a href=\"https://github.com/opencor/opencor/issues/2225\">#2225</a>). Don't make our JupyterKernel and PythonShell plugins selectable (see issue <a href=\"https://github.com/opencor/opencor/issues/2245\">#2245</a>)." },
                        { "change": "<strong>CellML support:</strong> fixed an issue with the CellML API wrongly allowing code generation for non-runnable models (see issue <a href=\"https://github.com/opencor/opencor/issues/2240\">#2240</a>)." },
                        { "change": "<strong>SED-ML support:</strong> added support left and right triangle symbols (see issue <a href=\"https://github.com/opencor/opencor/issues/2173\">#2173</a>)." },
                        { "change": "<strong>Simulation support:</strong> don't require all our solvers to be installed anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/2234\">#2234</a>)." },

diff --git a/doc/whatIsNew.js b/doc/whatIsNew.js
@@ -56,6 +56,11 @@ var jsonData = { "versions": [
                        },
                        { "name": "Support",
                          "entries": [
+                           { "type": "subCategory", "name": "CellML support",
+                             "entries": [
+                               { "type": "improved", "description": "Loading of <a href=\"https://cellml.org/\">CellML</a> files." }
+                             ]
+                           },
                            { "type": "subCategory", "name": "COMBINE support",
                              "entries": [
                                { "type": "fixed", "description": "Files with a master attribute of \"1\" (rather than \"true\")." }

diff --git a/src/plugins/miscellaneous/JupyterKernel/src/jupyterkernelplugin.cpp b/src/plugins/miscellaneous/JupyterKernel/src/jupyterkernelplugin.cpp
@@ -38,7 +38,7 @@ PLUGININFO_FUNC JupyterKernelPluginInfo()
     descriptions.insert("en", QString::fromUtf8(R"(the <a href="https://jupyter.org/">Jupyter</a> kernel plugin.)"));
     descriptions.insert("fr", QString::fromUtf8(R"(le plugin du noyau <a href="https://jupyter.org/">Jupyter</a>.)"));
 
-    return new PluginInfo(PluginInfo::Category::Miscellaneous, true, true,
+    return new PluginInfo(PluginInfo::Category::Miscellaneous, false, true,
                           QStringList() << "Core" << "SimulationSupport",
                           descriptions);
 }

diff --git a/src/plugins/miscellaneous/PythonShell/src/pythonshellplugin.cpp b/src/plugins/miscellaneous/PythonShell/src/pythonshellplugin.cpp
@@ -39,7 +39,7 @@ PLUGININFO_FUNC PythonShellPluginInfo()
     descriptions.insert("en", QString::fromUtf8("the <a href=\"https://python.org/\">Python</a> shell plugin."));
     descriptions.insert("fr", QString::fromUtf8("le plugin shell <a href=\"https://python.org/\">Python</a>."));
 
-    return new PluginInfo(PluginInfo::Category::Miscellaneous, true, true,
+    return new PluginInfo(PluginInfo::Category::Miscellaneous, false, true,
                           QStringList() << "Core" << "PythonQtSupport" << "SimulationSupport",
                           descriptions);
 }