Merge 56cdeb6 into c3f6b6a

opencor · Oct 24, 2018 · 2610e4d · 2610e4d
2 parents c3f6b6a + 56cdeb6
commit 2610e4d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,7 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>General:</strong> unmanage and (re)manage a new file that has been saved (see issue <a href=\"https://github.com/opencor/opencor/issues/1846\">#1846</a>)." },
+                       { "change": "<strong>General:</strong> unmanage and (re)manage a new file that has been saved (see issue <a href=\"https://github.com/opencor/opencor/issues/1846\">#1846</a>). Recognise macOS Mojave (10.14) (see issue <a href=\"https://github.com/opencor/opencor/issues/1851\">#1851</a>)." },
                        { "change": "<strong>Simulation Experiment view:</strong> now have two reset buttons rather than one with a drop-down menu (see issue <a href=\"https://github.com/opencor/opencor/issues/1835\">#1835</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.10.8 (see issue <a href=\"https://github.com/opencor/opencor/issues/1833\">#1833</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.27.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/1838\">#1838</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 3.2.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1847\">#1847</a>)." }
                      ]

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1274,7 +1274,7 @@ void MainWindow::actionAboutTriggered()
 
     aboutMessageBox(tr("About"),
                     "<h1 align=center><strong>"+version()+"</strong></h1>"
-                    "<h3 align=center><em>"+QSysInfo::prettyProductName()+"</em></h3>"
+                    "<h3 align=center><em>"+prettyProductName()+"</em></h3>"
                     "<p align=center><em>"+copyright()+"</em></p>"
                     "<p>"+applicationDescription()+"</p>");
 }

diff --git a/src/misc/cliapplication.cpp b/src/misc/cliapplication.cpp
@@ -184,7 +184,7 @@ void CliApplication::about() const
 
     version();
 
-    std::cout << QSysInfo::prettyProductName().toStdString() << std::endl;
+    std::cout << prettyProductName().toStdString() << std::endl;
     std::cout << copyright().toStdString() << std::endl;
     std::cout << std::endl;
     std::cout << applicationDescription(false).toStdString() << std::endl;

diff --git a/src/misc/cliutils.cpp b/src/misc/cliutils.cpp
@@ -183,13 +183,30 @@ void initApplication(QString *pAppDate)
 
 QString applicationDescription(bool pGuiMode)
 {
+    // Return the application description
+
     QString res = QObject::tr("%1 is a cross-platform modelling environment, which can be used to organise, edit, simulate and analyse <a href=\"http://www.cellml.org/\">CellML</a> files.").arg("<a href=\""+QString(HomePageUrl)+"\">"+qAppName()+"</a>");
 
     return pGuiMode?res:plainString(res);
 }
 
 //==============================================================================
 
+QString prettyProductName()
+{
+    // Return a pretty version of the product name
+    // Note: Qt 5.9.7 LTS doesn't recognise macOS Mojave (10.14), so we need to
+    //       handle that particular case...
+
+    QString res = QSysInfo::prettyProductName();
+
+    return res.compare("macOS 10.14")?
+                res:
+                "macOS Mojave (10.14)";
+}
+
+//==============================================================================
+
 }   // namespace OpenCOR
 
 //==============================================================================

diff --git a/src/misc/cliutils.h b/src/misc/cliutils.h
@@ -78,6 +78,8 @@ void initApplication(QString *pAppDate = nullptr);
 
 QString applicationDescription(bool pGuiMode = true);
 
+QString prettyProductName();
+
 //==============================================================================
 
 }   // namespace OpenCOR

diff --git a/src/plugins/miscellaneous/Core/src/corecliutils.cpp.inl b/src/plugins/miscellaneous/Core/src/corecliutils.cpp.inl
@@ -353,6 +353,8 @@ QString noInternetConnectionAvailableMessage()
 
 QString copyright()
 {
+    // Return our copyright
+
     return QObject::tr("Copyright")+" 2011-"+QString::number(QDate::currentDate().year());
 }