Mailinglist Archive: yast-commit (195 mails)

< Previous Next >
[yast-commit] r63658 - in /branches/tmp/dmacvicar/zc10/qt/src: YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc
Author: dmacvicar
Date: Thu Mar 24 14:58:35 2011
New Revision: 63658

URL: http://svn.opensuse.org/viewcvs/yast?rev=63658&view=rev
Log:
finally builds

Modified:
branches/tmp/dmacvicar/zc10/qt/src/YQPkgUpdateProblemFilterView.cc
branches/tmp/dmacvicar/zc10/qt/src/YQPkgVersionsView.cc

Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgUpdateProblemFilterView.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/YQPkgUpdateProblemFilterView.cc?rev=63658&r1=63657&r2=63658&view=diff
==============================================================================
--- branches/tmp/dmacvicar/zc10/qt/src/YQPkgUpdateProblemFilterView.cc
(original)
+++ branches/tmp/dmacvicar/zc10/qt/src/YQPkgUpdateProblemFilterView.cc Thu Mar
24 14:58:35 2011
@@ -79,9 +79,9 @@
{
emit filterStart();

- list<zypp::PoolItem_Ref> problemList =
zypp::getZYpp()->resolver()->problematicUpdateItems();
-
- for ( list<zypp::PoolItem_Ref>::const_iterator it = problemList.begin();
+ list<zypp::PoolItem> problemList =
zypp::getZYpp()->resolver()->problematicUpdateItems();
+
+ for ( list<zypp::PoolItem>::const_iterator it = problemList.begin();
it != problemList.end();
++it )
{
@@ -95,11 +95,11 @@
{
y2milestone( "Problematic package: %s-%s",
pkg->name().c_str(),
pkg->edition().asString().c_str() );
-
+
emit filterMatch( sel, pkg );
}
}
-
+
}

emit filterFinished();

Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgVersionsView.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/YQPkgVersionsView.cc?rev=63658&r1=63657&r2=63658&view=diff
==============================================================================
--- branches/tmp/dmacvicar/zc10/qt/src/YQPkgVersionsView.cc (original)
+++ branches/tmp/dmacvicar/zc10/qt/src/YQPkgVersionsView.cc Thu Mar 24 14:58:35
2011
@@ -21,14 +21,14 @@
#define y2log_component "qt-pkg"

#include <YQZypp.h>
-#include <zypp/Source.h>
+#include <zypp/Repository.h>
#include <ycp/y2log.h>
#include <qtabwidget.h>
#include <qregexp.h>
#include <qheader.h>

#include "YQPkgVersionsView.h"
-#include "YQPkgInstSrcList.h"
+#include "YQPkgRepoList.h"
#include "YQIconPool.h"
#include "YQi18n.h"
#include "utf8.h"
@@ -204,7 +204,7 @@
}
}

- _selectable->set_status( status );
+ _selectable->setStatus( status );


// Set candidate
@@ -246,20 +246,21 @@
{
setOn( _zyppObj == _selectable->candidateObj() );

- if ( versionCol() >= 0 ) setText( versionCol(),
zyppObj->edition().asString().c_str() );
- if ( archCol() >= 0 ) setText( archCol(),
zyppObj->arch().asString().c_str() );
- if ( instSrcCol() >= 0 ) setText( instSrcCol(),
zyppObj->source().alias().c_str() );
- if ( productCol() >= 0 )
- {
- ZyppProduct product = YQPkgInstSrcListItem::singleProduct(
zyppObj->source() );
-
- if ( product )
- setText( productCol(), product->summary() );
- }
- if ( urlCol() >= 0 )
- {
- setText( urlCol(), zyppObj->source().url().asString().c_str() );
- }
+ // Translators: %1 is a package version, %2 the package architecture,
+ // %3 describes the repository where it comes from,
+ // %4 is the repository's priority
+ // %5 is the vendor of the package
+ // Examples:
+ // 2.5.23-i568 from Packman with priority 100 and vendor openSUSE
+ // 3.17.4-i386 from openSUSE-11.1 update repository with priority 20
and vendor openSUSE
+ // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^
^^^^^^^^
+ // %1 %2 %3 %4
%5
+ setText( 0,_( "%1-%2 from %3 with priority %4 and vendor %5" )
+ .arg( fromUTF8( zyppObj->edition().asString().c_str() ) )
+ .arg( fromUTF8( zyppObj->arch().asString().c_str() ) )
+ .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) )
+ .arg( zyppObj->repository().info().priority() )
+ .arg( fromUTF8( zyppObj->vendor().c_str() ) ) );

if ( _selectable->hasInstalledObj() )
{

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages