Merge 6d6470a into 04dbdcd

CMakeLists.txt

@@ -906,7 +906,6 @@ set(PLUGINS
     support/CellMLSupport
     support/COMBINESupport
     support/PMRSupport
-    support/QScintillaSupport
     support/SEDMLSupport
     support/SimulationSupport
     support/StandardSupport
@@ -929,6 +928,7 @@ set(PLUGINS
     widget/EditorWidget
     widget/GraphPanelWidget
     widget/MathMLViewerWidget
+    widget/QScintillaWidget
     widget/WebViewerWidget
 )
 

doc/downloads/index.js

@@ -37,7 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>General:</strong> now rely on <a href=\"https://visualstudio.microsoft.com/downloads/\">Visual Studio 2017 Update 9</a> to build OpenCOR on <a href=\"https://en.wikipedia.org/wiki/Microsoft_Windows\">Windows</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2041\">#2041</a>). Upgraded our minimum requirement to <a href=\"https://en.wikipedia.org/wiki/Ubuntu_version_history#Ubuntu_18.04_LTS_(Bionic_Beaver)\">Ubuntu 18.04 LTS</a> on Linux (see issue <a href=\"https://github.com/opencor/opencor/issues/2050\">#2050</a>)." },
+                       { "change": "<strong>General:</strong> now rely on <a href=\"https://visualstudio.microsoft.com/downloads/\">Visual Studio 2017 Update 9</a> to build OpenCOR on <a href=\"https://en.wikipedia.org/wiki/Microsoft_Windows\">Windows</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2041\">#2041</a>). Upgraded our minimum requirement to <a href=\"https://en.wikipedia.org/wiki/Ubuntu_version_history#Ubuntu_18.04_LTS_(Bionic_Beaver)\">Ubuntu 18.04 LTS</a> on Linux (see issue <a href=\"https://github.com/opencor/opencor/issues/2050\">#2050</a>). Renamed QScintillaSupport to QScintillaWidget (see issue <a href=\"https://github.com/opencor/opencor/issues/2066\">#2066</a>)." },
                        { "change": "<strong>PMR Workspaces window:</strong> first list changed files and then show the user's comment (in the synchronisation dialog; see issue <a href=\"https://github.com/opencor/opencor/issues/2065\">#2065</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 8.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2040\">#2040</a>). Upgraded <a href=\"https://github.com/fbergmann/libSEDML/\">libSEDML</a> to version 0.4.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2042\">#2042</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.3.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2044\">#2044</a>). Upgraded <a href=\"http://sbml.org/Software/libSBML/\">libSBML</a> to version 5.18.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2064\">#2064</a>). Upgraded <a href=\"https://jquery.com/\">jQuery</a> to version 3.4.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2068\">#2068</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 19.0.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/2070\">#2070</a>)." }
                      ]

src/plugins/editing/CellMLTextView/src/cellmltextviewlexer.cpp

@@ -163,7 +163,7 @@ void CellmlTextViewLexer::styleText(int pBytesStart, int pBytesEnd)
     mFullText = editor()->text();
     mFullTextUtf8 = mFullText.toUtf8();
 
-    mEolString = qobject_cast<QScintillaSupport::QScintillaWidget *>(editor())->eolString();
+    mEolString = qobject_cast<QScintillaWidget::QScintillaWidget *>(editor())->eolString();
 
     styleText(pBytesStart, pBytesEnd, text, false);
 

src/plugins/editing/CellMLTextView/src/cellmltextviewparser.cpp

@@ -576,7 +576,7 @@ bool CellmlTextViewParser::tokenType(QDomNode &pDomNode,
     QString foundString = mScanner.string();
 
     if (mScanner.token() != CellmlTextViewScanner::Token::Eof) {
-        foundString = QString("'%1'").arg(QScintillaSupport::QScintillaWidget::specials(foundString));
+        foundString = QString("'%1'").arg(QScintillaWidget::QScintillaWidget::specials(foundString));
     }
 
     addUnexpectedTokenErrorMessage(pExpectedString, foundString);

src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.h

@@ -50,9 +50,9 @@ namespace EditorWidget {
 
 //==============================================================================
 
-namespace QScintillaSupport {
+namespace QScintillaWidget {
     class QScintillaWidget;
-} // namespace QScintillaSupport
+} // namespace QScintillaWidget
 
 //==============================================================================
 

src/plugins/miscellaneous/Core/tests/data/cli/status_with_sample_tools.out

@@ -11,7 +11,7 @@ The following plugins are available:
  - LLVMClang: the plugin is loaded and fully functional.
  - MathMLViewerWidget: the plugin is loaded and fully functional.
  - QScintilla: the plugin is loaded and fully functional.
- - QScintillaSupport: the plugin is loaded and fully functional.
+ - QScintillaWidget: the plugin is loaded and fully functional.
  - Qwt: the plugin is loaded and fully functional.
  - Sample: the plugin is loaded and fully functional.
  - SampleTools: the plugin is loaded and fully functional.

src/plugins/miscellaneous/Core/tests/data/cli/status_without_sample_tools.out

@@ -11,6 +11,6 @@ The following plugins are available:
  - LLVMClang: the plugin is loaded and fully functional.
  - MathMLViewerWidget: the plugin is loaded and fully functional.
  - QScintilla: the plugin is loaded and fully functional.
- - QScintillaSupport: the plugin is loaded and fully functional.
+ - QScintillaWidget: the plugin is loaded and fully functional.
  - Qwt: the plugin is loaded and fully functional.
  - StandardSupport: the plugin is loaded and fully functional.

src/plugins/widget/EditorWidget/CMakeLists.txt

@@ -24,5 +24,5 @@ add_plugin(EditorWidget
     UIS
         src/editorwidgetfindreplacewidget.ui
     PLUGINS
-        QScintillaSupport
+        QScintillaWidget
 )

src/plugins/widget/EditorWidget/src/editorwidgeteditorwidget.cpp

@@ -42,7 +42,7 @@ namespace EditorWidget {
 EditorWidgetEditorWidget::EditorWidgetEditorWidget(QsciLexer *pLexer,
                                                    EditorWidgetFindReplaceWidget *pFindReplace,
                                                    EditorWidget *pParent) :
-    QScintillaSupport::QScintillaWidget(pLexer, pParent),
+    QScintillaWidget::QScintillaWidget(pLexer, pParent),
     mOwner(pParent),
     mFindReplace(pFindReplace),
     mReadOnlyStyles(QIntList()),
@@ -110,7 +110,7 @@ void EditorWidgetEditorWidget::keyPressEvent(QKeyEvent *pEvent)
 
         // Default handling of the event
 
-        QScintillaSupport::QScintillaWidget::keyPressEvent(pEvent);
+        QScintillaWidget::QScintillaWidget::keyPressEvent(pEvent);
 
         // Update our highlighting all if our find/replace widget is visible and
         // has some find text and we didn't press one of the navigation keys,
@@ -161,7 +161,7 @@ void EditorWidgetEditorWidget::mouseDoubleClickEvent(QMouseEvent *pEvent)
 {
     // Default handling of the event
 
-    QScintillaSupport::QScintillaWidget::mouseDoubleClickEvent(pEvent);
+    QScintillaWidget::QScintillaWidget::mouseDoubleClickEvent(pEvent);
 
     // Check whether something has been selected and, if so, highlight all of
     // its occurrences
@@ -184,7 +184,7 @@ void EditorWidgetEditorWidget::mousePressEvent(QMouseEvent *pEvent)
 {
     // Default handling of the event
 
-    QScintillaSupport::QScintillaWidget::mousePressEvent(pEvent);
+    QScintillaWidget::QScintillaWidget::mousePressEvent(pEvent);
 
     // Clear any highlighting that we might have, if our find/replace widget is
     // not visible
@@ -200,7 +200,7 @@ void EditorWidgetEditorWidget::setReadOnly(bool pReadOnly)
 {
     // Default handling of the method
 
-    QScintillaSupport::QScintillaWidget::setReadOnly(pReadOnly);
+    QScintillaWidget::QScintillaWidget::setReadOnly(pReadOnly);
 
     // Update our background colour
 
@@ -481,7 +481,7 @@ void EditorWidgetEditorWidget::replace()
                                mFindReplace->isCaseSensitive()?
                                    QRegularExpression::NoPatternOption:
                                    QRegularExpression::CaseInsensitiveOption).match(selectedText()).hasMatch()) {
-            QScintillaSupport::QScintillaWidget::replace(mFindReplace->replaceText());
+            QScintillaWidget::QScintillaWidget::replace(mFindReplace->replaceText());
         }
     } else {
         // The find/replace is done using a simple match, which may be case
@@ -507,7 +507,7 @@ void EditorWidgetEditorWidget::replace()
                                     mFindReplace->isCaseSensitive()?
                                         Qt::CaseSensitive:
                                         Qt::CaseInsensitive) == 0) {
-            QScintillaSupport::QScintillaWidget::replace(mFindReplace->replaceText());
+            QScintillaWidget::QScintillaWidget::replace(mFindReplace->replaceText());
         }
     }
 }
@@ -552,7 +552,7 @@ void EditorWidgetEditorWidget::cut()
 {
     // Default handling of the method
 
-    QScintillaSupport::QScintillaWidget::cut();
+    QScintillaWidget::QScintillaWidget::cut();
 
     // Update our highlighting all if our find/replace widget is visible and
     // has some find text
@@ -568,7 +568,7 @@ void EditorWidgetEditorWidget::paste()
 {
     // Default handling of the method
 
-    QScintillaSupport::QScintillaWidget::paste();
+    QScintillaWidget::QScintillaWidget::paste();
 
     // Update our highlighting all if our find/replace widget is visible and
     // has some find text
@@ -584,7 +584,7 @@ void EditorWidgetEditorWidget::del()
 {
     // Default handling of the method
 
-    QScintillaSupport::QScintillaWidget::del();
+    QScintillaWidget::QScintillaWidget::del();
 
     // Update our highlighting all if our find/replace widget is visible and
     // has some find text
@@ -600,7 +600,7 @@ void EditorWidgetEditorWidget::undo()
 {
     // Default handling of the method
 
-    QScintillaSupport::QScintillaWidget::undo();
+    QScintillaWidget::QScintillaWidget::undo();
 
     // Update our highlighting all if our find/replace widget is visible and
     // has some find text
@@ -616,7 +616,7 @@ void EditorWidgetEditorWidget::redo()
 {
     // Default handling of the method
 
-    QScintillaSupport::QScintillaWidget::redo();
+    QScintillaWidget::QScintillaWidget::redo();
 
     // Update our highlighting all if our find/replace widget is visible and
     // has some find text

src/plugins/widget/EditorWidget/src/editorwidgeteditorwidget.h

@@ -42,7 +42,7 @@ class EditorWidgetScrollBar;
 
 //==============================================================================
 
-class EDITORWIDGET_EXPORT EditorWidgetEditorWidget : public QScintillaSupport::QScintillaWidget
+class EDITORWIDGET_EXPORT EditorWidgetEditorWidget : public QScintillaWidget::QScintillaWidget
 {
     Q_OBJECT
 

src/plugins/widget/EditorWidget/src/editorwidgetplugin.cpp

@@ -38,7 +38,7 @@ PLUGININFO_FUNC EditorWidgetPluginInfo()
     descriptions.insert("fr", QString::fromUtf8("une extension pour éditer et afficher du texte."));
 
     return new PluginInfo(PluginInfo::Category::Widget, false, false,
-                          QStringList() << "QScintillaSupport",
+                          QStringList() << "QScintillaWidget",
                           descriptions);
 }
 

src/plugins/support/QScintillaSupport/CMakeLists.txt → src/plugins/widget/QScintillaWidget/CMakeLists.txt

@@ -1,12 +1,12 @@
-project(QScintillaSupportPlugin)
+project(QScintillaWidgetPlugin)
 
 # Add the plugin
 
-add_plugin(QScintillaSupport
+add_plugin(QScintillaWidget
     SOURCES
         ../../plugininfo.cpp
 
-        src/qscintillasupportplugin.cpp
+        src/qscintillawidgetplugin.cpp
         src/qscintillawidget.cpp
     PLUGINS
         Core

src/plugins/support/QScintillaSupport/src/qscintillawidget.cpp → src/plugins/widget/QScintillaWidget/src/qscintillawidget.cpp

@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 namespace OpenCOR {
-namespace QScintillaSupport {
+namespace QScintillaWidget {
 
 //==============================================================================
 
@@ -836,7 +836,7 @@ void QScintillaWidget::updateCursorPosition(int pLine, int pColumn)
 
 //==============================================================================
 
-} // namespace QScintillaSupport
+} // namespace QScintillaWidget
 } // namespace OpenCOR
 
 //==============================================================================

src/plugins/support/QScintillaSupport/src/qscintillawidget.h → src/plugins/widget/QScintillaWidget/src/qscintillawidget.h

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "qscintillasupportglobal.h"
+#include "qscintillawidgetglobal.h"
 
 //==============================================================================
 
@@ -51,11 +51,11 @@ class QWheelEvent;
 //==============================================================================
 
 namespace OpenCOR {
-namespace QScintillaSupport {
+namespace QScintillaWidget {
 
 //==============================================================================
 
-class QSCINTILLASUPPORT_EXPORT QScintillaWidget : public QsciScintilla
+class QSCINTILLAWIDGET_EXPORT QScintillaWidget : public QsciScintilla
 {
     Q_OBJECT
 
@@ -161,7 +161,7 @@ private slots:
 
 //==============================================================================
 
-} // namespace QScintillaSupport
+} // namespace QScintillaWidget
 } // namespace OpenCOR
 
 //==============================================================================

src/plugins/support/QScintillaSupport/src/qscintillasupportglobal.h → src/plugins/widget/QScintillaWidget/src/qscintillawidgetglobal.h

@@ -18,17 +18,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// QScintilla support global
+// QScintilla widget global
 //==============================================================================
 
 #pragma once
 
 //==============================================================================
 
-#ifdef QScintillaSupport_PLUGIN
-    #define QSCINTILLASUPPORT_EXPORT Q_DECL_EXPORT
+#ifdef QScintillaWidget_PLUGIN
+    #define QSCINTILLAWIDGET_EXPORT Q_DECL_EXPORT
 #else
-    #define QSCINTILLASUPPORT_EXPORT Q_DECL_IMPORT
+    #define QSCINTILLAWIDGET_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

src/plugins/support/QScintillaSupport/src/qscintillasupportplugin.cpp → src/plugins/widget/QScintillaWidget/src/qscintillawidgetplugin.cpp

@@ -18,33 +18,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// QScintilla support plugin
+// QScintilla widget plugin
 //==============================================================================
 
-#include "qscintillasupportplugin.h"
+#include "qscintillawidgetplugin.h"
 
 //==============================================================================
 
 namespace OpenCOR {
-namespace QScintillaSupport {
+namespace QScintillaWidget {
 
 //==============================================================================
 
-PLUGININFO_FUNC QScintillaSupportPluginInfo()
+PLUGININFO_FUNC QScintillaWidgetPluginInfo()
 {
     Descriptions descriptions;
 
     descriptions.insert("en", QString::fromUtf8("a plugin to support <a href=\"http://www.riverbankcomputing.co.uk/software/qscintilla/\">QScintilla</a>."));
     descriptions.insert("fr", QString::fromUtf8("une extension pour supporter <a href=\"http://www.riverbankcomputing.co.uk/software/qscintilla/\">QScintilla</a>."));
 
-    return new PluginInfo(PluginInfo::Category::Support, false, false,
+    return new PluginInfo(PluginInfo::Category::Widget, false, false,
                           QStringList() << "Core" << "QScintilla",
                           descriptions);
 }
 
 //==============================================================================
 
-} // namespace QScintillaSupport
+} // namespace QScintillaWidget
 } // namespace OpenCOR
 
 //==============================================================================

src/plugins/support/QScintillaSupport/src/qscintillasupportplugin.h → src/plugins/widget/QScintillaWidget/src/qscintillawidgetplugin.h

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// QScintilla support plugin
+// QScintilla widget plugin
 //==============================================================================
 
 #pragma once
@@ -30,24 +30,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 namespace OpenCOR {
-namespace QScintillaSupport {
+namespace QScintillaWidget {
 
 //==============================================================================
 
-PLUGININFO_FUNC QScintillaSupportPluginInfo();
+PLUGININFO_FUNC QScintillaWidgetPluginInfo();
 
 //==============================================================================
 
-class QScintillaSupportPlugin : public QObject
+class QScintillaWidgetPlugin : public QObject
 {
     Q_OBJECT
 
-    Q_PLUGIN_METADATA(IID "OpenCOR.QScintillaSupportPlugin" FILE "qscintillasupportplugin.json")
+    Q_PLUGIN_METADATA(IID "OpenCOR.QScintillaWidgetPlugin" FILE "qscintillawidgetplugin.json")
 };
 
 //==============================================================================
 
-} // namespace QScintillaSupport
+} // namespace QScintillaWidget
 } // namespace OpenCOR
 
 //==============================================================================

src/plugins/widget/QScintillaWidget/src/qscintillawidgetplugin.json

@@ -0,0 +1,3 @@
+{
+    "Keys": [ "QScintillaWidgetPlugin" ]
+}