From 1e4620a655b86cee9d96eb786e3d00eb43916bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 11 May 2009 17:52:15 +0200
Subject: [PATCH] Fixed two dialogs to use the main window as parent
Setting a parent makes sure the dialog is correctly centered and shares
the taskbar entry.
---
src/plugins/cpaster/cpasterplugin.cpp | 2 +-
src/plugins/projectexplorer/applicationrunconfiguration.cpp | 2 +-
.../projectexplorer/customexecutablerunconfiguration.cpp | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index a752a04de3d..6af357ca805 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -204,7 +204,7 @@ void CodepasterPlugin::fetch()
}
m_fetcher = new CustomFetcher(serverUrl());
- QDialog dialog;
+ QDialog dialog(ICore::instance()->mainWindow());
Ui_PasteSelectDialog ui;
ui.setupUi(&dialog);
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
index 755fa998fb8..fa2e806c6b9 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
@@ -89,7 +89,7 @@ QString ApplicationRunConfigurationRunner::displayName() const
return tr("Run");
}
-RunControl* ApplicationRunConfigurationRunner::run(QSharedPointer<RunConfiguration> runConfiguration, const QString &mode)
+RunControl *ApplicationRunConfigurationRunner::run(QSharedPointer<RunConfiguration> runConfiguration, const QString &mode)
{
QSharedPointer<ApplicationRunConfiguration> rc = qSharedPointerCast<ApplicationRunConfiguration>(runConfiguration);
Q_ASSERT(rc);
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index e25718033c7..1953e963550 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -31,12 +31,14 @@
#include "environment.h"
#include "project.h"
+#include <coreplugin/icore.h>
#include <projectexplorer/debugginghelper.h>
#include <QtGui/QCheckBox>
#include <QtGui/QFormLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QLabel>
+#include <QtGui/QMainWindow>
#include <QtGui/QHBoxLayout>
#include <QtGui/QToolButton>
#include <QtGui/QFileDialog>
@@ -190,7 +192,7 @@ QString CustomExecutableRunConfiguration::executable() const
if (!QFileInfo(exec).exists()) {
// Oh the executable doesn't exists, ask the user.
QWidget *confWidget = const_cast<CustomExecutableRunConfiguration *>(this)->configurationWidget();
- QDialog dialog;
+ QDialog dialog(Core::ICore::instance()->mainWindow());
dialog.setLayout(new QVBoxLayout());
dialog.layout()->addWidget(new QLabel(tr("Could not find the executable, please specify one.")));
dialog.layout()->addWidget(confWidget);
--
GitLab