Author: sh-sh-sh Date: Mon Aug 27 16:16:38 2007 New Revision: 40506 URL: http://svn.opensuse.org/viewcvs/yast?rev=40506&view=rev Log: Fixed bug #297637: Repository names not shown in Package Manager Modified: trunk/qt/VERSION trunk/qt/package/yast2-qt.changes trunk/qt/src/pkg/YQPkgRepoList.cc trunk/qt/src/pkg/YQPkgVersionsView.cc Modified: trunk/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=40506&r1=40505&r2=40506&view=diff ============================================================================== --- trunk/qt/VERSION (original) +++ trunk/qt/VERSION Mon Aug 27 16:16:38 2007 @@ -1 +1 @@ -2.15.12 +2.15.13 Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=40506&r1=40505&r2=40506&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Aug 27 16:16:38 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 27 16:14:15 CEST 2007 - sh@suse.de + +- Fixed bug #297637: Repository names not shown in Package Manager +- V 2.15.13 + +------------------------------------------------------------------- Thu Aug 23 13:25:08 CEST 2007 - kmachalkova@suse.cz - Display repository name instead of product name in package selector Modified: trunk/qt/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.cc?rev=40506&r1=40505&r2=40506&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoList.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoList.cc Mon Aug 27 16:16:38 2007 @@ -33,6 +33,7 @@ using std::set; using std::vector; +#define SHOW_SINGLE_PRODUCT 0 YQPkgRepoList::YQPkgRepoList( QWidget * parent ) @@ -225,12 +226,15 @@ if ( nameCol() >= 0 ) { string name = repo.info().name(); - //ZyppProduct product = singleProduct( _zyppRepo ); - //if ( product ) // only if the repository provides exactly one product - //{ // (which is the most common case) - // name = product->summary(); - //} +#if SHOW_SINGLE_PRODUCT + ZyppProduct product = singleProduct( _zyppRepo ); + + if ( product ) // only if the repository provides exactly one product + { // (which is the most common case) + name = product->summary(); + } +#endif if ( ! name.empty() ) setText( nameCol(), name.c_str() ); @@ -281,7 +285,7 @@ if ( zypp::dynamic_pointer_castzypp::Product( *it ) ) { y2milestone( "Multiple products in repository %s", - zyppRepo.info().alias().c_str() ); + zyppRepo.info().name().c_str() ); ZyppProduct null; return null; } @@ -291,7 +295,7 @@ if ( ! product ) y2milestone( "No product in repository %s", - zyppRepo.info().alias().c_str() ); + zyppRepo.info().name().c_str() ); return product; } Modified: trunk/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.cc?rev=40506&r1=40505&r2=40506&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgVersionsView.cc (original) +++ trunk/qt/src/pkg/YQPkgVersionsView.cc Mon Aug 27 16:16:38 2007 @@ -248,7 +248,7 @@ if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); - if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); + if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().name().c_str() ); if ( productCol() >= 0 ) { ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org