Author: kmachalkova Date: Wed May 23 15:22:08 2007 New Revision: 38106 URL: http://svn.opensuse.org/viewcvs/yast?rev=38106&view=rev Log: Removed obsolete save/load selection stuff + related NCPkgPopupFile class - has been replaced by save/load pkgs and patterns (FaTE #300729) Removed: trunk/ncurses/src/pkg/NCPkgPopupFile.cc trunk/ncurses/src/pkg/NCPkgPopupFile.h Modified: trunk/ncurses/src/pkg/Makefile.am trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPackageSelector.h Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=38106&r1=38105&r2=38106&view=diff ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Wed May 23 15:22:08 2007 @@ -27,7 +27,6 @@ NCPkgStatusStrategy.h NCPkgStatusStrategy.cc \ NCPkgPopupDeps.h NCPkgPopupDeps.cc \ NCPkgPopupDiskspace.h NCPkgPopupDiskspace.cc \ - NCPkgPopupFile.h NCPkgPopupFile.cc \ NCPkgPopupDescr.h NCPkgPopupDescr.cc \ NCPkgPopupTable.h NCPkgPopupTable.cc \ NCPkgPopupSearch.h NCPkgPopupSearch.cc \ @@ -40,4 +39,4 @@ INCLUDES = -I$(srcdir)/.. -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS} -EXTRA_DIST = $(ydata_DATA) \ No newline at end of file +EXTRA_DIST = $(ydata_DATA) Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=38106&r1=38105&r2=38106&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed May 23 15:22:08 2007 @@ -31,7 +31,6 @@ #include "NCPkgPopupDiskspace.h" #include "NCPkgPopupTable.h" #include "NCPkgPopupDescr.h" -#include "NCPkgPopupFile.h" #include "NCPackageSelector.h" #include "YSelectionBox.h" #include "YNCursesUI.h" @@ -107,7 +106,6 @@ , languagePopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) - , filePopup( 0 ) , youMode( false ) , updateMode( false ) , testMode ( false ) @@ -175,8 +173,6 @@ eventHandlerMap[ NCPkgNames::VerifySystem()->toString() ] = &NCPackageSelector::DependencyHandler; eventHandlerMap[ NCPkgNames::ExportToFile()->toString() ] = &NCPackageSelector::FileHandler; eventHandlerMap[ NCPkgNames::ImportFromFile()->toString() ] = &NCPackageSelector::FileHandler; - eventHandlerMap[ NCPkgNames::SaveSel()->toString() ] = &NCPackageSelector::SelectionHandler; - eventHandlerMap[ NCPkgNames::LoadSel()->toString() ] = &NCPackageSelector::SelectionHandler; eventHandlerMap[ NCPkgNames::Testcase()->toString() ] = &NCPackageSelector::TestcaseHandler; // Help menu @@ -226,8 +222,6 @@ // create the filter popup filterPopup = new NCPkgPopupTree( wpos( 1, 1 ), this ); - // the file popup - filePopup = new NCPkgPopupFile( wpos( 1, 1), floppyDevice, this ); } // create the search popup @@ -271,10 +265,6 @@ { delete diskspacePopup; } - if ( filePopup ) - { - delete filePopup; - } if ( searchPopup ) { delete searchPopup; @@ -2218,40 +2208,6 @@ /////////////////////////////////////////////////////////////////// // -// SelectionHandler -// -// Save/Load selections -// -bool NCPackageSelector::SelectionHandler( const NCursesEvent& event ) -{ - NCPkgTable * packageList = getPackageList(); - if ( event.selection.isNull() - || !filePopup ) - { - return false; - } - - if ( event.selection->compare( NCPkgNames::SaveSel() ) == YO_EQUAL ) - { - filePopup->saveToFile(); - } - else if ( event.selection->compare( NCPkgNames::LoadSel() ) == YO_EQUAL ) - { - filePopup->loadFromFile(); - updatePackageList(); - showDiskSpace(); - } - - if ( packageList ) - { - packageList->setKeyboardFocus(); - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -// // CancelHandler // // Cancel button handler. Modified: trunk/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.h?rev=38106&r1=38105&r2=38106&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.h Wed May 23 15:22:08 2007 @@ -87,8 +87,6 @@ NCPkgPopupSearch * searchPopup; // the package search popup - NCPkgPopupFile * filePopup; // the save/load selection popup - bool youMode; // YOU bool updateMode; // Update bool testMode; // testing @@ -228,14 +226,7 @@ */ bool DependencyHandler( const NCursesEvent& event ); - /** - * Handler function for menu selection "Etc./Selections" - * @param event The Ncurses event - * @return bool - */ - bool SelectionHandler( const NCursesEvent& event ); - - /** + /** * Handler function for the "Information" menu * @param event The Ncurses event * @return bool -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org