Author: gs Date: Wed Nov 28 16:56:16 2007 New Revision: 42476 URL: http://svn.opensuse.org/viewcvs/yast?rev=42476&view=rev Log: replace menu item automatic check correctly Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPackageSelector.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=42476&r1=42475&r2=42476&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed Nov 28 16:56:16 2007 @@ -1772,26 +1772,17 @@ } else if ( event.selection == autodepsItem ) { - // FIXME - if ( autoCheck ) - { - if ( autodepsItem ) - delete autodepsItem; - - // menu entry: dependency check off - noautodepsItem = new YMenuItem( depsItem, _( "[X] &Automatic Dependency Check" ) ); + etcMenu->deleteAllItems(); - autoCheck = false; - } - else - { - if ( noautodepsItem ) - delete noautodepsItem; + autoCheck = false; // reset autoCheck and create new items + createEtcMenu(); + } + else if ( event.selection == noautodepsItem ) + { + etcMenu->deleteAllItems(); - // menu entry: dependency check off - autodepsItem = new YMenuItem( depsItem, _( "[ ] &Automatic Dependency Check" ) ); - autoCheck = true; - } + autoCheck = true; // set autoCheck and create new items + createEtcMenu(); } NCPkgTable * packageList = getPackageList(); @@ -3348,24 +3339,8 @@ etcMenu = new NCMenuButton( left4, _( "&Etc." ) ); YUI_CHECK_NEW( etcMenu ); etcMenu->setFunctionKey( 7 ); - - // menu item of the Etc. menu - package dependency check - depsItem = new YMenuItem( _( "&Dependencies" ) ); - // menu items of the Etc./Dependencies submenu - showdepsItem = new YMenuItem( depsItem, _( " &Check Dependencies Now" ) ); - autodepsItem = new YMenuItem( depsItem, _( "[X] &Automatic Dependency Check" ) ); - verifyItem = new YMenuItem( depsItem, _( " &Verify System" ) ); - // menu item - list of all packages in the system - allpksItem = new YMenuItem( _("All &Packages List" ) ); - exportItem = new YMenuItem( allpksItem, _("&Export to File") ); - importItem = new YMenuItem( allpksItem, _("&Import from File") ); - testcaseItem = new YMenuItem( _( "Generate Dependency Resolver &Test Case" ) ); - - YItemCollection itemCollection4; - itemCollection4.push_back( depsItem ); - itemCollection4.push_back( allpksItem ); - itemCollection4.push_back( testcaseItem ); - etcMenu->addItems( itemCollection4 ); + // add items to Etc. menu + createEtcMenu(); // add the package table YTableHeader * tableHeader = new YTableHeader(); @@ -3425,6 +3400,33 @@ } +void NCPackageSelector::createEtcMenu( ) +{ + // menu item of the Etc. menu - package dependency check + depsItem = new YMenuItem( _( "&Dependencies" ) ); + // menu items of the Etc./Dependencies submenu + showdepsItem = new YMenuItem( depsItem, _( " &Check Dependencies Now" ) ); + if ( autoCheck ) + // menu entry: dependency check off + autodepsItem = new YMenuItem( depsItem, _( "[X] &Automatic Dependency Check" ) ); + else + // menu entry: dependency check on + noautodepsItem = new YMenuItem( depsItem, _( "[ ] &Automatic Dependency Check" ) ); + + verifyItem = new YMenuItem( depsItem, _( " &Verify System" ) ); + // menu item - list of all packages in the system + allpksItem = new YMenuItem( _("All &Packages List" ) ); + exportItem = new YMenuItem( allpksItem, _("&Export to File") ); + importItem = new YMenuItem( allpksItem, _("&Import from File") ); + testcaseItem = new YMenuItem( _( "Generate Dependency Resolver &Test Case" ) ); + + YItemCollection itemCollection4; + itemCollection4.push_back( depsItem ); + itemCollection4.push_back( allpksItem ); + itemCollection4.push_back( testcaseItem ); + etcMenu->addItems( itemCollection4 ); +} + // // Fill package list with packages of default RPM group/update list or installable patches // Modified: trunk/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.h?rev=42476&r1=42475&r2=42476&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.h Wed Nov 28 16:56:16 2007 @@ -221,8 +221,17 @@ * @return void */ void createPkgLayout( YWidget * parent, NCPkgTable::NCPkgTableType type ); + void createEtcMenu(); + + /** + * Create layout for the Online Update + * @param parent Parent is PackageSelectorStart + * @param type The package table type + * @return void + */ void createYouLayout( YWidget * parent, NCPkgTable::NCPkgTableType type ); - + + /** * Fills the package table * @param label The selected RPM group (the label) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org