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/projectexplorer/kitmodel.h | |
parent | 47e42e53d03d63d9f0155a4b5215018277d11762 (diff) | |
download | qt-creator-f88636e613efcf2ef106c7bda9fa47ddfb7bab34.tar.gz |
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/projectexplorer/kitmodel.h')
-rw-r--r-- | src/plugins/projectexplorer/kitmodel.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/projectexplorer/kitmodel.h b/src/plugins/projectexplorer/kitmodel.h index 065a20047b..d0ebf3bfb1 100644 --- a/src/plugins/projectexplorer/kitmodel.h +++ b/src/plugins/projectexplorer/kitmodel.h @@ -42,11 +42,11 @@ QT_END_NAMESPACE namespace ProjectExplorer { class Kit; -class KitConfigWidget; class KitFactory; class KitManager; namespace Internal { +class KitManagerConfigWidget; class KitNode; @@ -77,7 +77,7 @@ public: void setDefaultKit(const QModelIndex &index); bool isDefaultKit(const QModelIndex &index); - KitConfigWidget *widget(const QModelIndex &); + ProjectExplorer::Internal::KitManagerConfigWidget *widget(const QModelIndex &); bool isDirty() const; bool isDirty(Kit *k) const; @@ -85,7 +85,7 @@ public: void apply(); void markForRemoval(Kit *k); - void markForAddition(Kit *k); + Kit *markForAddition(Kit *baseKit); signals: void kitStateChanged(); @@ -93,21 +93,19 @@ signals: private slots: void addKit(ProjectExplorer::Kit *k); void removeKit(ProjectExplorer::Kit *k); - void updateKit(ProjectExplorer::Kit *k); void changeDefaultKit(); void setDirty(); private: QModelIndex index(KitNode *, int column = 0) const; - KitNode *find(Kit *k) const; - KitNode *createNode(KitNode *parent, Kit *k, bool changed); + KitNode *findWorkingCopy(Kit *k) const; + KitNode *createNode(KitNode *parent, Kit *k); void setDefaultNode(KitNode *node); KitNode *m_root; KitNode *m_autoRoot; KitNode *m_manualRoot; - QList<KitNode *> m_toAddList; QList<KitNode *> m_toRemoveList; QBoxLayout *m_parentLayout; |