Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed May 10 18:45:10 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-05-09 14:57:55.000000000 +0200 +++ STABLE/yast2-ncurses/yast2-ncurses.changes 2006-05-10 14:25:56.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 10 14:16:52 CEST 2006 - gs@suse.de + +- Package Installation dialag: Create appropriate 'Filter' menu + with 'Patterns' or 'Selections' (bug #171024, bug #173885) +- 2.13.30 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.29.tar.bz2 New: ---- yast2-ncurses-2.13.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.N05rLl/_old 2006-05-10 18:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.N05rLl/_new 2006-05-10 18:45:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.29) +# spec file for package yast2-ncurses (Version 2.13.30) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.29 +Version: 2.13.30 Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.29.tar.bz2 +Source0: yast2-ncurses-2.13.30.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -40,7 +40,7 @@ %prep -%setup -n yast2-ncurses-2.13.29 +%setup -n yast2-ncurses-2.13.30 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,10 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Wed May 10 2006 - gs@suse.de +- Package Installation dialag: Create appropriate 'Filter' menu + with 'Patterns' or 'Selections' (bug #171024, bug #173885) +- 2.13.30 * Tue May 09 2006 - gs@suse.de - show "Automatic Changes List" correctly (bug #152700) - 2.13.29 ++++++ yast2-ncurses-2.13.29.tar.bz2 -> yast2-ncurses-2.13.30.tar.bz2 ++++++ ++++ 1930 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/VERSION new/yast2-ncurses-2.13.30/VERSION --- old/yast2-ncurses-2.13.29/VERSION 2006-05-09 14:58:07.000000000 +0200 +++ new/yast2-ncurses-2.13.30/VERSION 2006-05-10 14:26:11.000000000 +0200 @@ -1 +1 @@ -2.13.29 +2.13.30 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/NCPackageSelector.cc new/yast2-ncurses-2.13.30/src/NCPackageSelector.cc --- old/yast2-ncurses-2.13.29/src/NCPackageSelector.cc 2006-04-19 13:53:12.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/NCPackageSelector.cc 2006-05-10 12:02:52.000000000 +0200 @@ -189,8 +189,12 @@ // show download size packager->showDownloadSize(); else + { // show the required diskspace - packager->showDiskSpace(); + packager->showDiskSpace(); + // show appropriate filter menu entries + packager->createFilterMenu(); + } } } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/NCPkgTable.cc new/yast2-ncurses-2.13.30/src/NCPkgTable.cc --- old/yast2-ncurses-2.13.29/src/NCPkgTable.cc 2006-05-09 11:10:20.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/NCPkgTable.cc 2006-05-10 12:16:24.000000000 +0200 @@ -593,7 +593,7 @@ case T_Selections: { header.reserve(3); header.push_back( "L" + PkgNames::PkgStatus() ); - header.push_back( "L" + PkgNames::SelectionName() ); + header.push_back( "L" + PkgNames::SelectionLabel() ); break; } case T_Availables: { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/NCPopupPkgTable.cc new/yast2-ncurses-2.13.30/src/NCPopupPkgTable.cc --- old/yast2-ncurses-2.13.29/src/NCPopupPkgTable.cc 2006-05-09 14:47:32.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/NCPopupPkgTable.cc 2006-05-09 15:13:20.000000000 +0200 @@ -166,9 +166,11 @@ if ( ! contains( ignoredNames, slb->name() ) ) { ZyppPkg pkgPtr = tryCastToZyppPkg (slb->theObj()); - - NCMIL << "The status of " << pkgPtr->name() << " has automatically changed" << endl; - pkgTable->createListEntry( pkgPtr, slb ); + if ( pkgPtr ) + { + NCMIL << "The status of " << pkgPtr->name() << " has automatically changed" << endl; + pkgTable->createListEntry( pkgPtr, slb ); + } } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/NCPopupSelection.cc new/yast2-ncurses-2.13.30/src/NCPopupSelection.cc --- old/yast2-ncurses-2.13.29/src/NCPopupSelection.cc 2006-04-05 19:06:37.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/NCPopupSelection.cc 2006-05-10 12:49:28.000000000 +0200 @@ -42,7 +42,7 @@ // // DESCRIPTION : // -NCPopupSelection::NCPopupSelection( const wpos at, PackageSelector * pkg ) +NCPopupSelection::NCPopupSelection( const wpos at, PackageSelector * pkg, SelType type ) : NCPopup( at, false ) , sel( 0 ) , okButton( 0 ) @@ -50,7 +50,7 @@ { createLayout( YCPString(PkgNames::SelectionLabel()) ); - fillSelectionList( sel ); + fillSelectionList( sel, type ); } /////////////////////////////////////////////////////////////////// @@ -275,49 +275,60 @@ // // DESCRIPTION : // -bool NCPopupSelection::fillSelectionList( NCPkgTable * sel ) +bool NCPopupSelection::fillSelectionList( NCPkgTable * sel, SelType type ) { if ( !sel ) return false; - ZyppPoolIterator - i, - b = zyppPatternsBegin (), - e = zyppPatternsEnd (); - bool no_patterns = b == e; - if (no_patterns) - { - UIMIL << "No patterns" << endl; - b = zyppSelectionsBegin (); - e = zyppSelectionsEnd (); - } - // watch out, ZyppSelection is not ZyppSel (zypp::ui::Selectable::Ptr) + ZyppPoolIterator i, b, e; list<ZyppSel> slbList; - for ( i = b; i != e; ++i ) + + switch ( type ) { - ZyppObj resPtr = (*i)->theObj(); - bool show; - if (no_patterns) - { - ZyppSelection selPtr = tryCastToZyppSelection (resPtr); - show = selPtr && selPtr->visible() && !selPtr->isBase(); - } - else - { - ZyppPattern patPtr = tryCastToZyppPattern (resPtr); - show = patPtr && patPtr->userVisible (); - } - if (show) - { - NCMIL << resPtr->kind () <<": " << resPtr->name() - << ", initial status: " << (*i)->status() << endl; + case S_Selection: + { + for ( i = zyppSelectionsBegin () ; i != zyppSelectionsEnd (); ++i ) + { + ZyppObj resPtr = (*i)->theObj(); + bool show; + + ZyppSelection selPtr = tryCastToZyppSelection (resPtr); + show = selPtr && selPtr->visible() && !selPtr->isBase(); + if (show) + { + NCMIL << resPtr->kind () <<": " << resPtr->name() + << ", initial status: " << (*i)->status() << endl; + + slbList.push_back (*i); + } + } + slbList.sort( order ); - slbList.push_back (*i); - } + break; + } + case S_Pattern: + { + for ( i = zyppPatternsBegin () ; i != zyppPatternsEnd (); ++i ) + { + ZyppObj resPtr = (*i)->theObj(); + bool show; + + ZyppPattern patPtr = tryCastToZyppPattern (resPtr); + show = patPtr && patPtr->userVisible (); + + if (show) + { + NCMIL << resPtr->kind () <<": " << resPtr->name() + << ", initial status: " << (*i)->status() << endl; + + slbList.push_back (*i); + } + } + break; + } + default: + NCERR << "Selecion type not handled: " << type << endl; } - - if (no_patterns) - slbList.sort( order ); list<ZyppSel>::iterator listIt; vector<string> pkgLine; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/NCPopupSelection.h new/yast2-ncurses-2.13.30/src/NCPopupSelection.h --- old/yast2-ncurses-2.13.29/src/NCPopupSelection.h 2006-03-07 13:31:20.000000000 +0100 +++ new/yast2-ncurses-2.13.30/src/NCPopupSelection.h 2006-05-10 12:37:38.000000000 +0200 @@ -55,8 +55,14 @@ virtual NCursesEvent wHandleInput( wint_t ch ); public: + + enum SelType { + S_Selection, + S_Pattern, + S_Unknown + }; - NCPopupSelection( const wpos at, PackageSelector * pkg ); + NCPopupSelection( const wpos at, PackageSelector * pkg, SelType type ); virtual ~NCPopupSelection(); virtual long nicesize(YUIDimension dim); @@ -68,7 +74,7 @@ * Fills the list with the available selections (and the status info) * @return bool */ - bool fillSelectionList ( NCPkgTable * table ); + bool fillSelectionList ( NCPkgTable * table, SelType type ); /** * Shows the popup with the add ons (package categories). @@ -76,6 +82,7 @@ */ NCursesEvent & showSelectionPopup( ); + }; /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/PackageSelector.cc new/yast2-ncurses-2.13.30/src/PackageSelector.cc --- old/yast2-ncurses-2.13.29/src/PackageSelector.cc 2006-05-03 10:38:07.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/PackageSelector.cc 2006-05-10 14:00:50.000000000 +0200 @@ -90,6 +90,7 @@ , filterPopup( 0 ) , depsPopup( 0 ) , selectionPopup( 0 ) + , patternPopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) , filePopup( 0 ) @@ -107,6 +108,7 @@ // Filter menu eventHandlerMap[ PkgNames::RpmGroups()->toString() ] = &PackageSelector::FilterHandler; eventHandlerMap[ PkgNames::Selections()->toString() ] = &PackageSelector::FilterHandler; + eventHandlerMap[ PkgNames::Patterns()->toString() ] = &PackageSelector::FilterHandler; eventHandlerMap[ PkgNames::UpdateList()->toString() ] = &PackageSelector::FilterHandler; eventHandlerMap[ PkgNames::Installed()->toString() ] = &PackageSelector::FilterHandler; eventHandlerMap[ PkgNames::Whatif()->toString() ] = &PackageSelector::FilterHandler; @@ -211,8 +213,10 @@ if ( !youMode ) { // create the selections popup - selectionPopup = new NCPopupSelection( wpos( 1, 1 ), this ); - + selectionPopup = new NCPopupSelection( wpos( 1, 1 ), this, NCPopupSelection::S_Selection ); + // create the patterns popup + patternPopup = new NCPopupSelection( wpos( 1, 1 ), this, NCPopupSelection::S_Pattern ); + _rpmGroupsTree = new YRpmGroupsTree (); // get the rpm groups ZyppPoolIterator b = zyppPkgBegin (); @@ -258,6 +262,10 @@ { delete selectionPopup; } + if ( patternPopup ) + { + delete patternPopup; + } if ( depsPopup ) { delete depsPopup; @@ -280,6 +288,90 @@ } } +void PackageSelector::createFilterMenu() +{ + bool selections; + bool patterns; + + // create the pattern popup + if ( ! zyppPool().emptyzypp::Pattern() ) + { + + patterns = true; + } + else + { + patterns = false; + } + // create the selections popup + if ( ! zyppPool().emptyzypp::Selection() ) + { + + selections = true; + } + else + { + selections = false; + } + + if ( patterns && !selections ) + { + // ReplaceWidget and show menu entry Patterns instead of Selections + char menu[1200]; + sprintf ( menu, + "`MenuButton( `opt(`key_F4), \"%s\", " + "[`item( `id(\"groups\"), \"%s\" ), `item( `id(\"patterns\"), \"%s\" ), " + " `item( `id(\"search\"), \"%s\" ), `item( `id(\"installed\"), \"%s\" ), " + " `item( `id(\"whatif\"), \"%s\" ), `item( `id(\"updatelist\"), \"%s\" ) ] ) ", + PkgNames::MenuFilter().c_str(), + PkgNames::MenuEntryRPMGroups().c_str(), + PkgNames::MenuEntryPatterns().c_str(), + PkgNames::MenuEntrySearch().c_str(), + PkgNames::MenuEntryInstPkg().c_str() , + PkgNames::MenuEntryInstSummary().c_str(), + PkgNames::MenuEntryUpdateList().c_str() + ); + + Parser parser( menu ); + YCodePtr parsed_code = parser.parse (); + YCPValue layout = YCPNull (); + if (parsed_code != NULL) + layout = parsed_code->evaluate(); + + y2ui->evaluateReplaceWidget( YCPSymbol("replacefilter"), layout->asTerm() ); + + } + else if ( patterns && selections ) + { + // ReplaceWidget and show menu entries Patterns AND Selections + char menu[1200]; + sprintf ( menu, + "`MenuButton(`opt(`key_F4), \"%s\", " + "[`item( `id(\"groups\"), \"%s\" ), `item( `id(\"patterns\"), \"%s\" ), " + " `item( `id(\"selections\"), \"%s\" ), " + " `item( `id(\"search\"), \"%s\" ), `item( `id(\"installed\"), \"%s\" ), " + " `item( `id(\"whatif\"), \"%s\" ), `item( `id(\"updatelist\"), \"%s\" ) ] ) ", + PkgNames::MenuFilter().c_str(), + PkgNames::MenuEntryRPMGroups().c_str(), + PkgNames::MenuEntryPatterns().c_str(), + PkgNames::MenuEntrySelections().c_str(), + PkgNames::MenuEntrySearch().c_str(), + PkgNames::MenuEntryInstPkg().c_str() , + PkgNames::MenuEntryInstSummary().c_str(), + PkgNames::MenuEntryUpdateList().c_str() + ); + + Parser parser( menu ); + YCodePtr parsed_code = parser.parse (); + YCPValue layout = YCPNull (); + if (parsed_code != NULL) + layout = parsed_code->evaluate(); + + y2ui->evaluateReplaceWidget( YCPSymbol("replacefilter"), layout->asTerm() ); + + } +} + /////////////////////////////////////////////////////////////////// // // detection whether the user has made any changes @@ -827,68 +919,6 @@ } } -#ifdef OLD_CODE - list<ZyppPkg> packages = patchPtr->packages(); - string preScript = patchPtr->preScript(); - string postScript = patchPtr->postScript(); - list<PMYouFile> files = patchPtr->files(); - - list<ZyppPkg>::const_iterator listIt; - list<PMYouFile>::const_iterator fileIt; - - NCMIL << "Number of patch packages: " << packages.size() << endl; - - for ( listIt = packages.begin(); listIt != packages.end(); ++listIt ) - { - pkgTable->createListEntry( (*listIt) ); - } - for ( fileIt = files.begin(); fileIt != files.end(); ++fileIt ) - { - vector<string> pkgLine; - pkgLine.reserve(4); - - pkgLine.push_back( fileIt->name() ); - pkgLine.push_back( " " ); // versions empty - pkgLine.push_back( " " ); - pkgLine.push_back( PkgNames::File() ); // additional file - - pkgTable->addLine( S_NoInst, - pkgLine, - ZyppObj() - ); - } - - if ( preScript != "" ) - { - vector<string> pkgLine; - pkgLine.reserve(4); - - pkgLine.push_back( preScript ); - pkgLine.push_back( " " ); // versions empty - pkgLine.push_back( " " ); - pkgLine.push_back( PkgNames::PreScript() ); - - pkgTable->addLine( S_NoInst, - pkgLine, - ZyppObj() - ); - } - if ( postScript != "" ) - { - vector<string> pkgLine; - pkgLine.reserve(4); - - pkgLine.push_back( postScript ); - pkgLine.push_back( " " ); // versions empty - pkgLine.push_back( " " ); - pkgLine.push_back( PkgNames::PostScript() ); - - pkgTable->addLine( S_NoInst, - pkgLine, - ZyppObj() - ); - } -#endif // show the list pkgTable->drawList(); @@ -1428,6 +1458,14 @@ retEvent = selectionPopup->showSelectionPopup( ); } } + else if ( event.selection->compare( PkgNames::Patterns() ) == YO_EQUAL ) + { + if ( patternPopup ) + { + // show the selection popup + retEvent = patternPopup->showSelectionPopup( ); + } + } // patches else if ( event.selection->compare( PkgNames::Recommended() ) == YO_EQUAL ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/PackageSelector.h new/yast2-ncurses-2.13.30/src/PackageSelector.h --- old/yast2-ncurses-2.13.29/src/PackageSelector.h 2006-04-11 12:00:58.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/PackageSelector.h 2006-05-10 11:08:55.000000000 +0200 @@ -78,6 +78,7 @@ NCPopupDeps * depsPopup; // the package dependeny popup NCPopupSelection * selectionPopup; // the selections popup + NCPopupSelection * patternPopup; // the pattern popup NCPopupDiskspace * diskspacePopup; // the popup showing the disk usage @@ -104,7 +105,7 @@ NCPkgSelMapper selMapper; protected: - + public: @@ -405,6 +406,9 @@ * Check for license */ bool showPendingLicenseAgreements(); + + void createFilterMenu(); + }; /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/PkgNames.cc new/yast2-ncurses-2.13.30/src/PkgNames.cc --- old/yast2-ncurses-2.13.29/src/PkgNames.cc 2006-05-09 11:09:01.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/PkgNames.cc 2006-05-10 09:53:58.000000000 +0200 @@ -216,6 +216,12 @@ static const YCPValue value = createIdValue ( "replacemenu" ); return value; } +// internal use +const YCPValue& PkgNames::ReplaceFilter () +{ + static const YCPValue value = createIdValue ( "replacefilter" ); + return value; +} // the search button const YCPValue& PkgNames::Search () @@ -238,6 +244,13 @@ return value; } +// menu selection Patterns +const YCPValue& PkgNames::Patterns () +{ + static const YCPValue value = createIdValue ( "patterns" ); + return value; +} + // menu selection Installation Summary const YCPValue& PkgNames::Whatif () { @@ -1139,6 +1152,62 @@ return value; } +const string PkgNames::MenuFilter() +{ + // menu Filter + static const string value = _( "&Filter" ); + return value; +} + +const string PkgNames::MenuEntryRPMGroups() +{ + // menu entry Selections + static const string value = _( "&RPM Groups" ); + return value; +} + +const string PkgNames::MenuEntrySelections() +{ + // menu entry Selections + static const string value = _( "Se&lections" ); + return value; +} + +const string PkgNames::MenuEntryPatterns() +{ + // menu entry Patterns + static const string value = _( "Pa&tterns" ); + return value; +} + +const string PkgNames::MenuEntrySearch() +{ + // menu entry Search + static const string value = _( "&Search" ); + return value; +} + +const string PkgNames::MenuEntryInstPkg() +{ + // menu entry Installed Packages + static const string value = _( "Installed &Packages" ); + return value; +} + +const string PkgNames::MenuEntryInstSummary() +{ + // menu entry Installed Packages + static const string value = _( "&Installation Summary" ); + return value; +} + +const string PkgNames::MenuEntryUpdateList() +{ + // menu entry Update List + static const string value = _( "&Update List" ); + return value; +} + const string PkgNames::MenuEtc() { // menu Etc. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/PkgNames.h new/yast2-ncurses-2.13.30/src/PkgNames.h --- old/yast2-ncurses-2.13.29/src/PkgNames.h 2006-05-09 11:08:58.000000000 +0200 +++ new/yast2-ncurses-2.13.30/src/PkgNames.h 2006-05-10 09:53:36.000000000 +0200 @@ -188,7 +188,8 @@ * Widget id of the menu item Selections */ static const YCPValue& Selections (); - + static const YCPValue& Patterns (); + /** * Widget id of the menu item update list */ @@ -228,7 +229,8 @@ * Widget id for internal use */ static const YCPValue& ReplaceMenu (); - + static const YCPValue& ReplaceFilter (); + /** * Widget id of the button disk space */ @@ -829,6 +831,16 @@ static const string TabooText(); static const string MoreSpaceText(); + static const string MenuFilter(); + static const string MenuEntryRPMGroups(); + static const string MenuEntrySelections(); + static const string MenuEntryPatterns(); + static const string MenuEntrySearch(); + static const string MenuEntryInstPkg(); + static const string MenuEntryInstSummary(); + static const string MenuEntryUpdateList(); + + /** * save/load selections */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.29/src/pkg_layout.ycp new/yast2-ncurses-2.13.30/src/pkg_layout.ycp --- old/yast2-ncurses-2.13.29/src/pkg_layout.ycp 2006-03-07 13:31:20.000000000 +0100 +++ new/yast2-ncurses-2.13.30/src/pkg_layout.ycp 2006-05-10 14:16:39.000000000 +0200 @@ -7,7 +7,7 @@ * * ncurses layout for package selection * - * $Id: pkg_layout.ycp 28407 2006-02-27 15:36:03Z mvidner $ + * $Id: pkg_layout.ycp 30813 2006-05-10 12:15:35Z gs $ */ { textdomain "packages"; @@ -15,17 +15,19 @@ return `VBox( `VSpacing(0.3), `HBox( `HSpacing(0.3), // label of the Filter menu ( keep it short ) - filters out a set of packages - `Left(`MenuButton( `opt(`key_F4), _( "&Filter" ), - // begin: menu items of the filter menu - // please note: use unique hotkeys until end: - [`item( `id("groups"), _( "&RPM Groups" ) ), - `item( `id("selections"), _( "Se&lections" ) ), - `item( `id("search"), _( "&Search" ) ), - `item( `id("installed"), _( "Installed &Packages" ) ), - `item( `id("whatif"), _( "&Installation Summary" ) ), - // end: menu items of the filter menu - `item( `id("updatelist"), _( "&Update List" ) ) ] - )), + `Left(`ReplacePoint(`id(`replacefilter),`MenuButton( `opt(`key_F4), _( "&Filter" ), + // begin: menu items of the filter menu + // please note: use unique hotkeys until end: + [`item( `id("groups"), _( "&RPM Groups" ) ), + `item( `id("selections"), _( "Se&lections" ) ), + `item( `id("search"), _( "&Search" ) ), + `item( `id("installed"), _( "Installed &Packages" ) ), + `item( `id("whatif"), _( "&Installation Summary" ) ), + // end: menu items of the filter menu + `item( `id("updatelist"), _( "&Update List" ) ) ] + ) + ) + ), // label Actions menu ( keep it short ) - actions to change status of a package `Left(`MenuButton( `opt(`key_F5), _( "A&ctions" ), // Please note: add an appropriate number of whitespaces to get a well ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...