Author: tgoettlicher Date: Tue Feb 22 14:14:59 2011 New Revision: 63457 URL: http://svn.opensuse.org/viewcvs/yast?rev=63457&view=rev Log: - bnc #661109: Layout of icons gets mixed after using search - 2.20.0 Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp trunk/control-center/src/kcategorizedsortfilterproxymodel.h trunk/control-center/src/kde/CMakeLists.txt trunk/control-center/src/main_window.cpp Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev=... ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Tue Feb 22 14:14:59 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "19") -SET(VERSION_PATCH "3") +SET(VERSION_MINOR "20") +SET(VERSION_PATCH "0") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-cont... ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Tue Feb 22 14:14:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 22 14:20:36 CET 2011 - tgoettlicher@suse.de + +- bnc #661109: Layout of icons gets mixed after using search +- 2.20.0 + +------------------------------------------------------------------- Mon Oct 11 11:17:55 CEST 2010 - tgoettlicher@suse.de - Adapted license format Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizedso... ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp Tue Feb 22 14:14:59 2011 @@ -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() Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizedso... ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.h (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.h Tue Feb 22 14:14:59 2011 @@ -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(); Modified: trunk/control-center/src/kde/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kde/CMakeLists... ============================================================================== --- trunk/control-center/src/kde/CMakeLists.txt (original) +++ trunk/control-center/src/kde/CMakeLists.txt Tue Feb 22 14:14:59 2011 @@ -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} ) Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.cp... ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Tue Feb 22 14:14:59 2011 @@ -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 ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org