Author: lslezak Date: Tue Aug 2 19:58:01 2011 New Revision: 65150 URL: http://svn.opensuse.org/viewcvs/yast?rev=65150&view=rev Log: - added new ignoreAlreadyRecommended solver option to the dependencies submenu (bnc#668588) - 2.21.1 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgMenuDeps.cc trunk/ncurses-pkg/src/NCPkgMenuDeps.h Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=65150&r1=65149&r2=65150&view=diff ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Tue Aug 2 19:58:01 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes?rev=65150&r1=65149&r2=65150&view=diff ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Tue Aug 2 19:58:01 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 2 17:32:01 UTC 2011 - lslezak@suse.cz + +- added new ignoreAlreadyRecommended solver option to + the dependencies submenu (bnc#668588) +- 2.21.1 + +------------------------------------------------------------------- Tue Apr 26 11:10:46 CEST 2011 - gs@suse.de - Adjust NCTree params, require latest libyui Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=65150&r1=65149&r2=65150&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Tue Aug 2 19:58:01 2011 @@ -207,6 +207,16 @@ return zypp::getZYpp()->resolver()->setCleandepsOnRemove( on ); } +bool NCPackageSelector::isIgnoreAlreadyRecommended() +{ + return zypp::getZYpp()->resolver()->ignoreAlreadyRecommended(); +} + +void NCPackageSelector::setIgnoreAlreadyRecommended( bool on ) +{ + return zypp::getZYpp()->resolver()->setIgnoreAlreadyRecommended( on ); +} + bool NCPackageSelector::isVerifySystem( ) { return zypp::getZYpp()->resolver()->systemVerification(); Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=65150&r1=65149&r2=65150&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Tue Aug 2 19:58:01 2011 @@ -290,6 +290,9 @@ bool isCleanDepsOnRemove(); void setCleanDepsOnRemove( bool on ); + bool isIgnoreAlreadyRecommended(); + void setIgnoreAlreadyRecommended( bool on ); + bool isAllowVendorChange(); void setAllowVendorChange( bool on ); Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.cc?rev=65150&r1=65149&r2=65150&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuDeps.cc Tue Aug 2 19:58:01 2011 @@ -62,6 +62,10 @@ verifySystem = new YMenuItem( NO_CHECK_BOX + _("&Verify System Now") ); items.push_back( verifySystem ); + ignoreAlreadyRecommendedOpt = new YMenuItem( CHECK_BOX + _("&Ignore Recommended Packages for Already Installed Packages") ); + items.push_back( ignoreAlreadyRecommendedOpt ); + setSelected( ignoreAlreadyRecommendedOpt, pkg->isIgnoreAlreadyRecommended() ); + verifySystemOpt = new YMenuItem( CHECK_BOX + _("&System Verification Mode") ); items.push_back( verifySystemOpt ); @@ -94,6 +98,8 @@ return setVerifySystem(); else if (event.selection == cleanDepsOnRemove ) return setCleanDepsOnRemove(); + else if (event.selection == ignoreAlreadyRecommendedOpt ) + return setIgnoreAlreadyRecommended(); else if (event.selection == allowVendorChange ) return setAllowVendorChange(); else if (event.selection == testCase) @@ -177,6 +183,15 @@ return true; } +bool NCPkgMenuDeps::setIgnoreAlreadyRecommended() +{ + pkg->setIgnoreAlreadyRecommended( !pkg->isIgnoreAlreadyRecommended() ); + setSelected( ignoreAlreadyRecommendedOpt, pkg->isIgnoreAlreadyRecommended() ); + + return true; +} + + bool NCPkgMenuDeps::setAllowVendorChange() { pkg->setAllowVendorChange( !pkg->isAllowVendorChange() ); Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.h?rev=65150&r1=65149&r2=65150&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuDeps.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuDeps.h Tue Aug 2 19:58:01 2011 @@ -44,6 +44,7 @@ YMenuItem *checkNow; YMenuItem *verifySystem; YMenuItem *verifySystemOpt; + YMenuItem *ignoreAlreadyRecommendedOpt; YMenuItem *cleanDepsOnRemove; YMenuItem *allowVendorChange; YMenuItem *testCase; @@ -63,6 +64,8 @@ bool setCleanDepsOnRemove(); + bool setIgnoreAlreadyRecommended(); + bool setAllowVendorChange(); bool setVerifySystem(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org