Hello community,
here is the log from the commit of package yast2-qt-pkg
checked in at Fri May 23 17:18:00 CEST 2008.
--------
--- yast2-qt-pkg/yast2-qt-pkg.changes 2008-05-21 21:10:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt-pkg/yast2-qt-pkg.changes 2008-05-23 16:35:25.000000000 +0200
@@ -1,0 +2,7 @@
+Fri May 23 15:27:24 CEST 2008 - dmacvicar@suse.de
+
+- if a patch is preselected it will go satisfied
+ therefore it will not be shown in the "needed" list.
+ Test for patches marked to be installed too.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.c19408/_old 2008-05-23 17:17:56.000000000 +0200
+++ /var/tmp/diff_new_pack.c19408/_new 2008-05-23 17:17:56.000000000 +0200
@@ -12,7 +12,7 @@
Name: yast2-qt-pkg
Version: 2.16.44
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,6 +74,10 @@
%_prefix/share/YaST2/images/*
%changelog
+* Fri May 23 2008 dmacvicar@suse.de
+- if a patch is preselected it will go satisfied
+ therefore it will not be shown in the "needed" list.
+ Test for patches marked to be installed too.
* Wed May 21 2008 dmacvicar@suse.de
- fallback to default icon if no icon is defined in
a pattern.
++++++ yast2-qt-pkg-2.16.44.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.16.44/package/yast2-qt-pkg.changes
--- old/yast2-qt-pkg-2.16.44/package/yast2-qt-pkg.changes 2008-05-21 20:54:31.000000000 +0200
+++ new/yast2-qt-pkg-2.16.44/package/yast2-qt-pkg.changes 2008-05-23 16:35:20.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri May 23 15:27:24 CEST 2008 - dmacvicar@suse.de
+
+- if a patch is preselected it will go satisfied
+ therefore it will not be shown in the "needed" list.
+ Test for patches marked to be installed too.
+
+-------------------------------------------------------------------
Wed May 21 18:34:36 CEST 2008 - dmacvicar@suse.de
- fallback to default icon if no icon is defined in
@@ -10,7 +17,7 @@
- fixing theming of pattern selector popups
-------------------------------------------------------------------
-Wed May 21 14:05:45 CEST 2008 - dmacvicar@suse.de
+Wed May 21 13:05:45 CEST 2008 - dmacvicar@suse.de
- display the right name for repository list. (bnc#383553)
patch by Fabien Crespel
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/src/YQPkgObjList.cc new/yast2-qt-pkg-2.16.44/src/YQPkgObjList.cc
--- old/yast2-qt-pkg-2.16.44/src/YQPkgObjList.cc 2008-05-21 20:54:31.000000000 +0200
+++ new/yast2-qt-pkg-2.16.44/src/YQPkgObjList.cc 2008-05-23 16:35:20.000000000 +0200
@@ -1066,7 +1066,6 @@
{
if ( statusCol() >= 0 )
{
- yuiDebug() << "setStatusIcon" << endl;
bool enabled = editable() && _pkgObjList->editable();
setIcon( statusCol(), _pkgObjList->statusIcon( status(), enabled, bySelection() ) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/src/YQPkgPatchList.cc new/yast2-qt-pkg-2.16.44/src/YQPkgPatchList.cc
--- old/yast2-qt-pkg-2.16.44/src/YQPkgPatchList.cc 2008-05-21 20:54:31.000000000 +0200
+++ new/yast2-qt-pkg-2.16.44/src/YQPkgPatchList.cc 2008-05-23 16:35:20.000000000 +0200
@@ -56,12 +56,12 @@
// special painting for category items
if ( citem )
{
- //std::cout << "printing category: " << index.column() << std::endl;
QFont f = painter->font();
f.setWeight(QFont::Bold);
- f.setPointSize(f.pointSize()+1);
+ QFontMetrics fm(f);
+ f.setPixelSize( fm.height() * 1.05 );
citem->setFont(_view->summaryCol(), f);
-
+
painter->fillRect(option.rect, option.palette.color(QPalette::AlternateBase));
QItemDelegate::paint(painter, option, index);
painter->restore();
@@ -174,7 +174,6 @@
{
// wee need to do a full solve in order
// to get the satisfied status correctly
- zypp::getZYpp()->resolver()->resolvePool();
_categories.clear();
@@ -201,16 +200,28 @@
selectable->candidateObj().isRelevant() )
{
// and only those that are needed
- if ( ! selectable->candidateObj().isSatisfied() )
+ if ( ! selectable->candidateObj().isSatisfied() ||
+ // may be it is satisfied because is preselected
+ selectable->candidateObj().status().isToBeInstalled() )
displayPatch = true;
+ else
+ yuiDebug() << "Patch " << zyppPatch->ident()
+ << " is already satisfied"
+ << endl;
+
}
+ else
+ yuiDebug() << "Patch " << zyppPatch->ident()
+ << " is not relevant to the system"
+ << endl;
break;
case RelevantAndInstalledPatches: // patches we dont need
// only shows patches relevant to the system
if ( ( selectable->hasCandidateObj() ) &&
( ! selectable->candidateObj().isRelevant()
- || selectable->candidateObj().isSatisfied() ) )
+ || ( selectable->candidateObj().isSatisfied() &&
+ selectable->candidateObj().status().isToBeInstalled() ) ) )
{
// now we show satisfied patches too
displayPatch = true;
@@ -222,6 +233,9 @@
// Intentionally omitting "default" so the compiler
// can catch unhandled enum values
+ default:
+ yuiDebug() << "unknown patch filter" << endl;
+
}
if ( displayPatch )
@@ -503,7 +517,7 @@
if ( ! text.isEmpty() )
text += "\n";
- text += fromUTF8( zyppPatch()->size().asString().c_str() );
+ text += fromUTF8( zyppPatch()->downloadSize().asString().c_str() );
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-pkg-2.16.44/src/YQPkgPatternList.cc new/yast2-qt-pkg-2.16.44/src/YQPkgPatternList.cc
--- old/yast2-qt-pkg-2.16.44/src/YQPkgPatternList.cc 2008-05-21 20:54:31.000000000 +0200
+++ new/yast2-qt-pkg-2.16.44/src/YQPkgPatternList.cc 2008-05-23 16:35:20.000000000 +0200
@@ -235,7 +235,7 @@
clear();
yuiDebug() << "Filling pattern list" << endl;
- zypp::getZYpp()->resolver()->resolvePool();
+ //zypp::getZYpp()->resolver()->resolvePool();
for ( ZyppPoolIterator it = zyppPatternsBegin();
it != zyppPatternsEnd();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org