Author: kmachalkova Date: Thu Apr 24 18:21:37 2008 New Revision: 47042 URL: http://svn.opensuse.org/viewcvs/yast?rev=47042&view=rev Log: s/FilterContainer/FilterPattern/g Removed: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc trunk/ncurses-pkg/src/NCPkgFilterContainer.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=47042&r1=47041&r2=47042&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Apr 24 18:21:37 2008 @@ -29,7 +29,8 @@ #include "NCPopupInfo.h" #include "NCSelectionBox.h" #include "NCMenuButton.h" -#include "NCPkgFilterContainer.h" +#include "NCPkgFilterPattern.h" +#include "NCPkgFilterLocale.h" #include "NCPkgFilterRepo.h" #include "NCPkgPopupDeps.h" #include "NCPkgPopupDiskspace.h" @@ -173,10 +174,10 @@ if ( !youMode ) { // create the patterns popup - //patternPopup = new NCPkgFilterContainer( , this, NCPkgFilterContainer::S_Pattern ); + //patternPopup = new NCPkgFilterPattern( , this, NCPkgFilterPattern::S_Pattern ); // create language popup - //languagePopup = new NCPkgFilterContainer( wpos( 1,1 ), this, NCPkgFilterContainer::S_Language ); + //languagePopup = new NCPkgFilterPattern( wpos( 1,1 ), this, NCPkgFilterPattern::S_Language ); // create repository popup //repoPopup = new NCPkgRepoTable( wpos( 1,1), this ); @@ -830,7 +831,7 @@ case Patterns: { YTableHeader *hhh = new YTableHeader (); - patternPopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Pattern ); + patternPopup = new NCPkgFilterPattern( replPoint, hhh, this, NCPkgFilterPattern::S_Pattern ); patternPopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); patternPopup->Redraw(); patternPopup->showContainerPackages(); @@ -839,10 +840,10 @@ case Languages: { YTableHeader *hhh = new YTableHeader (); - languagePopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Language ); + languagePopup = new NCPkgLocaleTable( replPoint, hhh, this ); languagePopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); languagePopup->Redraw(); - languagePopup->showContainerPackages(); + //languagePopup->showContainerPackages(); break; } case Repositories: @@ -1607,7 +1608,7 @@ replPoint = YUI::widgetFactory()->createReplacePoint( vv ); YTableHeader *hhh = new YTableHeader(); - patternPopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Pattern ); + patternPopup = new NCPkgFilterPattern( replPoint, hhh, this, NCPkgFilterPattern::S_Pattern ); YAlignment *l1 = YUI::widgetFactory()->createLeft( vbox_left ); patternLabel = new NCLabel( l1, " " ); Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=47042&r1=47041&r2=47042&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Thu Apr 24 18:21:37 2008 @@ -55,7 +55,8 @@ #include "NCPkgSelMapper.h" -class NCPkgFilterContainer; +class NCPkgFilterPattern; +class NCPkgLocaleTable; class NCPkgRepoTable; class LangCode; class NCPkgPopupDeps; @@ -111,8 +112,8 @@ NCPkgPopupDeps * depsPopup; // the package dependeny popup - NCPkgFilterContainer * patternPopup; // the pattern popup - NCPkgFilterContainer * languagePopup; // language popup + NCPkgFilterPattern * patternPopup; // the pattern popup + NCPkgLocaleTable * languagePopup; // language popup NCPkgRepoTable * repoPopup; NCPkgPopupDiskspace * diskspacePopup; // the popup showing the disk usage -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org