Skip to content

Commit 08c9f97

Browse files
committed
Clean up.
Removed Qt::WindowTitleHint flag because it disables the dialog close button in Qt5. Deleted unused resources.
1 parent 4e15aa8 commit 08c9f97

24 files changed

+31
-97
lines changed

OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ ExpandableConnectorTreeView::ExpandableConnectorTreeView(CreateConnectionDialog
11701170
* \param pParent
11711171
*/
11721172
CreateConnectionDialog::CreateConnectionDialog(GraphicsView *pGraphicsView, LineAnnotation *pConnectionLineAnnotation, QWidget *pParent)
1173-
: QDialog(pParent, Qt::WindowTitleHint), mpGraphicsView(pGraphicsView), mpConnectionLineAnnotation(pConnectionLineAnnotation)
1173+
: QDialog(pParent), mpGraphicsView(pGraphicsView), mpConnectionLineAnnotation(pConnectionLineAnnotation)
11741174
{
11751175
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::createConnection));
11761176
setAttribute(Qt::WA_DeleteOnClose);

OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "Commands.h"
4242

4343
ShapePropertiesDialog::ShapePropertiesDialog(ShapeAnnotation *pShapeAnnotation, MainWindow *pMainWindow)
44-
: QDialog(pMainWindow, Qt::WindowTitleHint)
44+
: QDialog(pMainWindow)
4545
{
4646
mpShapeAnnotation = pShapeAnnotation;
4747
mOldAnnotation = "";

OMEdit/OMEditGUI/Component/ComponentProperties.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ QVBoxLayout *ParametersScrollArea::getLayout()
528528
* \param pMainWindow - pointer to MainWindow
529529
*/
530530
ComponentParameters::ComponentParameters(Component *pComponent, MainWindow *pMainWindow)
531-
: QDialog(pMainWindow, Qt::WindowTitleHint)
531+
: QDialog(pMainWindow)
532532
{
533533
QString className = pComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure();
534534
setWindowTitle(tr("%1 - %2 - %3 in %4").arg(Helper::applicationName).arg(tr("Component Parameters")).arg(pComponent->getName())
@@ -1117,7 +1117,7 @@ void ComponentParameters::updateComponentParameters()
11171117
* \param pMainWindow
11181118
*/
11191119
ComponentAttributes::ComponentAttributes(Component *pComponent, MainWindow *pMainWindow)
1120-
: QDialog(pMainWindow, Qt::WindowTitleHint)
1120+
: QDialog(pMainWindow)
11211121
{
11221122
QString className = pComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure();
11231123
setWindowTitle(tr("%1 - %2 - %3 in %4").arg(Helper::applicationName).arg(tr("Component Attributes")).arg(pComponent->getName())
@@ -1354,7 +1354,7 @@ void ComponentAttributes::updateComponentAttributes()
13541354
* \param pMainWindow - pointer to MainWindow
13551355
*/
13561356
MetaModelSubModelAttributes::MetaModelSubModelAttributes(Component *pComponent, MainWindow *pMainWindow)
1357-
: QDialog(pMainWindow, Qt::WindowTitleHint)
1357+
: QDialog(pMainWindow)
13581358
{
13591359
setWindowTitle(QString(Helper::applicationName).append(" - ").append(tr("SubModel Attributes")));
13601360
setAttribute(Qt::WA_DeleteOnClose);
@@ -1483,7 +1483,7 @@ void MetaModelSubModelAttributes::updateSubModelParameters()
14831483
*/
14841484
MetaModelConnectionAttributes::MetaModelConnectionAttributes(GraphicsView *pGraphicsView, LineAnnotation *pConnectionLineAnnotation,
14851485
MainWindow *pMainWindow, bool edit)
1486-
: QDialog(pMainWindow, Qt::WindowTitleHint), mpGraphicsView(pGraphicsView), mpConnectionLineAnnotation(pConnectionLineAnnotation),
1486+
: QDialog(pMainWindow), mpGraphicsView(pGraphicsView), mpConnectionLineAnnotation(pConnectionLineAnnotation),
14871487
mpMainWindow(pMainWindow), mEdit(edit)
14881488
{
14891489
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::connectionAttributes));

OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* \brief CrashReportDialog::CrashReportDialog
4646
*/
4747
CrashReportDialog::CrashReportDialog()
48-
: QDialog(0, Qt::WindowTitleHint)
48+
: QDialog(0)
4949
{
5050
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::crashReport));
5151
setAttribute(Qt::WA_DeleteOnClose);

OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
\param pDebuggerMainWindow - pointer to DebuggerMainWindow
4545
*/
4646
AttachToProcessDialog::AttachToProcessDialog(DebuggerMainWindow *pDebuggerMainWindow)
47-
: QDialog(pDebuggerMainWindow, Qt::WindowTitleHint)
47+
: QDialog(pDebuggerMainWindow)
4848
{
4949
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::attachToRunningProcess));
5050
setAttribute(Qt::WA_DeleteOnClose);

OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
\param pBreakpointsTreeModel - pointer to BreakpointsTreeModel
4747
*/
4848
BreakpointDialog::BreakpointDialog(BreakpointTreeItem *pBreakpointTreeItem, BreakpointsTreeModel *pBreakpointsTreeModel)
49-
: QDialog(pBreakpointsTreeModel->getBreakpointsTreeView(), Qt::WindowTitleHint)
49+
: QDialog(pBreakpointsTreeModel->getBreakpointsTreeView())
5050
{
5151
setAttribute(Qt::WA_DeleteOnClose);
5252
setWindowTitle(QString(Helper::applicationName).append(" - ").append(tr("%1 Breakpoint").arg(pBreakpointTreeItem ? "Edit" : "Add")));

OMEdit/OMEditGUI/Debugger/DebuggerMainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ void DebuggerConfigurationPage::resetDebugConfiguration()
414414
\param pDebuggerMainWindow - pointer to DebuggerMainWindow
415415
*/
416416
DebuggerConfigurationsDialog::DebuggerConfigurationsDialog(DebuggerMainWindow *pDebuggerMainWindow)
417-
: QDialog(pDebuggerMainWindow, Qt::WindowTitleHint)
417+
: QDialog(pDebuggerMainWindow)
418418
{
419419
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::debugConfigurations));
420420
setAttribute(Qt::WA_DeleteOnClose);

OMEdit/OMEditGUI/Editors/BaseEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ void FindReplaceWidget::textToFindChanged()
15101510
* An interface to goto a specific line in editor.
15111511
*/
15121512
GotoLineDialog::GotoLineDialog(BaseEditor *pBaseEditor)
1513-
: QDialog(pBaseEditor, Qt::WindowTitleHint)
1513+
: QDialog(pBaseEditor)
15141514
{
15151515
setWindowTitle(QString(Helper::applicationName).append(" - Go to Line"));
15161516
setWindowIcon(QIcon(":/Resources/icons/modeling.png"));

OMEdit/OMEditGUI/FMI/ImportFMUDialog.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@
4646
\param pParent - pointer to MainWindow
4747
*/
4848
ImportFMUDialog::ImportFMUDialog(MainWindow *pParent)
49-
: QDialog(pParent, Qt::WindowTitleHint)
49+
: QDialog(pParent)
5050
{
5151
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::importFMU));
5252
setAttribute(Qt::WA_DeleteOnClose);
5353
setMinimumWidth(550);
54-
setModal(true);
5554
// set parent widget
5655
mpMainWindow = pParent;
5756
// set import heading

OMEdit/OMEditGUI/MainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@ void MainWindow::showOpenModelicaCommandPrompt()
15881588
void MainWindow::importModelFMU()
15891589
{
15901590
ImportFMUDialog *pImportFMUDialog = new ImportFMUDialog(this);
1591-
pImportFMUDialog->show();
1591+
pImportFMUDialog->exec();
15921592
}
15931593

15941594
//! Exports the current model to OMNotebook.

0 commit comments

Comments
 (0)