Author: tgoettlicher Date: Thu Jul 30 10:57:57 2009 New Revision: 58213 URL: http://svn.opensuse.org/viewcvs/yast?rev=58213&view=rev Log: Fixed buggy search in keywords (bnc #470069) Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgSearchFilterView.cc trunk/qt-pkg/src/YQPkgSearchFilterView.h Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=58213&r1=58212&r2=58213&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jul 30 10:57:57 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 30 10:56:42 CEST 2009 - tgoettlicher@suse.de + +- Fixed buggy search in keywords (bnc #470069) + +------------------------------------------------------------------- Tue Jul 28 15:07:17 CEST 2009 - tgoettlicher@suse.de - Fixed closing tab mixes up view (bnc #513845) Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView.cc?rev=58213&r1=58212&r2=58213&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Thu Jul 30 10:57:57 2009 @@ -97,6 +97,8 @@ _searchInName = new QCheckBox( _( "&Name" ), gbox ); YUI_CHECK_NEW( _searchInName ); vLayout->addWidget(_searchInName); + _searchInKeywords = new QCheckBox( _( "&Keywords" ), gbox ); YUI_CHECK_NEW( _searchInKeywords ); + vLayout->addWidget(_searchInKeywords); _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); YUI_CHECK_NEW( _searchInSummary ); vLayout->addWidget(_searchInSummary); _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); YUI_CHECK_NEW( _searchInDescription ); @@ -115,6 +117,7 @@ _searchInName->setChecked( true ); + _searchInKeywords->setChecked( true ); _searchInSummary->setChecked( true ); layout->addStretch(); @@ -271,10 +274,7 @@ if ( _searchInRequires->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:requires") ); if ( _searchInProvides->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:provides") ); if ( _searchInFileList->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::filelist ); - - // always look in keywords so FATE #120368 is implemented - // but make this configurable later - query.addAttribute( zypp::sat::SolvAttr::keywords ); + if ( _searchInKeywords->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::keywords ); _searchText->setEnabled(false); _searchButton->setEnabled(false); Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView.h?rev=58213&r1=58212&r2=58213&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.h Thu Jul 30 10:57:57 2009 @@ -160,6 +160,7 @@ QPushButton * _searchButton; QCheckBox * _searchInName; + QCheckBox * _searchInKeywords; QCheckBox * _searchInSummary; QCheckBox * _searchInDescription; QCheckBox * _searchInRequires; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org