Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory
checked in at Tue Feb 22 15:54:20 CET 2011.
--------
--- yast2-control-center/yast2-control-center.changes 2010-10-11
11:19:47.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-control-center/yast2-control-center.changes
2011-02-22 14:15:28.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 22 14:20:36 CET 2011 - [email protected]
+
+- bnc #661109: Layout of icons gets mixed after using search
+- 2.20.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-control-center-2.19.3.tar.bz2
New:
----
yast2-control-center-2.20.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.gAnQmU/_old 2011-02-22 15:52:28.000000000 +0100
+++ /var/tmp/diff_new_pack.gAnQmU/_new 2011-02-22 15:52:28.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-control-center (Version 2.19.3)
+# spec file for package yast2-control-center
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,11 +18,11 @@
Name: yast2-control-center
-Version: 2.19.3
+Version: 2.20.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.19.3.tar.bz2
+Source0: yast2-control-center-2.20.0.tar.bz2
Group: System/YaST
License: GPLv2+
BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig
update-desktop-files yast2-devtools
++++++ yast2-control-center-2.19.3.tar.bz2 ->
yast2-control-center-2.20.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.19.3/VERSION.cmake
new/yast2-control-center-2.20.0/VERSION.cmake
--- old/yast2-control-center-2.19.3/VERSION.cmake 2010-10-11
11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/VERSION.cmake 2011-02-22
14:21:41.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "19")
-SET(VERSION_PATCH "3")
+SET(VERSION_MINOR "20")
+SET(VERSION_PATCH "0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.19.3/package/yast2-control-center.changes
new/yast2-control-center-2.20.0/package/yast2-control-center.changes
--- old/yast2-control-center-2.19.3/package/yast2-control-center.changes
2010-10-11 11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/package/yast2-control-center.changes
2011-02-22 14:21:41.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Feb 22 14:20:36 CET 2011 - [email protected]
+
+- bnc #661109: Layout of icons gets mixed after using search
+- 2.20.0
+
+-------------------------------------------------------------------
Mon Oct 11 11:17:55 CEST 2010 - [email protected]
- Adapted license format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.cpp
new/yast2-control-center-2.20.0/src/kcategorizedsortfilterproxymodel.cpp
--- old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.cpp
2010-10-11 11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/src/kcategorizedsortfilterproxymodel.cpp
2011-02-22 14:21:41.000000000 +0100
@@ -323,11 +323,13 @@
return ( nameMatches || keywordMatches );
}
-void KCategorizedSortFilterProxyModel::bublisFilterFunction( const QString &s )
+void KCategorizedSortFilterProxyModel::customFilterFunction( const QString &s )
{
d->filterGroups.clear();
setFilterFixedString( s );
d->filterString = s;
+ invalidateFilter();
+ invalidate();
}
QString KCategorizedSortFilterProxyModel::matchingGroupFilterRegexp()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.h
new/yast2-control-center-2.20.0/src/kcategorizedsortfilterproxymodel.h
--- old/yast2-control-center-2.19.3/src/kcategorizedsortfilterproxymodel.h
2010-10-11 11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/src/kcategorizedsortfilterproxymodel.h
2011-02-22 14:21:41.000000000 +0100
@@ -116,7 +116,7 @@
*/
static int naturalCompare(const QString &a, const QString &b);
- void bublisFilterFunction( const QString &s );
+ void customFilterFunction( const QString &s );
QString matchingGroupFilterRegexp();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kde/CMakeLists.txt
new/yast2-control-center-2.20.0/src/kde/CMakeLists.txt
--- old/yast2-control-center-2.19.3/src/kde/CMakeLists.txt 2010-10-11
11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/src/kde/CMakeLists.txt 2011-02-22
14:21:41.000000000 +0100
@@ -10,4 +10,4 @@
########### install files ###############
install( FILES kcmyast.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+#install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kde/kcmyast.desktop
new/yast2-control-center-2.20.0/src/kde/kcmyast.desktop
--- old/yast2-control-center-2.19.3/src/kde/kcmyast.desktop 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-control-center-2.20.0/src/kde/kcmyast.desktop 2011-02-22
14:21:41.000000000 +0100
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Exec=kcmshell4 kcm_yast
+Icon=yast
+Type=Service
+X-DocPath=kcontrol/emoticons/index.html
+
+X-KDE-ServiceTypes=KCModule,KCModuleInit
+X-KDE-Library=kcm_yast
+X-KDE-ParentApp=kcontrol
+X-KDE-System-Settings-Parent-Category=computer-administration
+X-KDE-Weight=110
+
+Name=Advanced Administration (YaST)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.19.3/src/kde/kcmyast.destop
new/yast2-control-center-2.20.0/src/kde/kcmyast.destop
--- old/yast2-control-center-2.19.3/src/kde/kcmyast.destop 2010-10-11
11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/src/kde/kcmyast.destop 1970-01-01
01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Exec=kcmshell4 kcm_yast
-Icon=yast
-Type=Service
-X-DocPath=kcontrol/emoticons/index.html
-
-X-KDE-ServiceTypes=KCModule,KCModuleInit
-X-KDE-Library=kcm_yast
-X-KDE-ParentApp=kcontrol
-X-KDE-System-Settings-Parent-Category=computer-administration
-X-KDE-Weight=110
-
-Name=Advanced Administration (YaST)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.19.3/src/main_window.cpp
new/yast2-control-center-2.20.0/src/main_window.cpp
--- old/yast2-control-center-2.19.3/src/main_window.cpp 2010-10-11
11:19:35.000000000 +0200
+++ new/yast2-control-center-2.20.0/src/main_window.cpp 2011-02-22
14:21:41.000000000 +0100
@@ -309,7 +309,7 @@
void MainWindow::slotFilterChanged()
{
QString stext = d->searchField->text();
- d->kcsfpm->bublisFilterFunction( stext );
+ d->kcsfpm->customFilterFunction( stext );
QString gr_filter = d->kcsfpm->matchingGroupFilterRegexp();
d->gcsfpm->setFilterRegExp ( gr_filter );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
