summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Holmstedt <lasse.holmstedt@nokia.com>2010-06-07 10:25:39 +0200
committerhjk <qtc-committer@nokia.com>2010-06-07 10:57:34 +0200
commit0b8640d53860f8dfcd5b47d83a9d65ea2b6f0a49 (patch)
tree50a1f64b9883f2f7f5ba8a0d00e65d06adefa94e
parent9b36e0688add8202133c992b9bdffc3e6e334bdd (diff)
downloadqt-creator-0b8640d53860f8dfcd5b47d83a9d65ea2b6f0a49.tar.gz
Fixed disabled checkbox styles for plugin manager
Reviewed-by: jbache (cherry picked from commit 6527fd1dfa53abf5d4daf8a4f21104516c5bce08)
-rw-r--r--src/libs/extensionsystem/pluginview.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index f60b2c32de..cb2af604c6 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -221,16 +221,13 @@ int PluginView::parsePluginSpecs(QTreeWidgetItem *parentItem, Qt::CheckState &gr
++loadCount;
}
- if (!m_whitelist.contains(spec->name()))
+ if (!m_whitelist.contains(spec->name())) {
pluginItem->setData(C_LOAD, Qt::CheckStateRole, state);
- else {
- QColor disabledColor = palette().color(QPalette::Disabled,QPalette::WindowText).lighter(120);
+ } else {
pluginItem->setData(C_LOAD, Qt::CheckStateRole, Qt::Checked);
- pluginItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
- pluginItem->setSizeHint(C_LOAD, QSize(1,1));
- pluginItem->setForeground(C_LOAD, QBrush(disabledColor)); // QBrush(Qt::white, Qt::NoBrush));
- //pluginItem->setBackground(C_LOAD, QBrush(Qt::white, Qt::NoBrush));
+ pluginItem->setFlags(Qt::ItemIsSelectable);
}
+
pluginItem->setToolTip(C_LOAD, tr("Load on Startup"));
m_specToItem.insert(spec, pluginItem);
@@ -333,7 +330,7 @@ void PluginView::updatePluginSettings(QTreeWidgetItem *item, int column)
child->setData(C_LOAD, Qt::CheckStateRole, state);
} else {
child->setData(C_LOAD, Qt::CheckStateRole, Qt::Checked);
- child->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ child->setFlags(Qt::ItemIsSelectable);
}
}
updatePluginDependencies();
@@ -347,6 +344,9 @@ void PluginView::updatePluginDependencies()
{
foreach (PluginSpec *spec, PluginManager::instance()->loadQueue()) {
bool disableIndirectly = false;
+ if (m_whitelist.contains(spec->name()))
+ continue;
+
foreach(const PluginSpec *depSpec, spec->dependencySpecs()) {
if (!depSpec->isEnabled() || depSpec->isDisabledIndirectly()) {
disableIndirectly = true;