Make the class name relative if possible

Belonging to [master]: - #141
OpenModelica · Apr 11, 2019 · e5a0c3a · e5a0c3a
1 parent 2e3b0ae
commit e5a0c3a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp b/OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp
@@ -1822,7 +1822,8 @@ bool PlainTextEdit::canInsertFromMimeData(const QMimeData *source) const
 {
   // check mimeData to see if we can insert from it
   if (source->hasFormat(Helper::modelicaComponentFormat)) {
-    return mpBaseEditor->getModelWidget() && !mpBaseEditor->getModelWidget()->getLibraryTreeItem()->isSystemLibrary();
+    return mpBaseEditor->getModelWidget() && !mpBaseEditor->getModelWidget()->getLibraryTreeItem()->isSystemLibrary()
+        && mpBaseEditor->getModelWidget()->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica;
   } else {
     return QPlainTextEdit::canInsertFromMimeData(source);
   }
@@ -1840,6 +1841,9 @@ void PlainTextEdit::insertFromMimeData(const QMimeData *source)
     QDataStream dataStream(&itemData, QIODevice::ReadOnly);
     QString className;
     dataStream >> className;
+    if (mpBaseEditor->getModelWidget()) {
+      className = StringHandler::makeClassNameRelative(className, mpBaseEditor->getModelWidget()->getLibraryTreeItem()->getNameStructure());
+    }
     textCursor().insertFragment(QTextDocumentFragment::fromPlainText(className));
     ensureCursorVisible();
     setFocus(Qt::ActiveWindowFocusReason);