Author: gs Date: Thu Nov 12 16:20:45 2009 New Revision: 59500 URL: http://svn.opensuse.org/viewcvs/yast?rev=59500&view=rev Log: Backport bug-fixes and features from 11.2 2.17.15 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.h branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgPackageDetails.cc branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.cc branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.h branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION Thu Nov 12 16:20:45 2009 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu Nov 12 16:20:45 2009 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Nov 10 17:36:05 CET 2009 - gs@suse.de + +- Backport bug-fixes and features from 11.2: +- Remove use of deprecated Package::filenames. +- Add name of source package to technical details view +- Speeding up scrolling big package lists left/right (bnc#498267) +- Do not implicitly search for matching keywords (added a new switch + into search options to include/exclude keywords) (bnc#470069) +- 2.17.15 + +------------------------------------------------------------------- Thu Nov 5 11:53:50 CET 2009 - gs@suse.de - Start with correct filter view on option `repoMode (repositories) Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc Thu Nov 12 16:20:45 2009 @@ -162,6 +162,7 @@ bool NCPkgFilterSearch::fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, @@ -201,8 +202,6 @@ q.addString( expr ); q.addKind( zypp::ResKind::package ); - //no clue what this means, but it segfaults if it's not here :) - q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( !ignoreCase ) q.setCaseSensitive(); @@ -210,6 +209,8 @@ q.addAttribute( zypp::sat::SolvAttr::name ); if ( checkSummary ) q.addAttribute( zypp::sat::SolvAttr::summary ); + if ( checkKeywords ) + q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( checkDescr ) q.addAttribute( zypp::sat::SolvAttr::description ); if ( checkProvides ) @@ -275,6 +276,7 @@ getCheckBoxValue( ignoreCase ), settings->doCheckName(), settings->doCheckSummary(), + settings->doCheckKeywords(), settings->doCheckDescr(), settings->doCheckProvides(), settings->doCheckRequires() Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.h?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.h Thu Nov 12 16:20:45 2009 @@ -83,6 +83,7 @@ bool fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgPackageDetails.cc?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgPackageDetails.cc Thu Nov 12 16:20:45 2009 @@ -169,6 +169,13 @@ text += package->group (); text += "<br>"; + // name of the source package + text += "<b>" + _("Source Package: ") + "</b>"; + text += package->sourcePkgName(); + text += "-"; + text += package->sourcePkgEdition().asString(); + text += "<br>"; + //authors, in one line text += NCPkgStrings::Authors(); list<string> authors = package->authors(); // zypp::Package @@ -191,7 +198,8 @@ text += commonHeader( slbPtr->theObj() ); text += NCPkgStrings::ListOfFiles(); // get the file list from the package manager/show the list - list<string> fileList = package->filenames(); + zypp::Package::FileList pkgfilelist( package->filelist() ); + list<string> fileList( pkgfilelist.begin(), pkgfilelist.end() ); text += createText( fileList, false ) ; } Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.cc?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.cc Thu Nov 12 16:20:45 2009 @@ -39,7 +39,9 @@ checkName = new YItem ( _( "Name of the Package" ), true); items.push_back (checkName); checkSummary = new YItem ( _( "Summary" ), true); - items.push_back (checkSummary); + items.push_back (checkSummary); + checkKeywords = new YItem ( _( "Keywords" )); + items.push_back (checkKeywords); checkDescr = new YItem ( _( "Description (time-consuming)" )); items.push_back (checkDescr); checkProvides = new YItem ( _( "Provides" )); @@ -58,10 +60,14 @@ { return checkSummary->selected(); } +bool NCPkgSearchSettings::doCheckKeywords() +{ + return checkKeywords->selected(); +} bool NCPkgSearchSettings::doCheckDescr() { return checkDescr->selected(); -} +} bool NCPkgSearchSettings::doCheckProvides() { return checkProvides->selected(); Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.h?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgSearchSettings.h Thu Nov 12 16:20:45 2009 @@ -35,6 +35,7 @@ YItemCollection items; YItem *checkName; YItem *checkSummary; + YItem *checkKeywords; YItem *checkDescr; YItem *checkProvides; YItem *checkRequires; @@ -47,6 +48,7 @@ bool doCheckName(); bool doCheckSummary(); + bool doCheckKeywords(); bool doCheckDescr(); bool doCheckProvides(); bool doCheckRequires(); Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc?rev=59500&r1=59499&r2=59500&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgTable.cc Thu Nov 12 16:20:45 2009 @@ -797,9 +797,16 @@ NCTable::wHandleInput( key); break; } - default: { + case '-': + case '+': + case '>': + case '<': + case '!': + case '*': { // set the new status changeObjStatus( key ); + } + default: { break; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org