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

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

@@ -186,16 +186,16 @@ Q_DECLARE_METATYPE(WizardFactoryContainer)
using namespace Core;
using namespace Core::Internal;
bool NewDialog::m_isRunning = false;
QWidget *NewDialog::m_currentDialog = nullptr;
NewDialog::NewDialog(QWidget *parent) :
QDialog(parent),
m_ui(new Ui::NewDialog),
m_okButton(0)
{
QTC_CHECK(!m_isRunning);
QTC_CHECK(m_currentDialog == nullptr);
m_isRunning = true;
m_currentDialog = this;
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowFlags(windowFlags());
@@ -339,9 +339,9 @@ Id NewDialog::selectedPlatform() const
return Id::fromSetting(m_ui->comboBox->itemData(index));
}
bool NewDialog::isRunning()
QWidget *NewDialog::currentDialog()
{
return m_isRunning;
return m_currentDialog;
}
bool NewDialog::event(QEvent *event)
@@ -358,8 +358,8 @@ bool NewDialog::event(QEvent *event)
NewDialog::~NewDialog()
{
QTC_CHECK(m_isRunning);
m_isRunning = false;
QTC_CHECK(m_currentDialog != nullptr);
m_currentDialog = nullptr;
delete m_ui;
}