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

File > New: Bring existing dialog to foreground

Browse Source 
Task-number: QTCREATORBUG-16932
Change-Id: I1a90ab01825b5cd2f439395cbdf4400075943dc4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2016-09-26 16:39:49 +02:00
parent 79be19a8a0
commit 94a58b4653
10 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/iwizardfactory.cpp
View File

@@ -153,6 +153,7 @@ QList<IWizardFactory::FactoryCreator> s_factoryCreators;
QAction *s_inspectWizardAction = 0;
bool s_areFactoriesLoaded = false;
bool s_isWizardRunning = false;
QWidget *s_currentWizard = nullptr;
// NewItemDialog reopening data:
class NewItemDialogData
@@ -271,11 +272,12 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, I
QTC_ASSERT(!s_isWizardRunning, return 0);
s_isWizardRunning = true;
ICore::validateNewItemDialogIsRunning();
ICore::updateNewItemDialogState();
Utils::Wizard *wizard = runWizardImpl(path, parent, platform, variables);
if (wizard) {
s_currentWizard = wizard;
// Connect while wizard exists:
connect(m_action, &QAction::triggered, wizard, [wizard]() { ICore::raiseWindow(wizard); });
connect(s_inspectWizardAction, &QAction::triggered,
@@ -287,8 +289,9 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, I
});
connect(wizard, &QObject::destroyed, this, [wizard]() {
s_isWizardRunning = false;
s_currentWizard = nullptr;
s_inspectWizardAction->setEnabled(false);
ICore::validateNewItemDialogIsRunning();
ICore::updateNewItemDialogState();
s_reopenData.reopen();
});
s_inspectWizardAction->setEnabled(true);
@@ -296,7 +299,7 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, I
Core::ICore::registerWindow(wizard, Core::Context("Core.NewWizard"));
} else {
s_isWizardRunning = false;
ICore::validateNewItemDialogIsRunning();
ICore::updateNewItemDialogState();
s_reopenData.reopen();
}
return wizard;
@@ -357,6 +360,11 @@ bool IWizardFactory::isWizardRunning()
return s_isWizardRunning;
}
QWidget *IWizardFactory::currentWizard()
{
return s_currentWizard;
}
void IWizardFactory::requestNewItemDialog(const QString &title,
const QList<IWizardFactory *> &factories,
const QString &defaultLocation,
@@ -413,7 +421,7 @@ void IWizardFactory::initialize()
ActionManager::registerAction(resetAction, "Wizard.Factory.Reset");
connect(resetAction, &QAction::triggered, &IWizardFactory::clearWizardFactories);
connect(ICore::instance(), &ICore::newItemDialogRunningChanged, resetAction,
connect(ICore::instance(), &ICore::newItemDialogStateChanged, resetAction,
[resetAction]() { resetAction->setEnabled(!ICore::isNewItemDialogRunning()); });
s_inspectWizardAction = new QAction(tr("Inspect Wizard State"), ActionManager::instance());