From e470038c592c4a1e7656a081cab8089cca9ac906 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 16 Jul 2014 10:42:40 +0200 Subject: [PATCH] New Dialog: Do not show wizards on top of everything else Just live with the fact that there is not even a way to keep it on top of the main window or something like that (without also making it a tool window). Also, even though it would be nice to have the "New" menu item bring the current wizard to the top, if any, that requires heavy refactoring in the wizard side. Change-Id: I93d345964b085adeaa314d93acc612f8fb2e7e68 Task-number: QTCREATORBUG-12675 Reviewed-by: Daniel Teske --- src/plugins/coreplugin/basefilewizardfactory.cpp | 2 +- src/plugins/coreplugin/dialogs/newdialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp index 08e3bb2e817..c4c5bc1cae8 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.cpp +++ b/src/plugins/coreplugin/basefilewizardfactory.cpp @@ -122,7 +122,7 @@ WizardEventLoop::WizardResult WizardEventLoop::execWizardPage(QWizard &wizard) connect(&wizard, SIGNAL(currentIdChanged(int)), eventLoop, SLOT(pageChanged(int))); connect(&wizard, SIGNAL(accepted()), eventLoop, SLOT(accepted())); connect(&wizard, SIGNAL(rejected()), eventLoop, SLOT(rejected())); - wizard.setWindowFlags(wizard.windowFlags() | Qt::WindowStaysOnTopHint); + wizard.setWindowFlags(wizard.windowFlags()); wizard.show(); } const WizardResult result = eventLoop->execWizardPageI(); diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 32704ec31d1..95d0a134f53 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -195,7 +195,7 @@ NewDialog::NewDialog(QWidget *parent) : m_okButton(0) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); + setWindowFlags(windowFlags()); setAttribute(Qt::WA_DeleteOnClose); m_ui->setupUi(this); QPalette p = m_ui->frame->palette();