Hello community,
here is the log from the commit of package yast2-control-center for openSUSE:Factory
checked in at Fri Jul 31 21:02:19 CEST 2009.
--------
--- yast2-control-center/yast2-control-center.changes 2009-07-17 13:51:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-control-center/yast2-control-center.changes 2009-07-30 15:16:35.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 30 15:02:04 CEST 2009 - kmachalkova(a)suse.cz
+
+- Support search in module keywords (X-SuSE-YaST-Keywords)
+ (FaTE#305845)
+- 2.18.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-control-center-2.18.6.tar.bz2
New:
----
yast2-control-center-2.18.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.eq9ezT/_old 2009-07-31 21:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.eq9ezT/_new 2009-07-31 21:01:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-control-center (Version 2.18.6)
+# spec file for package yast2-control-center (Version 2.18.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,10 +18,10 @@
Name: yast2-control-center
-Version: 2.18.6
+Version: 2.18.7
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.18.6.tar.bz2
+Source0: yast2-control-center-2.18.7.tar.bz2
Group: System/YaST
License: GPL v2 or later
BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig update-desktop-files yast2-devtools
++++++ yast2-control-center-2.18.6.tar.bz2 -> yast2-control-center-2.18.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/VERSION new/yast2-control-center-2.18.7/VERSION
--- old/yast2-control-center-2.18.6/VERSION 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-2.18.7/VERSION 2009-07-30 15:16:21.000000000 +0200
@@ -0,0 +1 @@
+2.18.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/VERSION.cmake new/yast2-control-center-2.18.7/VERSION.cmake
--- old/yast2-control-center-2.18.6/VERSION.cmake 2009-07-17 13:47:41.000000000 +0200
+++ new/yast2-control-center-2.18.7/VERSION.cmake 2009-07-30 15:16:21.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "18")
-SET(VERSION_PATCH "6")
+SET(VERSION_PATCH "7")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/package/yast2-control-center.changes new/yast2-control-center-2.18.7/package/yast2-control-center.changes
--- old/yast2-control-center-2.18.6/package/yast2-control-center.changes 2009-07-17 13:47:41.000000000 +0200
+++ new/yast2-control-center-2.18.7/package/yast2-control-center.changes 2009-07-30 15:16:21.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jul 30 15:02:04 CEST 2009 - kmachalkova(a)suse.cz
+
+- Support search in module keywords (X-SuSE-YaST-Keywords)
+ (FaTE#305845)
+- 2.18.7
+
+-------------------------------------------------------------------
Fri Jul 17 13:38:07 CEST 2009 - kmachalkova(a)suse.cz
- Show warning (user is not root) at startup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/kcategorizedsortfilterproxymodel.cpp new/yast2-control-center-2.18.7/src/kcategorizedsortfilterproxymodel.cpp
--- old/yast2-control-center-2.18.6/src/kcategorizedsortfilterproxymodel.cpp 2009-07-17 13:47:41.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/kcategorizedsortfilterproxymodel.cpp 2009-07-30 15:16:21.000000000 +0200
@@ -300,22 +300,28 @@
bool KCategorizedSortFilterProxyModel::filterAcceptsRow( int row, const QModelIndex &srcindex ) const
{
- bool ret = QSortFilterProxyModel::filterAcceptsRow( row, srcindex );
QModelIndex i0 = sourceModel()->index( row, YQDesktopFilesModel::Group, srcindex);
+ QModelIndex i1 = sourceModel()->index( row, 0, srcindex);
+ QStringList keywordList = sourceModel()->data( i1, KeywordsRole ).toStringList();
+ QString keywords = keywordList.join(" ");
- if( ret )
+ bool nameMatches = QSortFilterProxyModel::filterAcceptsRow( row, srcindex );
+ bool keywordMatches = ( !keywords.isEmpty() && keywords.contains( filterFixedString()) );
+
+ if( nameMatches || keywordMatches )
{
QString gr = sourceModel()->data(i0, Qt::UserRole).toString();
d->filterGroups.insert( gr );
}
- return ret;
+
+ return ( nameMatches || keywordMatches );
}
void KCategorizedSortFilterProxyModel::bublisFilterFunction( const QString &s )
{
d->filterGroups.clear();
setFilterFixedString( s );
-
+ d->filterString = s;
}
QString KCategorizedSortFilterProxyModel::matchingGroupFilterRegexp()
@@ -328,3 +334,8 @@
// dumb constant, make sure nothing matches if the list of matching groups is empty
return QString("zzzz");
}
+
+QString KCategorizedSortFilterProxyModel::filterFixedString() const
+{
+ return d->filterString;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/kcategorizedsortfilterproxymodel.h new/yast2-control-center-2.18.7/src/kcategorizedsortfilterproxymodel.h
--- old/yast2-control-center-2.18.6/src/kcategorizedsortfilterproxymodel.h 2009-07-17 13:47:42.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/kcategorizedsortfilterproxymodel.h 2009-07-30 15:16:21.000000000 +0200
@@ -60,7 +60,8 @@
///< value won't be shown on the view, is only for sorting purposes. What will
///< be shown as "Category" on the view will be asked with the role
///< CategoryDisplayRole.
- GenericNameRole = 0x1BA81D0E
+
+ KeywordsRole = 0x09B2C2AA
};
KCategorizedSortFilterProxyModel(QObject *parent = 0);
@@ -119,6 +120,8 @@
QString matchingGroupFilterRegexp();
+ QString filterFixedString() const;
+
protected:
/**
* Overridden from QSortFilterProxyModel. If you are subclassing
@@ -185,6 +188,7 @@
private:
class Private;
Private *const d;
+
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/kcategorizedsortfilterproxymodel_p.h new/yast2-control-center-2.18.7/src/kcategorizedsortfilterproxymodel_p.h
--- old/yast2-control-center-2.18.6/src/kcategorizedsortfilterproxymodel_p.h 2009-07-17 13:47:42.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/kcategorizedsortfilterproxymodel_p.h 2009-07-30 15:16:21.000000000 +0200
@@ -47,6 +47,7 @@
bool sortCategoriesByNaturalComparison;
QSet<QString> filterGroups;
+ QString filterString;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/moduleiconitem.cpp new/yast2-control-center-2.18.7/src/moduleiconitem.cpp
--- old/yast2-control-center-2.18.6/src/moduleiconitem.cpp 2009-07-17 13:47:42.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/moduleiconitem.cpp 2009-07-30 15:16:21.000000000 +0200
@@ -79,7 +79,7 @@
painter->setPen( inv );
}
- QString descr = option.fontMetrics.elidedText( index.data( KCategorizedSortFilterProxyModel::GenericNameRole ).toString(), Qt::ElideRight, option.rect.width() );
+ QString descr = option.fontMetrics.elidedText( index.data( YQModulesModel::GenericNameRole ).toString(), Qt::ElideRight, option.rect.width() );
QRect tr = option.rect;
tr.setTop( tr.top() + decorationSize.height() + 2*style->pixelMetric( QStyle::PM_FocusFrameVMargin) );
painter->drawText( tr, Qt::AlignLeft | Qt::TextSingleLine, descr );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/moduleiconitem.h new/yast2-control-center-2.18.7/src/moduleiconitem.h
--- old/yast2-control-center-2.18.6/src/moduleiconitem.h 2009-07-17 13:47:42.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/moduleiconitem.h 2009-07-30 15:16:21.000000000 +0200
@@ -28,7 +28,7 @@
#include <QPainterPath>
#include <QRectF>
-#include "kcategorizedsortfilterproxymodel.h"
+#include "yqmodulesmodel.h"
class KCModuleInfo;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/yqmodulesmodel.cpp new/yast2-control-center-2.18.7/src/yqmodulesmodel.cpp
--- old/yast2-control-center-2.18.6/src/yqmodulesmodel.cpp 2009-07-17 13:47:42.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/yqmodulesmodel.cpp 2009-07-30 15:16:21.000000000 +0200
@@ -157,13 +157,17 @@
return groupsModel()->data( idx, Qt::UserRole);
}
- else if ( role == KCategorizedSortFilterProxyModel::GenericNameRole )
+ else if ( role == GenericNameRole )
{
-
//QString tooltip = d->infoProvider.provideInfo( this, index );
QString tooltip = translatedPropertyValue(index, "GenericName").toString();
return tooltip;
}
+ else if ( role == KCategorizedSortFilterProxyModel::KeywordsRole )
+ {
+ //FIXME: use translatedPropertyValue
+ return propertyValue( index, "X-SuSE-YaST-Keywords" );
+ }
else if ( role == Qt::DecorationRole )
{
QVariant icon = YQDesktopFilesModel::data( index, role );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.18.6/src/yqmodulesmodel.h new/yast2-control-center-2.18.7/src/yqmodulesmodel.h
--- old/yast2-control-center-2.18.6/src/yqmodulesmodel.h 2009-07-17 13:47:42.000000000 +0200
+++ new/yast2-control-center-2.18.7/src/yqmodulesmodel.h 2009-07-30 15:16:21.000000000 +0200
@@ -30,10 +30,7 @@
enum UserRoleData
{
- RawName,
- SortKey,
- Hidden,
- LastColumn
+ GenericNameRole = 0x1BA81D0E
};
YQModulesModel( QObject * parent = 0 );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
