Author: kmachalkova Date: Wed Feb 27 17:44:03 2008 New Revision: 45090 URL: http://svn.opensuse.org/viewcvs/yast?rev=45090&view=rev Log: moved Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCPa... ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Wed Feb 27 17:44:03 2008 @@ -151,11 +151,6 @@ , patchpkgsItem( 0 ) , pkgversionsItem( 0 ) , etcMenu( 0 ) - , depsItem( 0 ) - , showdepsItem( 0 ) - , autodepsItem( 0 ) - , noautodepsItem( 0 ) - , verifyItem( 0 ) , allpksItem( 0 ) , exportItem( 0 ) , importItem( 0 ) @@ -550,9 +545,6 @@ 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 @@ -1725,74 +1717,6 @@ /////////////////////////////////////////////////////////////////// // -// Dependency Handler -// -// -bool NCPackageSelector::DependencyHandler( const NCursesEvent& event ) -{ - if ( !event.selection ) - { - return false; - } - - NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), "", - _( "All package dependencies are OK." ), - NCPkgNames::OKLabel() ); - info->setNiceSize( 35, 5 ); - - if ( event.selection == showdepsItem ) - { - bool ok = false; - - if ( depsPopup ) - { - NCMIL << "Checking dependencies" << endl; - depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, &ok ); - } - - if ( ok ) - { - info->showInfoPopup(); - YDialog::deleteTopmostDialog(); - } - - // update the package list and the disk space info - updatePackageList(); - showDiskSpace(); - } - else if ( event.selection == verifyItem ) - { - verifyPackageDependencies(); - updatePackageList(); - showDiskSpace(); - } - else if ( event.selection == autodepsItem ) - { - etcMenu->deleteAllItems(); - - autoCheck = false; // reset autoCheck and create new items - createEtcMenu(); - } - else if ( event.selection == noautodepsItem ) - { - etcMenu->deleteAllItems(); - - autoCheck = true; // set autoCheck and create new items - createEtcMenu(); - } - - NCPkgTable * packageList = PackageList(); - - if ( packageList ) - { - packageList->setKeyboardFocus(); - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -// // FilterHandler // // Opens the popup with rpm group tree, selections ... and display the @@ -2531,49 +2455,6 @@ return cancel; } -bool NCPackageSelector::verifyPackageDependencies () -{ - bool ok = false; - bool cancel = false; - - NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), - "", - _( "System dependencies verify OK." ), - NCPkgNames::OKLabel() - ); - info->setNiceSize( 30, 5 ); - - NCMIL << "Verifying system" << endl; - - if ( depsPopup ) - { - saveState(); - //call the solver (with S_Verify it displays no popup) - //cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); - cancel = verifySystem ( &ok ); - - //display the popup with automatic changes - NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), this ); - NCursesEvent input = autoChangePopup->showInfoPopup(); - - if ( input == NCursesEvent::cancel ) - { - // user clicked on Cancel - restoreState(); - cancel = true; - } - if ( ok && input == NCursesEvent::button ) - { - // dependencies OK, no automatic changes/the user has accepted the changes - info->showInfoPopup(); - } - } - - YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog - - return cancel; -} - /////////////////////////////////////////////////////////////////// // // showDependencies Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCPa... ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Wed Feb 27 17:44:03 2008 @@ -342,13 +342,6 @@ */ bool SearchHandler ( const NCursesEvent& event ); - /** - * Handler function for menu selection "Etc./Check dependencies" - * @param event The Ncurses event - * @return bool - */ - bool DependencyHandler( const NCursesEvent& event ); - /** * Handler function for the "Information" menu * @param event The Ncurses event @@ -419,11 +412,6 @@ bool showPackageDependencies ( bool doit ); /** - * Verifies and shows the dependencies - */ - bool verifyPackageDependencies (); - - /** * Checks and shows the selectiondependencies */ void showSelectionDependencies ( ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org