Author: kmachalkova Date: Mon Apr 21 11:47:00 2008 New Revision: 46892 URL: http://svn.opensuse.org/viewcvs/yast?rev=46892&view=rev Log: Show #of installed/total packages Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgFilterContainer.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=46892&r1=46891&r2=46892&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Mon Apr 21 11:47:00 2008 @@ -1802,12 +1802,13 @@ YLayoutBox * vv = YUI::widgetFactory()->createVBox( fr ); YAlignment *l = YUI::widgetFactory()->createLeft( vv ); filterMain = new NCPkgFilterMain (l, NCPkgStrings::Filter(), this ); - //filterPopup = new NCPkgFilterRPMGroups ( vv, " ", this); replPoint = YUI::widgetFactory()->createReplacePoint( vv ); YTableHeader *hhh = new YTableHeader(); patternPopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Pattern ); - NCLabel *dummy = new NCLabel( vbox_left, " " ); + + YAlignment *l1 = YUI::widgetFactory()->createLeft( vbox_left ); + patternLabel = new NCLabel( l1, " " ); // add the package table Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=46892&r1=46891&r2=46892&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Mon Apr 21 11:47:00 2008 @@ -137,6 +137,7 @@ // labels YLabel * packageLabel; YLabel * diskspaceLabel; + YLabel *patternLabel; // information about packages NCPkgPackageDetails * infoText; // short/longdecsription, filelist @@ -217,6 +218,7 @@ NCPkgPopupDeps *DepsPopup() { return depsPopup; } NCPkgPopupDiskspace *diskSpacePopup() { return diskspacePopup; } YLabel *PackageLabel() { return packageLabel; } + YLabel *PatternLabel() { return patternLabel; } NCPkgPackageDetails *InfoText() { return infoText; } void setInfoText ( NCPkgPackageDetails *itext ) { infoText = itext ;} Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterContainer.cc?rev=46892&r1=46891&r2=46892&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterContainer.cc Mon Apr 21 11:47:00 2008 @@ -139,7 +139,9 @@ //ZyppLang langPtr = tryCastToZyppLang (objPtr); if (patPtr) { - packager->FilterDescription()->setText ( showDescription( objPtr ) ); + int total = 0; + int installed = 0; + yuiMilestone() << "Show packages belonging to selected pattern: " << getCurrentLine() << endl; NCPkgTable * packageList = packager->PackageList(); @@ -160,8 +162,18 @@ if ( zyppPkg ) { packageList->createListEntry( zyppPkg, *it ); + if ( (*it)->installedSize() > 0 ) + ++installed; + ++total; + } } + packager->FilterDescription()->setText ( showDescription( objPtr ) ); + char buf[100]; + sprintf(buf, "%d/%d packages installed", installed, total); + + packager->PatternLabel()->setLabel ( buf ); + packageList->setCurrentItem( 0 ); packageList->drawList(); packageList->showInformation(); @@ -231,7 +243,7 @@ case S_Pattern: { ZyppPattern patPtr = tryCastToZyppPattern (objPtr); - return patPtr->description(); + return patPtr->description(); } #if 0 case S_Language: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org