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

Don't show the collection item if plugins list is empty

Browse Source 
Change-Id: Icc3b76f277de27d7d099b23f0748d37b757dbe68
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Yuchen Deng
2013-02-09 12:45:46 +08:00
committed by Tobias Hunger
parent a5ede0f55f
commit e8832da2e7
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/extensionsystem/pluginview.cpp
View File

@@ -133,7 +133,7 @@ void PluginView::updateList()
PluginCollection *defaultCollection = 0; PluginCollection *defaultCollection = 0;
foreach (PluginCollection *collection, PluginManager::pluginCollections()) { foreach (PluginCollection *collection, PluginManager::pluginCollections()) {
if (collection->name().isEmpty()) { if (collection->name().isEmpty() || collection->plugins().isEmpty()) {
defaultCollection = collection; defaultCollection = collection;
continue; continue;
} }
@@ -155,23 +155,26 @@ void PluginView::updateList()
collectionItem->setData(0, Qt::UserRole, qVariantFromValue(collection)); collectionItem->setData(0, Qt::UserRole, qVariantFromValue(collection));
} }
// add all non-categorized plugins into utilities. could also be added as root items QList<PluginSpec *> plugins = defaultCollection ? defaultCollection->plugins() : QList<PluginSpec *>();
// but that makes the tree ugly. if (!plugins.isEmpty()) {
QTreeWidgetItem *defaultCollectionItem = new QTreeWidgetItem(QStringList() // add all non-categorized plugins into utilities. could also be added as root items
<< QString(tr("Utilities")) // but that makes the tree ugly.
<< QString() QTreeWidgetItem *defaultCollectionItem = new QTreeWidgetItem(QStringList()
<< QString() << QString(tr("Utilities"))
<< QString() << QString()
<< QString()); << QString()
<< QString()
<< QString());
m_items.append(defaultCollectionItem); m_items.append(defaultCollectionItem);
Qt::CheckState groupState = Qt::Unchecked; Qt::CheckState groupState = Qt::Unchecked;
int state = parsePluginSpecs(defaultCollectionItem, groupState, defaultCollection ? defaultCollection->plugins() : QList<PluginSpec *>()); int state = parsePluginSpecs(defaultCollectionItem, groupState, plugins);
defaultCollectionItem->setIcon(0, iconForState(state)); defaultCollectionItem->setIcon(0, iconForState(state));
defaultCollectionItem->setData(C_LOAD, Qt::CheckStateRole, QVariant(groupState)); defaultCollectionItem->setData(C_LOAD, Qt::CheckStateRole, QVariant(groupState));
defaultCollectionItem->setToolTip(C_LOAD, tr("Load on Startup")); defaultCollectionItem->setToolTip(C_LOAD, tr("Load on Startup"));
defaultCollectionItem->setData(0, Qt::UserRole, qVariantFromValue(defaultCollection)); defaultCollectionItem->setData(0, Qt::UserRole, qVariantFromValue(defaultCollection));
}
updatePluginDependencies(); updatePluginDependencies();