Merge 952ba71 into cc0b963

opencor · Jun 13, 2019 · f230a53 · f230a53
2 parents cc0b963 + 952ba71
commit f230a53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.cpp b/src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.cpp
@@ -266,9 +266,19 @@ void CellmlEditingViewWidget::itemRequested(EditorWidget::EditorListItem *pItem)
     } else {
         // The given item is located in a different file, so open that file, and
         // ask set our cursor position to its line/column
+        // Note: we retrieve the current view plugin's name before opening the
+        //       file to prevent any potential issue. I don't think it could
+        //       happen, but say that we need to open a CellML file. This means
+        //       that the CellML Text view will, by default, be selected, and it
+        //       might be selected before we query the current view plugin's
+        //       name, which means that the wrong view might be selected in the
+        //       end, if we were not originally using the CellML Text view (e.g.
+        //       if we were using the Raw CellML view)...
+
+        QString currentViewPluginName = Core::currentViewPlugin()->name();
 
         QDesktopServices::openUrl("opencor://openFile/"+pItem->fileName());
-        QDesktopServices::openUrl("opencor://Core.selectView/"+Core::currentViewPlugin()->name());
+        QDesktopServices::openUrl("opencor://Core.selectView/"+currentViewPluginName);
         QDesktopServices::openUrl(QString("opencor://EditingView.setCursorPosition/%1|%2").arg(pItem->line())
                                                                                           .arg(pItem->column()));
     }

diff --git a/src/plugins/editing/RawCellMLView/i18n/RawCellMLView_fr.ts b/src/plugins/editing/RawCellMLView/i18n/RawCellMLView_fr.ts
@@ -10,14 +10,6 @@
 </context>
 <context>
     <name>OpenCOR::RawCellMLView::RawCellmlViewWidget</name>
-    <message>
-        <source>The issue reported below may be related to this CellML file or to one of its (in)directly imported CellML files.</source>
-        <translation>Le problème mentionné ci-dessous peut être en rapport avec ce fichier CellML ou avec un de ses fichiers CellML qui a été (in)directement importé.</translation>
-    </message>
-    <message>
-        <source>The issues reported below may be related to this CellML file and/or to one or several of its (in)directly imported CellML files.</source>
-        <translation>Les problèmes mentionnés ci-dessous peuvent être en rapport avec ce fichier CellML et/ou avec un ou plusieurs de ses fichiers CellML qui ont été (in)directement importés.</translation>
-    </message>
     <message>
         <source>the &lt;a href=&quot;https://github.com/cellmlapi/cellml-api/&quot;&gt;CellML validation service&lt;/a&gt; is known to have limitations and may therefore incorrectly (in)validate certain CellML files.</source>
         <translation>le &lt;a href=&quot;https://github.com/cellmlapi/cellml-api/&quot;&gt;service de validation CellML&lt;/a&gt; est connu pour avoir des problèmes et peut donc incorrectement (in)valider certains fichiers CellML.</translation>