![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-qt-pkg checked in at Thu Aug 14 03:20:28 CEST 2008. -------- --- yast2-qt-pkg/yast2-qt-pkg.changes 2008-07-25 16:06:33.000000000 +0200 +++ yast2-qt-pkg/yast2-qt-pkg.changes 2008-08-12 20:43:54.080635000 +0200 @@ -2 +2,18 @@ -Wed Jul 23 16:12:56 CEST 2008 - ma@suse.de +Tue Aug 12 17:50:53 CEST 2008 - dmacvicar@suse.de + +- package list should be sorted locale aware + (bnc#355255) + +------------------------------------------------------------------- +Mon Aug 11 18:23:19 CEST 2008 - dmacvicar@suse.de + +- Fixed bnc#394657 : package selector crashes when + selecting languages with keyboard + +------------------------------------------------------------------- +Tue Jul 29 08:38:41 CEST 2008 - tgoettlicher@suse.de + +- Fixed bnc #389174: changing packages with keyboard is broken + +------------------------------------------------------------------- +Wed Jul 23 16:12:56 CEST 2008 ma@suse.de @@ -181 +197,0 @@ -------------------------------------------------------------------- @@ -182,0 +199 @@ +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.o25475/_old 2008-08-14 03:18:28.000000000 +0200 +++ /var/tmp/diff_new_pack.o25475/_new 2008-08-14 03:18:28.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package yast2-qt-pkg (Version 2.17.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,7 +19,7 @@ Name: yast2-qt-pkg Version: 2.17.3 -Release: 1 +Release: 18 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,7 +82,15 @@ %_prefix/share/YaST2/images/* %changelog -* Wed Jul 23 2008 ma@suse.de +* Tue Aug 12 2008 dmacvicar@suse.de +- package list should be sorted locale aware + (bnc#355255) +* Mon Aug 11 2008 dmacvicar@suse.de +- Fixed bnc#394657 : package selector crashes when + selecting languages with keyboard +* Tue Jul 29 2008 tgoettlicher@suse.de +- Fixed bnc #389174: changing packages with keyboard is broken + Wed Jul 23 16:12:56 CEST 2008 ma@suse.de - Remove references to obsolete freshens dependencies. - V 2.17.3 * Thu Jul 17 2008 ma@suse.de ++++++ yast2-qt-pkg-2.17.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.3/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.17.3/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.17.3/package/yast2-qt-pkg.changes 2008-07-23 16:27:36.000000000 +0200 +++ new/yast2-qt-pkg-2.17.3/package/yast2-qt-pkg.changes 2008-08-12 20:04:45.000000000 +0200 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Tue Aug 12 17:50:53 CEST 2008 - dmacvicar@suse.de + +- package list should be sorted locale aware + (bnc#355255) + +------------------------------------------------------------------- +Mon Aug 11 18:23:19 CEST 2008 - dmacvicar@suse.de + +- Fixed bnc#394657 : package selector crashes when + selecting languages with keyboard + +------------------------------------------------------------------- +Tue Jul 29 08:38:41 CEST 2008 - tgoettlicher@suse.de + +- Fixed bnc #389174: changing packages with keyboard is broken + +------------------------------------------------------------------- Wed Jul 23 16:12:56 CEST 2008 ma@suse.de - Remove references to obsolete freshens dependencies. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.3/src/YQPkgLangList.cc new/yast2-qt-pkg-2.17.3/src/YQPkgLangList.cc --- old/yast2-qt-pkg-2.17.3/src/YQPkgLangList.cc 2008-07-23 16:27:36.000000000 +0200 +++ new/yast2-qt-pkg-2.17.3/src/YQPkgLangList.cc 2008-08-12 20:04:45.000000000 +0200 @@ -226,6 +226,43 @@ return S_NoInst; } +void +YQPkgLangListItem::setStatus( ZyppStatus newStatus, bool sendSignals ) +{ + ZyppStatus oldStatus = status(); + + switch ( newStatus ) + { + case S_Install: + if ( ! zypp::getZYpp()->pool().isRequestedLocale( _zyppLang ) ) + { + zypp::getZYpp()->pool().addRequestedLocale( _zyppLang ); + } + break; + case S_NoInst: + if ( zypp::getZYpp()->pool().isRequestedLocale( _zyppLang ) ) + { + zypp::getZYpp()->pool().eraseRequestedLocale( _zyppLang ); + } + break; + default: + return; + } + + if ( oldStatus != newStatus ) + { + applyChanges(); + + if ( sendSignals ) + { + _pkgObjList->updateItemStates(); + _pkgObjList->sendUpdatePackages(); + } + } + + setStatusIcon(); + _pkgObjList->sendStatusChanged(); +} bool YQPkgLangListItem::bySelection() const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.3/src/YQPkgLangList.h new/yast2-qt-pkg-2.17.3/src/YQPkgLangList.h --- old/yast2-qt-pkg-2.17.3/src/YQPkgLangList.h 2008-07-23 16:27:36.000000000 +0200 +++ new/yast2-qt-pkg-2.17.3/src/YQPkgLangList.h 2008-08-12 20:04:45.000000000 +0200 @@ -141,9 +141,11 @@ int statusCol() const { return _langList->statusCol(); } /** - * Returns the (binary RPM) package status + * override this two as we don't have a real selectable and + * the status depends on the language **/ virtual ZyppStatus status() const; + virtual void setStatus( ZyppStatus newStatus, bool sendSignals = true ); /** * Returns 'true' if this selectable's status is set by a selection diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.3/src/YQPkgObjList.cc new/yast2-qt-pkg-2.17.3/src/YQPkgObjList.cc --- old/yast2-qt-pkg-2.17.3/src/YQPkgObjList.cc 2008-07-23 16:27:36.000000000 +0200 +++ new/yast2-qt-pkg-2.17.3/src/YQPkgObjList.cc 2008-08-12 20:04:45.000000000 +0200 @@ -659,13 +659,11 @@ } else setCurrentStatus( S_Install ); - selectNextItem(); event->accept(); return; case Qt::Key_Minus: // Get rid of everything - don't install or delete setCurrentStatus( installed ? S_Del : S_NoInst ); - selectNextItem(); event->accept(); return; @@ -673,7 +671,6 @@ if ( ! installed ) setCurrentStatus( S_Taboo ); - selectNextItem(); event->accept(); return; @@ -681,7 +678,6 @@ if ( installed ) setCurrentStatus( S_Protected ); - selectNextItem(); event->accept(); return; @@ -689,7 +685,6 @@ if ( installed && item->candidateIsNewer() ) setCurrentStatus( S_Update ); - selectNextItem(); event->accept(); return; @@ -700,7 +695,6 @@ { setCurrentStatus( S_KeepInstalled ); } - selectNextItem(); event->accept(); return; @@ -1270,6 +1264,10 @@ void YQPkgObjListItem::showNotifyTexts( ZyppStatus status ) { + // just return if no selectable + if ( ! selectable() ) + return; + string text; switch ( status ) @@ -1307,6 +1305,12 @@ bool YQPkgObjListItem::showLicenseAgreement( ZyppSel sel ) { + // if we have a subclass with no selectable + // confirming the license should be just always + // true + if ( ! sel ) + return true; + string licenseText; switch ( sel->status() ) @@ -1435,6 +1439,16 @@ if ( other ) { + if ( col == nameCol() ) + { + // locale aware sort + return ( strcoll( this->zyppObj()->name().c_str(), other->zyppObj()->name().c_str() ) < 0 ); + } + if ( col == summaryCol() ) + { + // locale aware sort + return ( strcoll( this->zyppObj()->summary().c_str(), other->zyppObj()->summary().c_str() ) < 0 ); + } if ( col == sizeCol() ) { // Numeric sort by size diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.17.3/src/YQPkgSearchFilterView.cc new/yast2-qt-pkg-2.17.3/src/YQPkgSearchFilterView.cc --- old/yast2-qt-pkg-2.17.3/src/YQPkgSearchFilterView.cc 2008-07-23 16:27:36.000000000 +0200 +++ new/yast2-qt-pkg-2.17.3/src/YQPkgSearchFilterView.cc 2008-08-12 20:04:45.000000000 +0200 @@ -213,7 +213,7 @@ zypp::PoolQuery query; - query.addKind(zypp::ResTraits<zypp::Package>::kind); + query.addKind(zypp::ResKind::package); string searchtext = _searchText->currentText().toUtf8().data(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de