Merge 369d3e8 into 391bbc7

opencor · Jan 16, 2020 · 8dca975 · 8dca975
2 parents 391bbc7 + 369d3e8
commit 8dca975
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,6 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
+                       { "change": "<strong>General:</strong> can now reload a file using <code>Ctrl</code>+<code>R</code> (see issue <a href=\"https://github.com/opencor/opencor/issues/2286\">#2286</a>)." },
                        { "change": "<strong>Simulation Experiment view:</strong> can now customise the font size of the different bits of text in a graph panel (see issue <a href=\"https://github.com/opencor/opencor/issues/2271\">#2271</a>). Fixed a small GUI glitch on macOS (see issue <a href=\"https://github.com/opencor/opencor/issues/2277\">#2277</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 9.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2269\">#2269</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.1.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2272\">#2272</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.28.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2280\">#2280</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 19.3.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/2281\">#2281</a>)." }
                      ]

diff --git a/src/plugins/editing/CellMLEditingView/src/cellmleditingviewplugin.cpp b/src/plugins/editing/CellMLEditingView/src/cellmleditingviewplugin.cpp
@@ -265,11 +265,11 @@ void CellMLEditingViewPlugin::initializePlugin()
 
     // Create our different actions
 
-    mEditReformatAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::Key_R),
+    mEditReformatAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::ShiftModifier|Qt::Key_R),
                                           Core::mainWindow());
     mEditReformatSeparator = Core::newSeparator(Core::mainWindow());
 
-    mToolsCellmlValidationAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::Key_T),
+    mToolsCellmlValidationAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::ShiftModifier|Qt::Key_V),
                                                    Core::mainWindow());
     mToolsCellmlValidationSeparator = Core::newSeparator(Core::mainWindow());
 

diff --git a/src/plugins/editing/SEDMLEditingView/src/sedmleditingviewplugin.cpp b/src/plugins/editing/SEDMLEditingView/src/sedmleditingviewplugin.cpp
@@ -258,11 +258,11 @@ void SEDMLEditingViewPlugin::initializePlugin()
 {
     // Create our different actions
 
-    mEditReformatAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::Key_R),
+    mEditReformatAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::ShiftModifier|Qt::Key_R),
                                           Core::mainWindow());
     mEditReformatSeparator = Core::newSeparator(Core::mainWindow());
 
-    mToolsSedmlValidationAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::Key_T),
+    mToolsSedmlValidationAction = Core::newAction(QKeySequence(Qt::ControlModifier|Qt::ShiftModifier|Qt::Key_V),
                                                   Core::mainWindow());
     mToolsSedmlValidationSeparator = Core::newSeparator(Core::mainWindow());
 

diff --git a/src/plugins/miscellaneous/Core/src/coreplugin.cpp b/src/plugins/miscellaneous/Core/src/coreplugin.cpp
@@ -396,7 +396,8 @@ void CorePlugin::initializePlugin()
                                       QKeySequence(Qt::ControlModifier|Qt::ShiftModifier|Qt::Key_O),
                                       mainWindow());
 
-    mFileReloadAction = newAction(mainWindow());
+    mFileReloadAction = newAction(QKeySequence(Qt::ControlModifier|Qt::Key_R),
+                                  mainWindow());
 
     mFileDuplicateAction = newAction(QKeySequence(Qt::ControlModifier|Qt::Key_D),
                                      mainWindow());