Show the parameters in declaration order (#10253)

Fixes #10167
OpenModelica · Feb 24, 2023 · 001d260 · 001d260
1 parent 9db0fd5
commit 001d260
Show file tree

Hide file tree

Showing 5 changed files with 1,001 additions and 603 deletions.
diff --git a/OMEdit/OMEditLIB/Element/Element.cpp b/OMEdit/OMEditLIB/Element/Element.cpp
@@ -3854,12 +3854,23 @@ void Element::showParameters()
     }
     pMainWindow->getStatusBar()->showMessage(tr("Opening %1 %2 parameters window").arg(mpLibraryTreeItem->getNameStructure()).arg(getName()));
   }
-  pMainWindow->getProgressBar()->setRange(0, 0);
-  pMainWindow->showProgressBar();
-  ElementParameters *pElementParameters = new ElementParameters(this, pMainWindow);
-  pMainWindow->hideProgressBar();
-  pMainWindow->getStatusBar()->clearMessage();
-  pElementParameters->exec();
+
+  if (MainWindow::instance()->isNewApi()) {
+    pMainWindow->getProgressBar()->setRange(0, 0);
+    pMainWindow->showProgressBar();
+    ElementParameters *pElementParameters = new ElementParameters(mpModelComponent, mpGraphicsView, isInheritedElement(), false, pMainWindow);
+    pMainWindow->hideProgressBar();
+    pMainWindow->getStatusBar()->clearMessage();
+    pElementParameters->exec();
+    pElementParameters->deleteLater();
+  } else {
+    pMainWindow->getProgressBar()->setRange(0, 0);
+    pMainWindow->showProgressBar();
+    ElementParametersOld *pElementParametersOld = new ElementParametersOld(this, pMainWindow);
+    pMainWindow->hideProgressBar();
+    pMainWindow->getStatusBar()->clearMessage();
+    pElementParametersOld->exec();
+  }
 }
 
 /*!