Merge branch 'master' of https://github.com/OpenModelica/OMEdit

Conflicts:
	OMEdit/OMEditGUI/MainWindow.cpp

Author: adeas31

OMEdit/OMEditGUI/Editors/TLMEditor.cpp

@@ -32,7 +32,7 @@
 #include "TLMEditor.h"
 
 TLMEditor::TLMEditor(ModelWidget *pModelWidget)
-  : BaseEditor(pModelWidget)
+  : BaseEditor(pModelWidget), mTextChanged(false)
 {
   connect(this, SIGNAL(focusOut()), mpModelWidget, SLOT(TLMEditorTextChanged()));
 }
@@ -54,20 +54,41 @@ void TLMEditor::showContextMenu(QPoint point)
 void TLMEditor::contentsHasChanged(int position, int charsRemoved, int charsAdded)
 {
   Q_UNUSED(position);
-  if (mpModelWidget->isVisible())
-  {
-    if (charsRemoved == 0 && charsAdded == 0)
+  if (mpModelWidget->isVisible()) {
+    if (charsRemoved == 0 && charsAdded == 0) {
       return;
-    mpModelWidget->setModelModified();
+    }
+    /* if user is changing the text. */
+    if (!mForceSetPlainText) {
+      mpModelWidget->setModelModified();
+      mTextChanged = true;
+    }
   }
 }
 
-bool TLMEditor::TLMEditorFocusChanged()
+bool TLMEditor::validateMetaModelText()
 {
-  emit focusOut();
+   if (mTextChanged) {
+      emit focusOut();
+   }
   return true;
 }
 
+/*!
+ * \brief TLMEditor::setPlainText
+ * Reimplementation of QPlainTextEdit::setPlainText method.
+ * Makes sure we dont update if the passed text is same.
+ * \param text the string to set.
+ */
+void TLMEditor::setPlainText(const QString &text)
+{
+  if (text != mpPlainTextEdit->toPlainText()) {
+    mForceSetPlainText = true;
+    mpPlainTextEdit->setPlainText(text);
+    mForceSetPlainText = false;
+  }
+}
+
 //! @class TLMHighlighter
 //! @brief A syntax highlighter for TLMEditor.
 

OMEdit/OMEditGUI/Editors/TLMEditor.h

@@ -47,7 +47,11 @@ class TLMEditor : public BaseEditor
   Q_OBJECT
 public:
   TLMEditor(ModelWidget *pModelWidget);
-  bool TLMEditorFocusChanged();
+  bool validateMetaModelText();
+  void setPlainText(const QString &text);
+private:
+  bool mForceSetPlainText;
+  bool mTextChanged;
 signals:
   bool focusOut();
 private slots:

OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp

@@ -1951,7 +1951,7 @@ void LibraryTreeWidget::openTLMFile(QFileInfo fileInfo, bool showProgress)
     }
   }
   // create a LibraryTreeNode for new loaded TLM file.
-  LibraryTreeNode *pLibraryTreeNode = addLibraryTreeNode(LibraryTreeNode::TLM, fileInfo.completeBaseName(), false);
+  LibraryTreeNode *pLibraryTreeNode = addLibraryTreeNode(LibraryTreeNode::TLM, fileInfo.completeBaseName(), true);
   if (pLibraryTreeNode) {
     pLibraryTreeNode->setSaveContentsType(LibraryTreeNode::SaveInOneFile);
     pLibraryTreeNode->setIsSaved(true);

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -2237,15 +2237,17 @@ ModelWidget::ModelWidget(LibraryTreeNode* pLibraryTreeNode, ModelWidgetContainer
                                              "  <!-- Parameters for the simulation -->\n"
                                              "  <SimulationParams StartTime=\"0\" StopTime=\"1\" />\n"
                                              "</Model>").arg(mpLibraryTreeNode->getName());
-      mpEditor->getPlainTextEdit()->setPlainText(defaultMetaModelText);
+      TLMEditor *pTLMEditor = dynamic_cast<TLMEditor*>(mpEditor);
+      pTLMEditor->setPlainText(defaultMetaModelText);
     } else {
       QFile file(mpLibraryTreeNode->getFileName());
       if (!file.open(QIODevice::ReadOnly)) {
         QMessageBox::critical(this, QString(Helper::applicationName).append(" - ").append(Helper::error),
                               GUIMessages::getMessage(GUIMessages::ERROR_OPENING_FILE).arg(mpLibraryTreeNode->getFileName())
                               .arg(file.errorString()), Helper::ok);
       } else {
-        mpEditor->getPlainTextEdit()->setPlainText(QString(file.readAll()));
+        TLMEditor *pTLMEditor = dynamic_cast<TLMEditor*>(mpEditor);
+        pTLMEditor->setPlainText(QString(file.readAll()));
         file.close();
       }
     }
@@ -2846,7 +2848,7 @@ void ModelWidget::showDiagramView(bool checked)
       return;
     }
     TLMEditor *pTLMEditor = dynamic_cast<TLMEditor*>(mpEditor);
-    if (pTLMEditor && !pTLMEditor->TLMEditorFocusChanged()) {
+    if (pTLMEditor && !pTLMEditor->validateMetaModelText()) {
       mpTextViewToolButton->setChecked(true);
       return;
     }