Author: gs Date: Wed Nov 28 12:52:02 2007 New Revision: 42473 URL: http://svn.opensuse.org/viewcvs/yast?rev=42473&view=rev Log: call File/LinkHandler correctly Modified: trunk/ncurses/src/STATUS trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/src/STATUS URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/STATUS?rev=42473&r1=42472&r2=42473&view=diff ============================================================================== --- trunk/ncurses/src/STATUS (original) +++ trunk/ncurses/src/STATUS Wed Nov 28 12:52:02 2007 @@ -52,15 +52,16 @@ TODO: - create YOU layout +- test hyperlinks ("pkg:") TESTED: - Filter menu works - Actions menu works - Information menu works -- Etc menu works except of replacing the menu item autocheck on/off and FileHandler -- handle hyperlinks ("pkg:") -> see handleEvent( ) +- Etc menu works except of replacing the menu item autocheck on/off - "Solving ..." popup in NCPkgPopupDeps() is shown correctly - +- "Automatic changes" popup OK +- "License agreement" popup OK Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=42473&r1=42472&r2=42473&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed Nov 28 12:52:02 2007 @@ -205,13 +205,7 @@ // Action menu -> DONE - // Etc. menu - eventHandlerMap[ NCPkgNames::ShowDeps()->toString() ] = &NCPackageSelector::DependencyHandler; - eventHandlerMap[ NCPkgNames::AutoDeps()->toString() ] = &NCPackageSelector::DependencyHandler; - eventHandlerMap[ NCPkgNames::VerifySystem()->toString() ] = &NCPackageSelector::DependencyHandler; - eventHandlerMap[ NCPkgNames::ExportToFile()->toString() ] = &NCPackageSelector::FileHandler; - eventHandlerMap[ NCPkgNames::ImportFromFile()->toString() ] = &NCPackageSelector::FileHandler; - eventHandlerMap[ NCPkgNames::Testcase()->toString() ] = &NCPackageSelector::TestcaseHandler; + // Etc. menu -> DONE // Help menu eventHandlerMap[ NCPkgNames::GeneralHelp()->toString() ] = &NCPackageSelector::HelpHandler; @@ -528,10 +522,6 @@ { bool retVal = false; - // TODO: handle hyperlinks - // string currentId = ""; - // if (currentId->asString()->value().substr(0, 4) == "pkg:" ) - if ( event == NCursesEvent::handled ) return false; @@ -547,20 +537,29 @@ else if ( event == NCursesEvent::menu ) { if ( event.widget == filterMenu ) + // filter out packages/patches retVal = FilterHandler( event ); else if ( event.widget == actionMenu ) + // change package/patch status retVal = StatusHandler( event ); else if ( event.widget == infoMenu ) + // show package/patch information retVal = InformationHandler( event ); else if ( event.widget == etcMenu ) { if ( event.selection == testcaseItem ) + // generate testcase retVal = TestcaseHandler( event ); else if ( (event.selection == exportItem) || (event.selection == importItem) ) + // import/export file list retVal = FileHandler( event ); else + // check package dependencies retVal = DependencyHandler( event ); } + else if ( event.selection->label().substr(0,4) == "pkg:" ) + // handle hyper links + retVal = LinkHandler( event.selection->label() ); } @@ -2128,10 +2127,8 @@ return false; } - string selId = getMenuId( event.selection ); - //Export package list into file - if ( selId == NCPkgNames::ExportToFile()->toString() ) + if ( event.selection == exportItem ) { //Ask for file to save into YCPValue filename = YNCursesUI::ui()->askForSaveFileName( YCPString(DEFAULT_EXPORT_FILE_NAME), @@ -2184,7 +2181,7 @@ } //Import package list from file - else if ( selId == NCPkgNames::ImportFromFile()->toString() ) + else if ( event.selection == importItem ) { //ask for file to open YCPValue filename = YNCursesUI::ui()->askForExistingFile( YCPString(DEFAULT_EXPORT_FILE_NAME), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org