Author: dmacvicar Date: Sat Apr 12 22:29:42 2008 New Revision: 46480 URL: http://svn.opensuse.org/viewcvs/yast?rev=46480&view=rev Log: - make some sense out of the filters now that the patches are not installed (group by needed, unneeded and all) - cleanup and remove commented code Modified: trunk/qt-pkg/src/YQPkgPatchFilterView.cc trunk/qt-pkg/src/YQPkgPatchList.cc trunk/qt-pkg/src/YQPkgPatchList.h Modified: trunk/qt-pkg/src/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchFilterView.c... ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgPatchFilterView.cc Sat Apr 12 22:29:42 2008 @@ -77,8 +77,8 @@ Q_CHECK_PTR( _patchFilter ); hbox->addWidget(_patchFilter); - _patchFilter->addItem( _( "Installable Patches" )); - _patchFilter->addItem( _( "Installable and Installed Patches" )); + _patchFilter->addItem( _( "Needed Patches" )); + _patchFilter->addItem( _( "Unneeded Patches" )); _patchFilter->addItem( _( "All Patches" ), 2 ); _patchFilter->setCurrentIndex( 0 ); _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert Modified: trunk/qt-pkg/src/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchList.cc?rev=... ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatchList.cc Sat Apr 12 22:29:42 2008 @@ -28,7 +28,6 @@ #include <QEvent> #include <QHeaderView> #include <zypp/base/Logger.h> -#include <zypp/ui/PatchContents.h> #include <set> #include "YQi18n.h" @@ -38,12 +37,6 @@ #include "YQPkgTextDialog.h" #include "YQIconPool.h" -#define VERBOSE_PATCH_LIST 1 - - -typedef zypp::ui::PatchContents ZyppPatchContents; -typedef zypp::ui::PatchContents::const_iterator ZyppPatchContentsIterator; - using std::list; using std::set; @@ -212,11 +205,12 @@ displayPatch = true; } break; - case RelevantAndInstalledPatches: // needed + broken + installed + case RelevantAndInstalledPatches: // patches we dont need // only shows patches relevant to the system - if ( selectable->hasCandidateObj() && - selectable->candidateObj().isRelevant() ) + if ( ( selectable->hasCandidateObj() ) && + ( ! selectable->candidateObj().isRelevant() + || selectable->candidateObj().isSatisfied() ) ) { // now we show satisfied patches too displayPatch = true; Modified: trunk/qt-pkg/src/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchList.h?rev=4... ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchList.h (original) +++ trunk/qt-pkg/src/YQPkgPatchList.h Sat Apr 12 22:29:42 2008 @@ -69,9 +69,9 @@ enum FilterCriteria { - RelevantPatches, // needed + broken - RelevantAndInstalledPatches, // needed + broken + installed - AllPatches // all + RelevantPatches, // needed (or broken) + RelevantAndInstalledPatches, // unneeded + AllPatches // all }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org