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

Robert Braun · Robert Braun · commit 53615d36a80e · 2016-12-21T13:00:29.000+01:00
diff --git a/OMEdit/OMEditGUI/Component/CornerItem.cpp b/OMEdit/OMEditGUI/Component/CornerItem.cpp
@@ -347,7 +347,7 @@ OriginItem::OriginItem(Component *pComponent)
   mInheritedActivePen = QPen(Qt::darkRed, 2);
   mInheritedActivePen.setCosmetic(true);
   mPassivePen = QPen(Qt::transparent);
-  mRectangle = QRectF (-5, -5, 10, 10);
+  mRectangle = QRectF (-2, -2, 2, 2);
   mPen = mPassivePen;
 }
 
diff --git a/OMEdit/OMEditGUI/Modeling/DocumentationWidget.h b/OMEdit/OMEditGUI/Modeling/DocumentationWidget.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 #include <QToolButton>
-#include <QTabbar>
+#include <QTabBar>
 #include <QFile>
 #include <QWebView>
 #include <QToolBar>
diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
@@ -807,8 +807,12 @@ void DuplicateClassDialog::duplicateClass()
     if (mSaveAs) {
       MainWindow::instance()->getLibraryWidget()->saveLibraryTreeItem(pLibraryTreeItem);
     }
+    accept();
+  } else {
+    QMessageBox::critical(this, QString("%1 - %2").arg(Helper::applicationName, Helper::error), tr("Unable to create class <b>%1</b>. %2")
+                          .arg(mpNameTextBox->text(), GUIMessages::getMessage(GUIMessages::NO_OPENMODELICA_KEYWORDS)), Helper::ok);
   }
-  accept();
+
 }
 
 /*!

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ OriginItem::OriginItem(Component *pComponent)`
`347`	`347`	`mInheritedActivePen = QPen(Qt::darkRed, 2);`
`348`	`348`	`mInheritedActivePen.setCosmetic(true);`
`349`	`349`	`mPassivePen = QPen(Qt::transparent);`
`350`		`- mRectangle = QRectF (-5, -5, 10, 10);`
	`350`	`+ mRectangle = QRectF (-2, -2, 2, 2);`
`351`	`351`	`mPen = mPassivePen;`
`352`	`352`	`}`
`353`	`353`
Original file line number	Diff line number	Diff line change
`@@ -807,8 +807,12 @@ void DuplicateClassDialog::duplicateClass()`
`807`	`807`	`if (mSaveAs) {`
`808`	`808`	`MainWindow::instance()->getLibraryWidget()->saveLibraryTreeItem(pLibraryTreeItem);`
`809`	`809`	`}`
	`810`	`+ accept();`
	`811`	`+ } else {`
	`812`	`+ QMessageBox::critical(this, QString("%1 - %2").arg(Helper::applicationName, Helper::error), tr("Unable to create class <b>%1</b>. %2")`
	`813`	`+ .arg(mpNameTextBox->text(), GUIMessages::getMessage(GUIMessages::NO_OPENMODELICA_KEYWORDS)), Helper::ok);`
`810`	`814`	`}`
`811`		`- accept();`
	`815`	`+`
`812`	`816`	`}`
`813`	`817`
`814`	`818`	`/*!`