Hello community, here is the log from the commit of package kactivities-stats for openSUSE:Factory checked in at 2016-11-17 12:26:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old) and /work/SRC/openSUSE:Factory/.kactivities-stats.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes 2016-10-28 12:16:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities-stats.new/kactivities-stats.changes 2016-11-17 12:27:09.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Nov 5 20:09:04 UTC 2016 - [email protected] + +- Update to 5.28.0 + * Ignoring link status when sortin UsedResources and + LinkedResources model + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.28.0.php + +------------------------------------------------------------------- Old: ---- kactivities-stats-5.27.0.tar.xz New: ---- kactivities-stats-5.28.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities-stats.spec ++++++ --- /var/tmp/diff_new_pack.K0faWX/_old 2016-11-17 12:27:10.000000000 +0100 +++ /var/tmp/diff_new_pack.K0faWX/_new 2016-11-17 12:27:10.000000000 +0100 @@ -17,9 +17,9 @@ %define lname libKF5ActivitiesStats1 -%define _tar_path 5.27 +%define _tar_path 5.28 Name: kactivities-stats -Version: 5.27.0 +Version: 5.28.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support ++++++ kactivities-stats-5.27.0.tar.xz -> kactivities-stats-5.28.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.27.0/CMakeLists.txt new/kactivities-stats-5.28.0/CMakeLists.txt --- old/kactivities-stats-5.27.0/CMakeLists.txt 2016-10-02 09:45:27.000000000 +0200 +++ new/kactivities-stats-5.28.0/CMakeLists.txt 2016-11-05 11:46:33.000000000 +0100 @@ -18,7 +18,7 @@ # Extra CMake stuff include (FeatureSummary) -find_package (ECM 5.27.0 NO_MODULE) +find_package (ECM 5.28.0 NO_MODULE) set_package_properties (ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary (WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -35,8 +35,8 @@ find_package (Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Sql) # KDE Frameworks -set(KF5_VERSION "5.27.0") # handled by release scripts -set(KF5_DEP_VERSION "5.27.0") # handled by release scripts +set(KF5_VERSION "5.28.0") # handled by release scripts +set(KF5_DEP_VERSION "5.28.0") # handled by release scripts # find_package (KF5DBusAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) # find_package (KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package (KF5Config ${KF5_DEP_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.27.0/src/resultmodel.cpp new/kactivities-stats-5.28.0/src/resultmodel.cpp --- old/kactivities-stats-5.27.0/src/resultmodel.cpp 2016-10-02 09:45:27.000000000 +0200 +++ new/kactivities-stats-5.28.0/src/resultmodel.cpp 2016-11-05 11:46:33.000000000 +0100 @@ -171,6 +171,13 @@ d->destinationFor(*resourcePosition)); } + inline void debug() const + { + for (const auto& item: m_items) { + qDebug() << "Item: " << item; + } + } + private: ResultModelPrivate *const d; @@ -536,10 +543,15 @@ #define ORDER_BY(Field) member(&ResultSet::Result::Field) > Field #define ORDER_BY_FULL(Field) \ - cache.lowerBound(FixedItemsLessThan(cache, resource) \ - && ORDER_BY(linkStatus) \ - && ORDER_BY(Field) \ - && ORDER_BY(resource)) + (query.selection() == Terms::AllResources ? \ + cache.lowerBound(FixedItemsLessThan(cache, resource) \ + && ORDER_BY(linkStatus) \ + && ORDER_BY(Field) \ + && ORDER_BY(resource)) : \ + cache.lowerBound(FixedItemsLessThan(cache, resource) \ + && ORDER_BY(Field) \ + && ORDER_BY(resource)) \ + ) const auto destination = query.ordering() == HighScoredFirst ? ORDER_BY_FULL(score): @@ -694,7 +706,7 @@ { using boost::lower_bound; - QDBG << "ResultModelPrivate::onResultAdded " + QDBG << "ResultModelPrivate::onResultScoreUpdated " << "result added:" << resource << "score:" << score << "last:" << lastUpdate @@ -707,7 +719,9 @@ ResultSet::Result::LinkStatus linkStatus = result ? result->linkStatus() - : ResultSet::Result::NotLinked; + : query.selection() != Terms::UsedResources ? ResultSet::Result::Unknown + : query.selection() != Terms::LinkedResources ? ResultSet::Result::Linked + : ResultSet::Result::NotLinked; if (result) { // We are only updating a result we already had, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.27.0/src/resultset.h new/kactivities-stats-5.28.0/src/resultset.h --- old/kactivities-stats-5.27.0/src/resultset.h 2016-10-02 09:45:27.000000000 +0200 +++ new/kactivities-stats-5.28.0/src/resultset.h 2016-11-05 11:46:33.000000000 +0100 @@ -240,8 +240,9 @@ << (result.linkStatus() == ResultSet::Result::Linked ? "⊤" : result.linkStatus() == ResultSet::Result::NotLinked ? "⊥" : "?") << result.score() - << result.title() - << result.resource() + << (result.title() != result.resource() ? result.title() : QString()) + << result.lastUpdate() + << result.resource().rightRef(20) ; }
