Author: schubi2 Date: Fri Jun 20 09:46:33 2008 New Revision: 10416 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10416&view=rev Log: show installed items too Modified: trunk/dialogsolver/src/resgraphview.cpp trunk/dialogsolver/src/solvertree.cpp Modified: trunk/dialogsolver/src/resgraphview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.cpp?rev=10416&r1=10415&r2=10416&view=diff ============================================================================== --- trunk/dialogsolver/src/resgraphview.cpp (original) +++ trunk/dialogsolver/src/resgraphview.cpp Fri Jun 20 09:46:33 2008 @@ -340,6 +340,10 @@ it = m_Tree.find(nodeName); if (it==m_Tree.end()) return Qt::white; + + if (it.data().item.status().staysInstalled()) + return QColor(Qt::green).lighter(190); + if (it.data().item->isKind( ResKind::product )) return Qt::magenta; if (it.data().item->isKind( ResKind::pattern )) Modified: trunk/dialogsolver/src/solvertree.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.cpp?rev=10416&r1=10415&r2=10416&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.cpp (original) +++ trunk/dialogsolver/src/solvertree.cpp Fri Jun 20 09:46:33 2008 @@ -124,7 +124,7 @@ void SolverTree::buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id) { - // generate the branches + // generate the branches for items which will really be installed zypp::solver::detail::ItemCapKindList installList = resolver->installs (item); for (zypp::solver::detail::ItemCapKindList::const_iterator it = installList.begin(); it != installList.end(); it++) { @@ -142,7 +142,20 @@ if (alreadyHitItems.find(it->item) == alreadyHitItems.end()) buildTree ( data, data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, it->item, id); } - } + } + + // generate the branches for items which are already installed + zypp::solver::detail::ItemCapKindList satisfiedList = resolver->satifiedByInstalled (item); + for (zypp::solver::detail::ItemCapKindList::const_iterator it = satisfiedList.begin(); + it != satisfiedList.end(); it++) { + QString idStr = QString( "%1" ).arg( id++ ); + + childList.append(ResGraphView::targetData(idStr)); + data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].item=it->item; + data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].dueto = *it; + + alreadyHitItems.insert (item); + } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org