Merge origin/master

OpenModelica · Feb 7, 2018 · bfe77c2 · bfe77c2
2 parents e2bb274 + a45068d
commit bfe77c2
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -5964,7 +5964,7 @@ void ModelWidgetContainer::loadPreviousViewType(ModelWidget *pModelWidget)
         pModelWidget->getDiagramViewToolButton()->setChecked(true);
         break;
     }
-  } else if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::CompositeModel) {
+  } else if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Text) {
     pModelWidget->getTextViewToolButton()->setChecked(true);
   }
 }
@@ -6084,18 +6084,6 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
     // update the Undo/Redo actions
     pModelWidget->updateUndoRedoActions();
   }
-  /* enable/disable the find/replace and goto line actions depending on the text editor visibility. */
-  if (pModelWidget && pModelWidget->getEditor() && pModelWidget->getEditor()->isVisible()) {
-    if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica) {
-      enabled = true;
-    } else if (pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Text) {
-      enabled = true;
-    } else {
-      enabled = false;
-    }
-  } else {
-    enabled = false;
-  }
 }
 
 /*!