Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2014-11-11 01:09:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2014-10-07 15:59:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities5.new/kactivities5.changes 2014-11-11 01:09:35.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 2 17:47:16 UTC 2014 - [email protected] + +- Update to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php + +------------------------------------------------------------------- Old: ---- kactivities-5.3.0.tar.xz New: ---- kactivities-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.WJpfs0/_old 2014-11-11 01:09:36.000000000 +0100 +++ /var/tmp/diff_new_pack.WJpfs0/_new 2014-11-11 01:09:36.000000000 +0100 @@ -18,20 +18,20 @@ %define lname libKF5Activities5 Name: kactivities5 -Version: 5.3.0 +Version: 5.4.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support License: GPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities -Source: http://download.kde.org/stable/frameworks/%{version}/kactivities-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.4/kactivities-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM kamd-rename.patch -- https://git.reviewboard.kde.org/r/115602/ -- rename kactivitymanagerd binary so it can co-exist with kactivities4 Patch0: kamd-rename.patch BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.3.0 +BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes BuildRequires: kcmutils-devel >= %{kf5_version} BuildRequires: kconfig-devel >= %{kf5_version} @@ -82,7 +82,7 @@ Summary: KDE Plasma Activities support Group: Development/Libraries/KDE Requires: %lname = %{version} -Requires: extra-cmake-modules >= 1.3.0 +Requires: extra-cmake-modules >= 1.4.0 Requires: pkgconfig(Qt5Core) >= 5.2.0 %description devel ++++++ kactivities-5.3.0.tar.xz -> kactivities-5.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/CMakeLists.txt new/kactivities-5.4.0/CMakeLists.txt --- old/kactivities-5.3.0/CMakeLists.txt 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/CMakeLists.txt 2014-11-02 13:04:45.000000000 +0100 @@ -15,7 +15,7 @@ endif () # Extra CMake stuff -find_package (ECM 1.3.0 REQUIRED NO_MODULE) +find_package (ECM 1.4.0 REQUIRED NO_MODULE) set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) @@ -29,8 +29,8 @@ find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus) # KDE Frameworks -set(KF5_VERSION "5.3.0") # handled by release scripts -set(KF5_DEP_VERSION "5.3.0") # handled by release scripts +set(KF5_VERSION "5.4.0") # handled by release scripts +set(KF5_DEP_VERSION "5.4.0") # handled by release scripts find_package (KF5DBusAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package (KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/po/it/kactivities5.po new/kactivities-5.4.0/po/it/kactivities5.po --- old/kactivities-5.3.0/po/it/kactivities5.po 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/po/it/kactivities5.po 2014-11-02 13:04:45.000000000 +0100 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Federico Zenith <[email protected]>, 2012, 2013, 2014. # -# Federico Zenith <[email protected]>, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: kactivitymanagerd_fileitem_linking_plugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2013-06-19 09:05+0200\n" -"Last-Translator: Federico Zenith <[email protected]>\n" +"PO-Revision-Date: 2014-10-09 20:27+0200\n" +"Last-Translator: Federico Zenith <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" "MIME-Version: 1.0\n" @@ -26,15 +26,13 @@ msgstr "[email protected]" #: imports/activitymodel.cpp:592 -#, fuzzy -#| msgid "Activities..." msgctxt "Header title for activity data model" msgid "Activity" -msgstr "Attività..." +msgstr "Attività" #: service/Activities.cpp:139 msgid "Default" -msgstr "" +msgstr "Predefinita" #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:84 #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:119 @@ -45,20 +43,16 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 #: workspace/kio/KioActivities.cpp:304 -#, fuzzy -#| msgid "Activities..." msgid "Activities" -msgstr "Attività..." +msgstr "Attività" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Caricamento..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Il gestore delle attività non sta funzionando correttamente." +msgstr "Il gestore delle attività non è in esecuzione" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -81,16 +75,12 @@ msgstr "Scollega da:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#| msgid "Activities..." msgid "Activity" -msgstr "Attività..." +msgstr "Attività" #: workspace/kio/KioActivities.cpp:228 -#, fuzzy -#| msgid "Link to the current activity" msgid "Current activity" -msgstr "Collega all'attività attuale" +msgstr "Attività attuale" #: workspace/settings/MainConfigurationWidget.cpp:80 msgid "Available Features" @@ -125,8 +115,8 @@ msgctxt "unit of time. months to keep the history" msgid " month" msgid_plural " months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " mese" +msgstr[1] " mesi" #: workspace/settings/MainConfigurationWidget.cpp:260 msgctxt "for in 'keep history for 5 months'" @@ -150,24 +140,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#| msgid "For all applications" msgid "For a&ll applications" -msgstr "Per tutte le applicazioni" +msgstr "Per tutte &le applicazioni" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#| msgid "Do not remember" msgid "&Do not remember" -msgstr "Non ricordare" +msgstr "&Non ricordare" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Solo per certe applicazioni" +msgstr "&Solo per certe applicazioni" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/po/nn/kactivities5.po new/kactivities-5.4.0/po/nn/kactivities5.po --- old/kactivities-5.3.0/po/nn/kactivities5.po 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/po/nn/kactivities5.po 2014-11-02 13:04:45.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-08-18 08:02+0000\n" +"POT-Creation-Date: 2014-09-24 07:44+0000\n" "PO-Revision-Date: 2014-07-29 13:09+0200\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -45,7 +45,7 @@ msgstr "" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 -#: workspace/kio/KioActivities.cpp:309 +#: workspace/kio/KioActivities.cpp:304 msgid "Activities" msgstr "" @@ -77,11 +77,11 @@ msgid "Unlink from:" msgstr "" -#: workspace/kio/KioActivities.cpp:108 workspace/kio/KioActivities.cpp:234 +#: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 msgid "Activity" msgstr "Aktivitet" -#: workspace/kio/KioActivities.cpp:233 +#: workspace/kio/KioActivities.cpp:228 msgid "Current activity" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/po/se/kactivities5.po new/kactivities-5.4.0/po/se/kactivities5.po --- old/kactivities-5.3.0/po/se/kactivities5.po 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/po/se/kactivities5.po 2014-11-02 13:04:45.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-08-18 08:02+0000\n" +"POT-Creation-Date: 2014-09-24 07:44+0000\n" "PO-Revision-Date: 2011-10-26 01:37+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -44,7 +44,7 @@ msgstr "" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 -#: workspace/kio/KioActivities.cpp:309 +#: workspace/kio/KioActivities.cpp:304 msgid "Activities" msgstr "" @@ -76,11 +76,11 @@ msgid "Unlink from:" msgstr "" -#: workspace/kio/KioActivities.cpp:108 workspace/kio/KioActivities.cpp:234 +#: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 msgid "Activity" msgstr "" -#: workspace/kio/KioActivities.cpp:233 +#: workspace/kio/KioActivities.cpp:228 msgid "Current activity" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/po/tr/kactivities5.po new/kactivities-5.4.0/po/tr/kactivities5.po --- old/kactivities-5.3.0/po/tr/kactivities5.po 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/po/tr/kactivities5.po 2014-11-02 13:04:45.000000000 +0100 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Volkan Gezer <[email protected]>, 2013. +# Volkan Gezer <[email protected]>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2013-07-08 04:13+0200\n" +"PO-Revision-Date: 2014-10-22 21:53+0200\n" "Last-Translator: Volkan Gezer <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" "Language: tr\n" @@ -26,11 +26,9 @@ msgstr "[email protected]" #: imports/activitymodel.cpp:592 -#, fuzzy -#| msgid "Activities..." msgctxt "Header title for activity data model" msgid "Activity" -msgstr "Etkinlikler..." +msgstr "Etkinlik" #: service/Activities.cpp:139 msgid "Default" @@ -45,20 +43,16 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 #: workspace/kio/KioActivities.cpp:304 -#, fuzzy -#| msgid "Activities..." msgid "Activities" -msgstr "Etkinlikler..." +msgstr "Etkinlikler" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Yükleniyor..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Etkinlik yöneticisi düzgün bir şekilde çalışmıyor." +msgstr "Etkinlik Yöneticisi çalışmıyor." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -81,16 +75,12 @@ msgstr "Şuradan bağlantısını kes:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#| msgid "Activities..." msgid "Activity" -msgstr "Etkinlikler..." +msgstr "Etkinlik" #: workspace/kio/KioActivities.cpp:228 -#, fuzzy -#| msgid "Link to the current activity" msgid "Current activity" -msgstr "Geçerli etkinliğe bağla" +msgstr "Geçerli etkinlik" #: workspace/settings/MainConfigurationWidget.cpp:80 msgid "Available Features" @@ -125,8 +115,8 @@ msgctxt "unit of time. months to keep the history" msgid " month" msgid_plural " months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " ay" +msgstr[1] " ay" #: workspace/settings/MainConfigurationWidget.cpp:260 msgctxt "for in 'keep history for 5 months'" @@ -150,24 +140,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#| msgid "For all applications" msgid "For a&ll applications" -msgstr "Tüm uygulamalar için" +msgstr "Tüm uygu&lamalar için" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#| msgid "Do not remember" msgid "&Do not remember" -msgstr "Hatırlama" +msgstr "&Hatırlama" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Sadece özel uygulamalar için" +msgstr "S&adece özel uygulamalar için" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/imports/CMakeLists.txt new/kactivities-5.4.0/src/imports/CMakeLists.txt --- old/kactivities-5.3.0/src/imports/CMakeLists.txt 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/imports/CMakeLists.txt 2014-11-02 13:04:45.000000000 +0100 @@ -40,5 +40,5 @@ ## install install (TARGETS kactivitiesextensionplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/activities) -install (FILES qmldir README DESTINATION ${QML_INSTALL_DIR}/org/kde/activities) +install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/activities) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop new/kactivities-5.4.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop --- old/kactivities-5.3.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop 2014-11-02 13:04:45.000000000 +0100 @@ -12,7 +12,9 @@ Name[gl]=Modelos de actividade Name[hu]=Aktivitássablonok Name[ia]=Patronos de Activitate +Name[it]=Modelli di attività Name[ko]=활동 템플릿 +Name[mr]=कार्यपध्दती टेम्प्लेट्स Name[nb]=Film-maler Name[nds]=Aktiviteten-Vörlagen Name[nl]=Sjablonen voor activiteit @@ -46,6 +48,7 @@ Comment[gl]=Permite a creación de modelos de actividades Comment[hu]=Támogatás sablonból létrehozott aktivitásokhoz Comment[ia]=Supporto pro crear activitates de forma de patrono +Comment[it]=Supporto per creare attività da modelli Comment[ko]=템플릿이 있는 활동 생성 지원 Comment[nb]=Støtte for å opprette aktiviteter fra maler Comment[nds]=Ünnerstütten för't Opstellen Aktiviteetvörlagen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/CMakeLists.txt new/kactivities-5.4.0/src/service/plugins/sqlite/CMakeLists.txt --- old/kactivities-5.3.0/src/service/plugins/sqlite/CMakeLists.txt 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/CMakeLists.txt 2014-11-02 13:04:45.000000000 +0100 @@ -9,7 +9,6 @@ ResourceScoreCache.cpp ResourceScoreMaintainer.cpp ResourceLinking.cpp - # Rankings.cpp ${CMAKE_SOURCE_DIR}/src/utils/qsqlquery.cpp ${plugin_implementation_SRCS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/Rankings.cpp new/kactivities-5.4.0/src/service/plugins/sqlite/Rankings.cpp --- old/kactivities-5.3.0/src/service/plugins/sqlite/Rankings.cpp 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/Rankings.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -/* - * Copyright (C) 2011, 2012 Ivan Cukic ivan.cukic(at)kde.org - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -// Self -#include "Rankings.h" - -// STL -#include <algorithm> - -// Qt -#include <QDBusConnection> -#include <QVariantList> -#include <QSqlQuery> - -// KDE -#include <kdbusconnectionpool.h> - -// Utils -#include <utils/range.h> -#include <utils/remove_if.h> -#include <utils/qsqlquery.h> - -// Local -#include "Debug.h" -#include "ResourceScoreCache.h" -#include "Database.h" -#include "StatsPlugin.h" -#include "rankingsadaptor.h" - - -#define clientInterface(dbusPath) \ - QDBusInterface(dbusPath, QStringLiteral("/RankingsClient"), \ - QStringLiteral("org.kde.ActivityManager.RankingsClient")) - -Rankings *Rankings::self() -{ - static Rankings instance; - return &instance; -} - -Rankings::Rankings() -{ - new RankingsAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( - QStringLiteral("/Rankings"), this); -} - -Rankings::~Rankings() -{ -} - -void Rankings::registerClient(const QString &client, const QString &requestId, - const QString &activity, - const QString &application) -{ - m_clients.insert(ClientPattern(client, requestId, activity, application)); - - static const auto query = QStringLiteral( - "SELECT targettedResource, cachedScore " - "FROM kext_ResourceScoreCache " // this should be kao_ResourceScoreCache, but lets leave it - "WHERE %1 AND %2 " - "AND cachedScore > 0 " - "ORDER BY cachedScore DESC LIMIT 30"); - - static const auto usedActivity = QStringLiteral("usedActivity = '%1'"); - static const auto initiatingAgent = QStringLiteral("initiatingAgent = '%1'"); - - auto results = Database::self()->exec( - query.arg(activity.isEmpty() ? QStringLiteral("1") - : usedActivity.arg(activity)) - .arg(application.isEmpty() ? QStringLiteral("1") - : initiatingAgent.arg(application))); - - QHash<QString, QVariant> update; - - for (const auto &result: results) { - const auto url = result[0].toString(); - const auto score = result[1].toReal(); - - update[url] = score; - } - - clientInterface(client).asyncCall(QStringLiteral("updated"), requestId, - QStringLiteral("replace"), - QVariant(update)); -} - -void Rankings::deregisterClient(const QString &client, const QString &requestId) -{ - m_clients.erase(ClientPattern(client, requestId)); -} - -void Rankings::resourceScoreUpdated(const QString &activity, - const QString &application, - const QString &resource, qreal score) -{ - using namespace kamd::utils; - - Q_UNUSED(application); - - QHash<QString, QVariant> update; - - update[resource] = score; - - for (const auto &client : - m_clients | filtered(ClientPattern::matches, activity, application) - ) { - clientInterface(client.dbusPath) - .asyncCall(QStringLiteral("updated"), client.requestId, - QStringLiteral("incremental"), QVariant(update)); - } -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/Rankings.h new/kactivities-5.4.0/src/service/plugins/sqlite/Rankings.h --- old/kactivities-5.3.0/src/service/plugins/sqlite/Rankings.h 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/Rankings.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2011, 2012 Ivan Cukic <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef PLUGINS_SQLITE_RANKINGS_H -#define PLUGINS_SQLITE_RANKINGS_H - -// Qt -#include <QHash> -#include <QObject> -#include <QString> -#include <QStringList> -#include <QThread> -#include <QDBusInterface> - -// Boost -#include <boost/container/flat_set.hpp> - - -class Rankings : public QObject { - Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.kde.ActivityManager.Rankings") - -public: - static Rankings *self(); - - void resourceScoreUpdated(const QString &activity, - const QString &application, - const QString &resource, qreal score); - - ~Rankings(); - -public Q_SLOTS: - /** - * Registers a new client for the specified activity and application - * @param dbusPath d-bus name - * @param requestId applications can have interest in different items - * @param activity activity to track. If empty, all activities are - * aggregated - * @param application application to track. If empty, all applications are - * aggregated - */ - void registerClient(const QString &dbusPath, - const QString &requestId, - const QString &activity = QString(), - const QString &application = QString()); - - /** - * Deregisters a dbusPath - */ - void deregisterClient(const QString &dbusPath, - const QString &requestId); - -private: - Rankings(); - - static Rankings *s_instance; - - struct ResultItem { - QString uri; - qreal score; - }; - - struct ClientPattern { - ClientPattern(const QString &dbusPath, const QString &requestId, - const QString &activity = QString(), - const QString &application = QString()) - : dbusPath(dbusPath) - , requestId(requestId) - , activity(activity) - , application(application) - { - } - - QString dbusPath; - QString requestId; - QString activity; - QString application; - - bool operator<(const ClientPattern &other) const - { - return dbusPath < other.dbusPath || - (dbusPath == other.dbusPath && requestId < other.requestId); - } - - bool operator==(const ClientPattern &other) const - { - return dbusPath == other.dbusPath && requestId == other.requestId; - } - - static inline bool matches(const QString &activity, - const QString &application, - const ClientPattern &dbusPath) - { - return - ( - dbusPath.activity.isEmpty() || - activity == dbusPath.activity - ) && ( - dbusPath.application.isEmpty() || - application == dbusPath.application - ); - } - }; - -private: - boost::container::flat_set<ClientPattern> m_clients; -}; - -#endif // PLUGINS_SQLITE_RANKINGS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/StatsPlugin.cpp new/kactivities-5.4.0/src/service/plugins/sqlite/StatsPlugin.cpp --- old/kactivities-5.3.0/src/service/plugins/sqlite/StatsPlugin.cpp 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/StatsPlugin.cpp 2014-11-02 13:04:45.000000000 +0100 @@ -39,8 +39,6 @@ #include "ResourceScoreMaintainer.h" #include "ResourceLinking.h" #include "Utils.h" -// #include "Rankings.h" -// #include "scoringadaptor.h" #include "../../Event.h" KAMD_EXPORT_PLUGIN(sqliteplugin, StatsPlugin, "kactivitymanagerd-plugin-sqlite.json") @@ -69,8 +67,7 @@ m_activities = modules[QStringLiteral("activities")]; m_resources = modules[QStringLiteral("resources")]; - // Database::self(); - // Rankings::self(); + Database::self(); connect(m_resources, SIGNAL(ProcessedResourceEvents(EventList)), this, SLOT(addEvents(EventList))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/org.kde.ActivityManager.Rankings.xml new/kactivities-5.4.0/src/service/plugins/sqlite/org.kde.ActivityManager.Rankings.xml --- old/kactivities-5.3.0/src/service/plugins/sqlite/org.kde.ActivityManager.Rankings.xml 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/org.kde.ActivityManager.Rankings.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> -<node> - <interface name="org.kde.ActivityManager.Rankings"> - <method name="registerClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - <arg name="activity" type="s" direction="in"/> - <arg name="application" type="s" direction="in"/> - </method> - <method name="registerClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - <arg name="activity" type="s" direction="in"/> - </method> - <method name="registerClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - </method> - <method name="deregisterClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - </method> - </interface> -</node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/org.kde.ActivityManager.RankingsClient.xml new/kactivities-5.4.0/src/service/plugins/sqlite/org.kde.ActivityManager.RankingsClient.xml --- old/kactivities-5.3.0/src/service/plugins/sqlite/org.kde.ActivityManager.RankingsClient.xml 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/org.kde.ActivityManager.RankingsClient.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> -<node> - <interface name="org.kde.ActivityManager.RankingsClient"> - <method name="updated"> - <arg name="requestId" type="s" direction="in"/> - <arg name="action" type="s" direction="in"/> - <arg name="data" type="a{sv}" direction="in"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/> - </method> - </interface> -</node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/src/service/plugins/sqlite/org.kde.ActivityManager.Resources.Scoring.xml new/kactivities-5.4.0/src/service/plugins/sqlite/org.kde.ActivityManager.Resources.Scoring.xml --- old/kactivities-5.3.0/src/service/plugins/sqlite/org.kde.ActivityManager.Resources.Scoring.xml 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/src/service/plugins/sqlite/org.kde.ActivityManager.Resources.Scoring.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> -<node> - <interface name="org.kde.ActivityManager.Resources.Scoring"> - <signal name="resourceScoreUpdated"> - <arg name="activity" type="s" direction="out"/> - <arg name="client" type="s" direction="out"/> - <arg name="resource" type="s" direction="out"/> - <arg name="score" type="d" direction="out"/> - </signal> - <method name="deleteRecentStats"> - <arg name="activity" type="s" direction="in"/> - <arg name="count" type="i" direction="in"/> - <arg name="what" type="s" direction="in"/> - </method> - <method name="deleteEarlierStats"> - <arg name="activity" type="s" direction="in"/> - <arg name="months" type="i" direction="in"/> - </method> - </interface> -</node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/tests/imports/org.kde.listactivitiestest/metadata.desktop new/kactivities-5.4.0/tests/imports/org.kde.listactivitiestest/metadata.desktop --- old/kactivities-5.3.0/tests/imports/org.kde.listactivitiestest/metadata.desktop 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/tests/imports/org.kde.listactivitiestest/metadata.desktop 2014-11-02 13:04:45.000000000 +0100 @@ -12,7 +12,9 @@ Name[gl]=Probas de actividades Name[hu]=Aktivitásteszt Name[ia]=Essayante Activitates +Name[it]=Prova delle attività Name[ko]=활동 테스트 +Name[mr]=कार्यपध्दती चाचणी Name[nb]=Aktiviteter Name[nds]=Aktiviteten-Tests Name[nl]=Testen van activiteiten diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.3.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop new/kactivities-5.4.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop --- old/kactivities-5.3.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop 2014-10-04 18:57:01.000000000 +0200 +++ new/kactivities-5.4.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop 2014-11-02 13:04:45.000000000 +0100 @@ -11,7 +11,9 @@ Name[gl]=Proba da lista de actividades Name[hu]=Aktivitáslista tesztelése Name[ia]=Lista essayos de activitates +Name[it]=Prova dell'elenco delle attività Name[ko]=활동 목록 테스트 +Name[mr]=कार्यपध्दती चाचणी यादी करा Name[nb]=List aktivitetsstester Name[nds]=Aktiviteten-Oplisttest Name[nl]=Lijst maken van activiteitentest @@ -42,6 +44,7 @@ Comment[gl]=Estraño, pero non é un reloxo Comment[hu]=Furcsa, de nem egy óra Comment[ia]=Stranie, ma non un horologio +Comment[it]=Stranamente, non un orologio Comment[ko]=수상하지만 시계는 아님 Comment[nb]=Underlig, men ingen klokke Comment[nds]=Snaaksch, man keen Klock -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
