Check for the access annotation

before calling `listFile` and `getIconAnnotation` avoids unnecessary messages from OMC.
Allow opening *.mol files from regular open dialog.

Author: adeas31

OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp

@@ -2145,7 +2145,10 @@ QString LibraryTreeModel::readLibraryTreeItemClassTextFromFile(LibraryTreeItem *
   QString contents = "";
   QFileInfo fileInfo(pLibraryTreeItem->getFileName());
   // if the file is encrypted use listFile
-  if (fileInfo.suffix().compare("moc") == 0) {
+  if ((fileInfo.suffix().compare("moc") == 0)
+      && (pLibraryTreeItem->getAccess() >= LibraryTreeItem::packageText
+          || (pLibraryTreeItem->getAccess() >= LibraryTreeItem::nonPackageText
+              && pLibraryTreeItem->getRestriction() != StringHandler::Package))) {
     contents = MainWindow::instance()->getOMCProxy()->listFile(pLibraryTreeItem->getNameStructure());
   } else { // else read the file contents
     QFile file(pLibraryTreeItem->getFileName());

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -4855,7 +4855,9 @@ void ModelWidget::getModelIconDiagramShapes(StringHandler::ViewType viewType)
   QString annotationString;
   if (viewType == StringHandler::Icon) {
     pGraphicsView = mpIconGraphicsView;
-    annotationString = pOMCProxy->getIconAnnotation(mpLibraryTreeItem->getNameStructure());
+    if (mpLibraryTreeItem->getAccess() >= LibraryTreeItem::icon) {
+      annotationString = pOMCProxy->getIconAnnotation(mpLibraryTreeItem->getNameStructure());
+    }
   } else {
     pGraphicsView = mpDiagramGraphicsView;
     if (mpLibraryTreeItem->getAccess() >= LibraryTreeItem::diagram) {

OMEdit/OMEditGUI/Util/Helper.cpp

@@ -45,7 +45,7 @@ QString Helper::OpenModelicaVersion = "";
 QString Helper::OpenModelicaHome = "";
 QString Helper::OpenModelicaLibrary = "";
 QString Helper::OMCServerName = "OMEdit";
-QString Helper::omFileTypes = "Modelica Files (*.mo)";
+QString Helper::omFileTypes = "All Modelica Files (*.mo *.mol);;Modelica Files (*.mo);;Encrypted Modelica Libraries (*.mol)";
 QString Helper::omEncryptedFileTypes = "Encrypted Modelica Libraries (*.mol)";
 QString Helper::omnotebookFileTypes = "OMNotebook Files (*.onb *.onbz *.nb)";
 QString Helper::ngspiceNetlistFileTypes = "ngspice Netlist Files (*.cir *.sp *.spice)";