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

NewDialog: Keep information on whether the dialog is open or not

Browse Source 
Keep that information in the NewDialog instead of ICore.

Change-Id: I3e351251be6c4927b80a22db175ed79cb1f24621
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-05-29 14:23:59 +02:00
parent c0952e22f7
commit 47660a8f09
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@
Q_DECLARE_METATYPE(Core::IWizardFactory*)
namespace {
const int ICON_SIZE = 22;
@@ -188,6 +187,7 @@ Q_DECLARE_METATYPE(WizardFactoryContainer)
using namespace Core;
using namespace Core::Internal;
bool NewDialog::m_isRunning = false;
QString NewDialog::m_lastCategory = QString();
NewDialog::NewDialog(QWidget *parent) :
@@ -195,6 +195,10 @@ NewDialog::NewDialog(QWidget *parent) :
m_ui(new Ui::NewDialog),
m_okButton(0)
{
QTC_CHECK(!m_isRunning);
m_isRunning = true;
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowFlags(windowFlags());
setAttribute(Qt::WA_DeleteOnClose);
@@ -332,6 +336,11 @@ QString NewDialog::selectedPlatform() const
return m_ui->comboBox->itemData(index).toString();
}
bool NewDialog::isRunning()
{
return m_isRunning;
}
bool NewDialog::event(QEvent *event)
{
if (event->type() == QEvent::ShortcutOverride) {
@@ -346,6 +355,9 @@ bool NewDialog::event(QEvent *event)
NewDialog::~NewDialog()
{
QTC_CHECK(m_isRunning);
m_isRunning = false;
delete m_ui;
}