Fixed flickering of duplicate dialog

OpenModelica · May 14, 2018 · 09fcdbc · 09fcdbc
1 parent afcb605
commit 09fcdbc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
@@ -748,16 +748,6 @@ DuplicateClassDialog::DuplicateClassDialog(bool saveAs, LibraryTreeItem *pLibrar
   connect(mpPathBrowseButton, SIGNAL(clicked()), SLOT(browsePath()));
   // save contents in one file
   mpSaveContentsInOneFileCheckBox = new QCheckBox(Helper::saveContentsInOneFile);
-  if (mpLibraryTreeItem->getRestriction() == StringHandler::Package) {
-    mpSaveContentsInOneFileCheckBox->setVisible(true);
-    if (mpLibraryTreeItem->getSaveContentsType() == LibraryTreeItem::SaveInOneFile) {
-      mpSaveContentsInOneFileCheckBox->setChecked(true);
-    } else {
-      mpSaveContentsInOneFileCheckBox->setChecked(false);
-    }
-  } else {
-    mpSaveContentsInOneFileCheckBox->setVisible(false);
-  }
   // Create the buttons
   mpOkButton = new QPushButton(Helper::ok);
   mpOkButton->setAutoDefault(true);
@@ -798,6 +788,26 @@ void DuplicateClassDialog::setSaveContentsTypeAsFolderStructure(LibraryTreeItem
   }
 }
 
+/*!
+ * \brief DuplicateClassDialog::exec
+ * Reimplementation of QDialog::exec
+ * \return
+ */
+int DuplicateClassDialog::exec()
+{
+  if (mpLibraryTreeItem->getRestriction() == StringHandler::Package) {
+    mpSaveContentsInOneFileCheckBox->setVisible(true);
+    if (mpLibraryTreeItem->getSaveContentsType() == LibraryTreeItem::SaveInOneFile) {
+      mpSaveContentsInOneFileCheckBox->setChecked(true);
+    } else {
+      mpSaveContentsInOneFileCheckBox->setChecked(false);
+    }
+  } else {
+    mpSaveContentsInOneFileCheckBox->setVisible(false);
+  }
+  return QDialog::exec();
+}
+
 void DuplicateClassDialog::browsePath()
 {
   LibraryBrowseDialog *pLibraryBrowseDialog = new LibraryBrowseDialog(tr("Select Path"), mpPathTextBox, MainWindow::instance()->getLibraryWidget());

diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h
@@ -172,6 +172,7 @@ class DuplicateClassDialog : public QDialog
 
   void setSaveContentsTypeAsFolderStructure(LibraryTreeItem *pLibraryTreeItem);
 public slots:
+  int exec();
   void browsePath();
   void duplicateClass();
 };