Hello community, here is the log from the commit of package yast2-ncurses checked in at Tue Dec 12 23:00:41 CET 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-12-06 17:30:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-12-12 14:33:59.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Dec 12 13:09:06 CET 2006 - gs@suse.de + +- Package Installation: add functionality 'Verify System' to Etc./ + Dependencies menu (Fate #301178) +- Online Update: patch searching ability added to Filter menu + (Fate #153197) +- 2.15.2 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.15.1.tar.bz2 New: ---- yast2-ncurses-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.WVAYOZ/_old 2006-12-12 23:00:32.000000000 +0100 +++ /var/tmp/diff_new_pack.WVAYOZ/_new 2006-12-12 23:00:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.15.1) +# spec file for package yast2-ncurses (Version 2.15.2) # # 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.15.1 +Version: 2.15.2 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.15.1.tar.bz2 +Source0: yast2-ncurses-2.15.2.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -44,7 +44,7 @@ %prep -%setup -n yast2-ncurses-2.15.1 +%setup -n yast2-ncurses-2.15.2 %build %{prefix}/bin/y2tool y2autoconf @@ -77,6 +77,12 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Tue Dec 12 2006 - gs@suse.de +- Package Installation: add functionality 'Verify System' to Etc./ + Dependencies menu (Fate #301178) +- Online Update: patch searching ability added to Filter menu + (Fate #153197) +- 2.15.2 * Tue Dec 05 2006 - kmachalkova@suse.cz - Added RunInTerminal UI builtin for running external programs in the same terminal ++++++ yast2-ncurses-2.15.1.tar.bz2 -> yast2-ncurses-2.15.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/VERSION new/yast2-ncurses-2.15.2/VERSION --- old/yast2-ncurses-2.15.1/VERSION 2006-12-05 10:33:06.000000000 +0100 +++ new/yast2-ncurses-2.15.2/VERSION 2006-12-12 14:34:39.000000000 +0100 @@ -1 +1 @@ -2.15.1 +2.15.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/configure.in new/yast2-ncurses-2.15.2/configure.in --- old/yast2-ncurses-2.15.1/configure.in 2006-12-06 17:15:04.000000000 +0100 +++ new/yast2-ncurses-2.15.2/configure.in 2006-12-12 11:06:53.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-ncurses, 2.15.1, http://bugs.opensuse.org/, yast2-ncurses) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/NCPopupDeps.cc new/yast2-ncurses-2.15.2/src/NCPopupDeps.cc --- old/yast2-ncurses-2.15.1/src/NCPopupDeps.cc 2006-10-31 16:07:07.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/NCPopupDeps.cc 2006-12-12 11:19:52.000000000 +0100 @@ -189,7 +189,7 @@ // showDependencies // // -bool NCPopupDeps::showDependencies( ) +bool NCPopupDeps::showDependencies( NCPkgSolverAction action ) { if ( !problemw ) return true; @@ -202,13 +202,13 @@ // evaluate the result and fill the list with packages // which have unresolved deps - bool success = solve (problemw); + bool success = solve (problemw, action ); if (!success) { // show first dependency showSolutions( problemw->getCurrentItem() ); - NCursesEvent input = showDependencyPopup(); // show the dependencies + NCursesEvent input = showDependencyPopup( action ); // show the dependencies if ( input == NCursesEvent::cancel && input.detail != NCursesEvent::USERDEF ) @@ -222,7 +222,7 @@ } -bool NCPopupDeps::solve( NCSelectionBox * problemw) +bool NCPopupDeps::solve( NCSelectionBox * problemw, NCPkgSolverAction action ) { if ( !problemw ) return false; @@ -236,8 +236,20 @@ info.popup(); zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver(); - bool success = resolver->resolvePool(); + bool success = false; + switch ( action ) + { + case S_Solve: + success = resolver->resolvePool(); + break; + case S_Verify: + success = resolver->verifySystem(); + break; + default: + NCERR << "Unknown action for resolve" << endl; + } + info.popdown(); if (success) @@ -317,13 +329,13 @@ // // DESCRIPTION : // -NCursesEvent NCPopupDeps::showDependencyPopup( ) +NCursesEvent NCPopupDeps::showDependencyPopup( NCPkgSolverAction action ) { postevent = NCursesEvent(); do { popupDialog(); - } while ( postAgain() ); + } while ( postAgain( action ) ); popdownDialog(); @@ -368,7 +380,7 @@ // // DESCRIPTION : // -bool NCPopupDeps::postAgain() +bool NCPopupDeps::postAgain( NCPkgSolverAction action ) { if ( ! postevent.widget ) return false; @@ -404,7 +416,7 @@ resolver->applySolutions (solutions); // and solve again - bool success = solve (problemw); + bool success = solve (problemw, action ); if ( !success ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/NCPopupDeps.h new/yast2-ncurses-2.15.2/src/NCPopupDeps.h --- old/yast2-ncurses-2.15.1/src/NCPopupDeps.h 2006-10-31 16:07:11.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/NCPopupDeps.h 2006-12-12 11:19:52.000000000 +0100 @@ -53,6 +53,13 @@ NCPopupDeps & operator=( const NCPopupDeps & ); NCPopupDeps ( const NCPopupDeps & ); +public: + enum NCPkgSolverAction { + S_Solve, + S_Verify, + S_Unknown + }; + private: typedef std::vector<std::pair< @@ -79,7 +86,7 @@ NCSelectionBox * problemw; // resolver problems - virtual bool postAgain(); + virtual bool postAgain( NCPkgSolverAction action ); virtual NCursesEvent wHandleInput( wint_t ch ); @@ -90,11 +97,11 @@ virtual long nicesize(YUIDimension dim); - NCursesEvent showDependencyPopup( ); + NCursesEvent showDependencyPopup( NCPkgSolverAction action ); - bool showDependencies( ); + bool showDependencies( NCPkgSolverAction action ); - bool solve( NCSelectionBox * problemw ); + bool solve( NCSelectionBox * problemw, NCPkgSolverAction action ); bool showSolutions( int index ); // for the currently selected problem, choose this solution diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/NCPopupSearch.cc new/yast2-ncurses-2.15.2/src/NCPopupSearch.cc --- old/yast2-ncurses-2.15.1/src/NCPopupSearch.cc 2006-08-18 13:12:37.000000000 +0200 +++ new/yast2-ncurses-2.15.2/src/NCPopupSearch.cc 2006-12-12 14:18:20.000000000 +0100 @@ -29,6 +29,12 @@ #include "PkgNames.h" #include "PackageSelector.h" +#include "NCi18n.h" + +/* + Textdomain "packages" +*/ + /////////////////////////////////////////////////////////////////// // // @@ -49,7 +55,10 @@ , cancelButton( 0 ) , packager( pkger ) { - createLayout( YCPString(PkgNames::PackageSearch()) ); + if ( !packager->isYouMode() ) + createLayout( YCPString(PkgNames::PackageSearch()) ); + else + createLayout( YCPString( _("Search for Patch Name") ) ); } /////////////////////////////////////////////////////////////////// @@ -105,42 +114,45 @@ vSplit2->addChild( new NCSpacing( vSplit, opt, 0.6, false, true ) ); vSplit->addChild( frame0 ); - // add the checkBox ignore case - NCSplit * hSplit2 = new NCSplit( vSplit, opt, YD_HORIZ ); - vSplit->addChild( hSplit2 ); - ignoreCase = new NCCheckBox( hSplit2, opt, YCPString(PkgNames::IgnoreCase()), true ); - hSplit2->addChild( new NCSpacing( hSplit2, opt, 0.1, true, false ) ); - hSplit2->addChild( ignoreCase ); - - vSplit->addChild( new NCSpacing( vSplit, opt, 0.6, false, true ) ); // VSpacing - - // add a frame containing the other check boxes - opt.isHStretchable.setValue( true ); - opt.isVStretchable.setValue( true ); - NCFrame * frame = new NCFrame( vSplit, opt, YCPString(PkgNames::SearchIn()) ); - NCSplit * vSplit3 = new NCSplit( frame, opt, YD_VERT ); - - opt.isVStretchable.setValue( false ); - checkName = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckName()), true ); - checkSummary = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckSummary()), true ); - checkDescr = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckDescr()), false ); - checkProvides = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckProvides()), false ); - checkRequires = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckRequires()), false ); - - vSplit3->addChild( checkName ); - vSplit3->addChild( checkSummary ); - vSplit3->addChild( checkDescr ); - vSplit3->addChild( checkProvides ); - vSplit3->addChild( checkRequires ); + if ( !packager->isYouMode() ) + { + // add the checkBox ignore case + NCSplit * hSplit2 = new NCSplit( vSplit, opt, YD_HORIZ ); + vSplit->addChild( hSplit2 ); + ignoreCase = new NCCheckBox( hSplit2, opt, YCPString(PkgNames::IgnoreCase()), true ); + hSplit2->addChild( new NCSpacing( hSplit2, opt, 0.1, true, false ) ); + hSplit2->addChild( ignoreCase ); + + vSplit->addChild( new NCSpacing( vSplit, opt, 0.6, false, true ) ); // VSpacing + + // add a frame containing the other check boxes + opt.isHStretchable.setValue( true ); + opt.isVStretchable.setValue( true ); + NCFrame * frame = new NCFrame( vSplit, opt, YCPString(PkgNames::SearchIn()) ); + NCSplit * vSplit3 = new NCSplit( frame, opt, YD_VERT ); + + opt.isVStretchable.setValue( false ); + checkName = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckName()), true ); + checkSummary = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckSummary()), true ); + checkDescr = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckDescr()), false ); + checkProvides = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckProvides()), false ); + checkRequires = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckRequires()), false ); + + vSplit3->addChild( checkName ); + vSplit3->addChild( checkSummary ); + vSplit3->addChild( checkDescr ); + vSplit3->addChild( checkProvides ); + vSplit3->addChild( checkRequires ); - frame->addChild( vSplit3 ); - vSplit->addChild( frame ); + frame->addChild( vSplit3 ); + vSplit->addChild( frame ); - vSplit->addChild( new NCSpacing( vSplit, opt, 0.8, false, true ) ); // VSpacing + vSplit->addChild( new NCSpacing( vSplit, opt, 0.8, false, true ) ); // VSpacing + } NCSplit * hSplit3 = new NCSplit( vSplit, opt, YD_HORIZ ); vSplit->addChild( hSplit3 ); - + // add the cancel and the ok button opt.key_Fxx.setValue( 10 ); okButton = new NCPushButton( hSplit3, opt, YCPString(PkgNames::OKLabel()) ); @@ -157,6 +169,7 @@ hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.4, true, false ) ); hSplit3->addChild( cancelButton ); hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.2, true, false ) ); + } /////////////////////////////////////////////////////////////////// @@ -217,11 +230,19 @@ long NCPopupSearch::nicesize(YUIDimension dim) { long vdim; - if ( NCurses::lines() > 20 ) - vdim = 20; + + if ( !packager->isYouMode() ) + { + if ( NCurses::lines() > 20 ) + vdim = 20; + else + vdim = NCurses::lines()-4; + } else - vdim = NCurses::lines()-4; - + { + vdim = 10; + } + return ( dim == YD_HORIZ ? NCurses::cols()/2 : vdim ); } /////////////////////////////////////////////////////////////////// @@ -277,15 +298,22 @@ filter = postevent.result->asString(); } - // fill the package list with packages matching the search expression - packager->fillSearchList( filter, - getCheckBoxValue( ignoreCase ), - getCheckBoxValue( checkName ), - getCheckBoxValue( checkSummary ), - getCheckBoxValue( checkDescr ), - getCheckBoxValue( checkProvides ), - getCheckBoxValue( checkRequires ) - ); + if ( !packager->isYouMode() ) + { + // fill the package list with packages matching the search expression + packager->fillSearchList( filter, + getCheckBoxValue( ignoreCase ), + getCheckBoxValue( checkName ), + getCheckBoxValue( checkSummary ), + getCheckBoxValue( checkDescr ), + getCheckBoxValue( checkProvides ), + getCheckBoxValue( checkRequires ) + ); + } + else + { + packager->fillPatchSearchList( filter ); + } } if ( postevent == NCursesEvent::button || postevent == NCursesEvent::cancel ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PackageSelector.cc new/yast2-ncurses-2.15.2/src/PackageSelector.cc --- old/yast2-ncurses-2.15.1/src/PackageSelector.cc 2006-11-29 14:44:08.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PackageSelector.cc 2006-12-12 12:49:05.000000000 +0100 @@ -161,6 +161,7 @@ // Etc. menu eventHandlerMap[ PkgNames::ShowDeps()->toString() ] = &PackageSelector::DependencyHandler; eventHandlerMap[ PkgNames::AutoDeps()->toString() ] = &PackageSelector::DependencyHandler; + eventHandlerMap[ PkgNames::VerifySystem()->toString() ] = &PackageSelector::DependencyHandler; eventHandlerMap[ PkgNames::SaveSel()->toString() ] = &PackageSelector::SelectionHandler; eventHandlerMap[ PkgNames::LoadSel()->toString() ] = &PackageSelector::SelectionHandler; eventHandlerMap[ PkgNames::Testcase()->toString() ] = &PackageSelector::TestcaseHandler; @@ -208,14 +209,14 @@ // create the filter popup filterPopup = new NCPopupTree( wpos( 1, 1 ), this ); - // create the search popup - searchPopup = new NCPopupSearch( wpos( 1, 1 ), this ); - // the file popup filePopup = new NCPopupFile( wpos( 1, 1), floppyDevice, this ); } + + // create the search popup + searchPopup = new NCPopupSearch( wpos( 1, 1 ), this ); - // the dependency popups + // the dependency popup depsPopup = new NCPopupDeps( wpos( 1, 1 ), this ); // the disk space popup @@ -705,6 +706,57 @@ /////////////////////////////////////////////////////////////////// // +// fillPatchSearchList +// +// Fills the patch list with search results +// +bool PackageSelector::fillPatchSearchList( const YCPString & expr ) +{ + NCPkgTable * packageList = getPackageList(); + + if ( !packageList + || expr.isNull() ) + { + return false; + } + + // clear the patch list + packageList->itemsCleared (); + // get the patch list and sort it + list<ZyppSel> patchList( zyppPatchesBegin (), zyppPatchesEnd () ); + patchList.sort( sortByName ); + list<ZyppSel>::iterator listIt = patchList.begin(); + + while ( listIt != patchList.end() ) + { + ZyppPatch patchPtr = tryCastToZyppPatch( ( *listIt)->theObj() ); + + if ( patchPtr ) + { + if ( match( (*listIt)->name(), expr->value(), true ) ) + { + // search sucessful + packageList->createPatchEntry( patchPtr, *listIt ); + } + } + ++listIt; + } + // show the patch list with search result + packageList->drawList(); + + // set filter label to 'Search' + YWidget * filterLabel = y2ui->widgetWithId( PkgNames::Filter(), true ); + if ( filterLabel ) + { + static_cast<NCLabel *>(filterLabel)->setLabel( YCPString(PkgNames::SearchResults()) ); + } + + return true; +} + + +/////////////////////////////////////////////////////////////////// +// // fillPatchList // // Fills the package table with the list of YOU patches @@ -1424,6 +1476,12 @@ updatePackageList(); showDiskSpace(); } + else if ( event.selection->compare( PkgNames::VerifySystem() ) == YO_EQUAL ) + { + verifyPackageDependencies(); + updatePackageList(); + showDiskSpace(); + } else if ( event.selection->compare( PkgNames::AutoDeps() ) == YO_EQUAL ) { char menu[2000]; @@ -1432,7 +1490,8 @@ { snprintf ( menu, sizeof(menu) - 1, "`MenuButton( \"%s\", [" - "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ) ] )" + "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," + "`item( `id(\"testcase\"), \"%s\" )" #ifdef FIXME "," "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" @@ -1441,7 +1500,9 @@ PkgNames::MenuEtc().c_str(), PkgNames::MenuDeps().c_str(), PkgNames::MenuCheckDeps().c_str(), - PkgNames::MenuNoAutoDeps().c_str() + PkgNames::MenuNoAutoDeps().c_str(), + PkgNames::MenuVerifySystem().c_str(), + PkgNames::MenuTestCase().c_str() #ifdef FIXME , PkgNames::MenuSel().c_str(), @@ -1468,7 +1529,8 @@ { snprintf ( menu, sizeof(menu) - 1, "`MenuButton( \"%s\", [" - "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ) ] )" + "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," + "`item( `id(\"testcase\"), \"%s\" )" #ifdef FIXME "," "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" @@ -1477,7 +1539,9 @@ PkgNames::MenuEtc().c_str(), PkgNames::MenuDeps().c_str(), PkgNames::MenuCheckDeps().c_str(), - PkgNames::MenuAutoDeps().c_str() + PkgNames::MenuAutoDeps().c_str(), + PkgNames::MenuVerifySystem().c_str(), + PkgNames::MenuTestCase().c_str() #ifdef FIXME , PkgNames::MenuSel().c_str(), @@ -2234,12 +2298,22 @@ && (doit || autoCheck) ) { NCMIL << "Checking dependencies" << endl; - cancel = depsPopup->showDependencies( ); + cancel = depsPopup->showDependencies( NCPopupDeps::S_Solve ); } return cancel; } +bool PackageSelector::verifyPackageDependencies () +{ + bool cancel = false; + if ( depsPopup ) + { + cancel = depsPopup->showDependencies( NCPopupDeps::S_Verify ); + } + return cancel; +} + /////////////////////////////////////////////////////////////////// // // showDependencies diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PackageSelector.h new/yast2-ncurses-2.15.2/src/PackageSelector.h --- old/yast2-ncurses-2.15.1/src/PackageSelector.h 2006-11-10 16:19:49.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PackageSelector.h 2006-12-12 12:49:05.000000000 +0100 @@ -187,6 +187,9 @@ bool checkProvides, bool checkRequires ); + bool fillPatchSearchList( const YCPString & expr ); + + bool isYouMode() { return youMode; } /** * Gets default RPM group (the first group) * @return YStringTreeItem * @@ -312,13 +315,18 @@ */ bool showPackageInformation ( ZyppObj pkgPtr, ZyppSel slbPtr ); - /** + /** * Checks and shows the dependencies * @param doit true: do the check, false: only check if auto check is on */ bool showPackageDependencies ( bool doit ); /** + * Verifies and shows the dependencies + */ + bool verifyPackageDependencies (); + + /** * Checks and shows the selectiondependencies */ void showSelectionDependencies ( ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PkgNames.cc new/yast2-ncurses-2.15.2/src/PkgNames.cc --- old/yast2-ncurses-2.15.1/src/PkgNames.cc 2006-11-10 16:19:49.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PkgNames.cc 2006-12-12 12:04:27.000000000 +0100 @@ -194,7 +194,12 @@ static const YCPValue value = createIdValue ( "showdeps" ); return value; } - +// the menu entry Etc./verify system +const YCPValue& PkgNames::VerifySystem () +{ + static const YCPValue value = createIdValue ( "verifysystem" ); + return value; +} // the menu entry Etc./auto check dep const YCPValue& PkgNames::AutoDeps () { @@ -1263,6 +1268,21 @@ return value; } +const string PkgNames::MenuVerifySystem() +{ + // menu entry: verify system + // Please note: preserve the whitespaces at the beginning + static const string value = _( " &Verify System" ); + return value; +} + +const string PkgNames::MenuTestCase() +{ + // menu entry: generate test case for solver + static const string value = _( "Generate Dependency Resolver &Test Case" ); + return value; +} + const string PkgNames::MenuSel() { // submenu: selections diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PkgNames.h new/yast2-ncurses-2.15.2/src/PkgNames.h --- old/yast2-ncurses-2.15.1/src/PkgNames.h 2006-11-10 16:19:49.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PkgNames.h 2006-12-12 12:04:27.000000000 +0100 @@ -215,6 +215,11 @@ */ static const YCPValue& ShowDeps (); + /** + * Widget id of the Etc./Dependencies/verify system menu item + */ + static const YCPValue& VerifySystem (); + /** * Widget id of the Etc./Dependencies/Auto check menu item */ @@ -838,6 +843,8 @@ static const string MenuCheckDeps(); static const string MenuAutoDeps(); static const string MenuNoAutoDeps(); + static const string MenuVerifySystem(); + static const string MenuTestCase(); static const string MenuSel(); static const string MenuSaveSel(); static const string MenuLoadSel(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/pkg_layout.ycp new/yast2-ncurses-2.15.2/src/pkg_layout.ycp --- old/yast2-ncurses-2.15.1/src/pkg_layout.ycp 2006-11-29 17:02:30.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/pkg_layout.ycp 2006-12-12 11:23:53.000000000 +0100 @@ -7,7 +7,7 @@ * * ncurses layout for package selection * - * $Id: pkg_layout.ycp 34651 2006-11-29 16:02:29Z kmachalkova $ + * $Id: pkg_layout.ycp 34907 2006-12-12 10:23:51Z gs $ */ { textdomain "packages"; @@ -84,7 +84,8 @@ [`menu( _( "&Dependencies" ), // menu items of the Etc./Dependencies submenu [`item( `id("showdeps"), _( " &Check Dependencies Now" ) ), - `item( `id("autodeps"), _( "[X] &Automatic Dependency Check" ) ) ] + `item( `id("autodeps"), _( "[X] &Automatic Dependency Check" ) ), + `item( `id("verifysystem"), _( " &Verify System" ) ) ] ), `item( `id("testcase"), _( "Generate Dependency Resolver &Test Case" ) ) /*#ifdef FIXME diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/you_layout.ycp new/yast2-ncurses-2.15.2/src/you_layout.ycp --- old/yast2-ncurses-2.15.1/src/you_layout.ycp 2006-11-10 16:19:48.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/you_layout.ycp 2006-12-12 12:52:04.000000000 +0100 @@ -7,7 +7,7 @@ * * ncurses layout for YOU * - * $Id: you_layout.ycp 34118 2006-11-07 13:37:19Z gs $ + * $Id: you_layout.ycp 34916 2006-12-12 11:52:02Z gs $ */ { textdomain "packages"; @@ -27,7 +27,7 @@ `item( `id("security"), _( "&Security" ) ), `item( `id("optional"), _( "&Optional" ) ), // end: - `item( `id("yast2"), _( "YaS&T2" ) ) + `item( `id("search"), _( "S&earch" ) ) ] )), // label of the Online Update 'Actions' menu (keep it short) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org