feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

New Dialog: Do not show wizards on top of everything else

Browse Source 
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 <daniel.teske@digia.com>
This commit is contained in:
Eike Ziller
2014-07-16 10:42:40 +02:00
parent f6bfd75320
commit e470038c59
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/basefilewizardfactory.cpp
View File

@@ -122,7 +122,7 @@ WizardEventLoop::WizardResult WizardEventLoop::execWizardPage(QWizard &wizard)
connect(&wizard, SIGNAL(currentIdChanged(int)), eventLoop, SLOT(pageChanged(int))); connect(&wizard, SIGNAL(currentIdChanged(int)), eventLoop, SLOT(pageChanged(int)));
connect(&wizard, SIGNAL(accepted()), eventLoop, SLOT(accepted())); connect(&wizard, SIGNAL(accepted()), eventLoop, SLOT(accepted()));
connect(&wizard, SIGNAL(rejected()), eventLoop, SLOT(rejected())); connect(&wizard, SIGNAL(rejected()), eventLoop, SLOT(rejected()));
wizard.setWindowFlags(wizard.windowFlags() | Qt::WindowStaysOnTopHint); wizard.setWindowFlags(wizard.windowFlags());
wizard.show(); wizard.show();
} }
const WizardResult result = eventLoop->execWizardPageI(); const WizardResult result = eventLoop->execWizardPageI();

2
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -195,7 +195,7 @@ NewDialog::NewDialog(QWidget *parent) :
m_okButton(0) m_okButton(0)
{ {
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags());
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
m_ui->setupUi(this); m_ui->setupUi(this);
QPalette p = m_ui->frame->palette(); QPalette p = m_ui->frame->palette();