diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2012-10-10 15:34:35 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-10-16 12:04:37 +0200 |
| commit | f88636e613efcf2ef106c7bda9fa47ddfb7bab34 (patch) | |
| tree | 180c5b98b6c0cad2da425710998e7c5bd6a0ff26 /src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp | |
| parent | 47e42e53d03d63d9f0155a4b5215018277d11762 (diff) | |
Kit: Improve the options page
* Update warning icon as changes happen
* Make clone clone the current settings, not what used to be there
before changes were made
* Make sure the edited entry is visible in list view
* I find the KitModel much easier to understand now
Task-number: QTCREATORBUG-7862
Task-number: QTCREATORBUG-7803
Change-Id: I124c2e5a96cea7386896084e1027ba79a8be20b7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp index eb177cda80..d5546f90b1 100644 --- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp @@ -54,8 +54,8 @@ QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, QWidget *par m_lineEdit->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_lineEdit); - discard(); // set up everything according to kit - connect(m_lineEdit, SIGNAL(textEdited(QString)), this, SIGNAL(dirty())); + refresh(); // set up everything according to kit + connect(m_lineEdit, SIGNAL(textEdited(QString)), this, SLOT(mkspecWasChanged(QString))); } QString QmakeKitConfigWidget::displayName() const @@ -68,19 +68,14 @@ void QmakeKitConfigWidget::makeReadOnly() m_lineEdit->setEnabled(false); } -void QmakeKitConfigWidget::apply() -{ - QmakeKitInformation::setMkspec(m_kit, Utils::FileName::fromString(m_lineEdit->text())); -} - -void QmakeKitConfigWidget::discard() +void QmakeKitConfigWidget::refresh() { m_lineEdit->setText(QmakeKitInformation::mkspec(m_kit).toString()); } -bool QmakeKitConfigWidget::isDirty() const +void QmakeKitConfigWidget::mkspecWasChanged(const QString &text) { - return m_lineEdit->text() != QmakeKitInformation::mkspec(m_kit).toString(); + QmakeKitInformation::setMkspec(m_kit, Utils::FileName::fromString(text)); } } // namespace Internal |