|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/.arcconfig
|
| @@ -1,4 +0,0 @@
-{
- "project.name" : "KActivities",
- "phabricator.uri" : "https://phabricator.kde.org/"
-}
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/CMakeLists.txt
^
|
| @@ -47,7 +47,7 @@
find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus)
# KDE Frameworks
-set(KF5_VERSION "5.10.0") # handled by release scripts
+set(KF5_VERSION "5.9.0") # handled by release scripts
set(KF5_DEP_VERSION "5.9.0") # handled by release scripts
find_package (KF5DBusAddons ${KF5_DEP_VERSION} CONFIG REQUIRED)
find_package (KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED)
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/lib/stats/cleaning.h
^
|
| @@ -31,10 +31,10 @@
/**
* Forget the resource(s) for the specified activity and agent
*/
-void KACTIVITIESSTATS_EXPORT forgetResource(Terms::Activity activity, Terms::Agent agent,
+void forgetResource(Terms::Activity activity, Terms::Agent agent,
const QString &resource);
-enum KACTIVITIESSTATS_EXPORT TimeUnit {
+enum TimeUnit {
Hours,
Days,
Months
@@ -43,14 +43,14 @@
/**
* Forget recent stats for the specified activity and time
*/
-void KACTIVITIESSTATS_EXPORT forgetRecentStats(Terms::Activity activity, int count, TimeUnit what);
+void forgetRecentStats(Terms::Activity activity, int count, TimeUnit what);
/**
* Forget events that are older than the specified number of months
*/
-void KACTIVITIESSTATS_EXPORT forgetEarlierStats(Terms::Activity activity, int months);
+void forgetEarlierStats(Terms::Activity activity, int months);
-void KACTIVITIESSTATS_EXPORT forgetResources(const Query &query);
+void forgetResources(const Query &query);
} // namespace Stats
} // namespace Experimental
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/lib/stats/resultset.cpp
^
|
| @@ -202,13 +202,6 @@
return "resource GLOB '" + urlFilter + "'";
}
- QString mimetypeClause(const QString &mimetype) const
- {
- if (mimetype == "*") return "1";
-
- return "mimetype GLOB '" + mimetype + "'";
- }
-
/**
* Transforms the input list's elements with the f member method,
* and returns the resulting list
@@ -242,7 +235,6 @@
" , rl.usedActivity as activity \n"
" , rl.initiatingAgent as agent \n"
" , COALESCE(ri.title, rl.targettedResource) as title \n"
- " , ri.mimetype as mimetype \n"
"FROM \n"
" ResourceLink rl \n"
@@ -259,7 +251,6 @@
" ($agentsFilter) \n"
" AND ($activitiesFilter) \n"
" AND ($urlFilter)\n"
- " AND ($mimetypeFilter)\n"
"GROUP BY resource, title \n"
"ORDER BY $orderingColumn resource ASC\n";
@@ -286,10 +277,6 @@
QStringList urlFilter = transformedList(
queryDefinition.urlFilters(), &Private::urlFilterClause);
- // WHERE clause for filtering on resource mime
- QStringList mimetypeFilter = transformedList(
- queryDefinition.types(), &Private::mimetypeClause);
-
auto query = _query;
return
@@ -298,7 +285,6 @@
.replace("$agentsFilter", agentsFilter.join(" OR "))
.replace("$activitiesFilter", activitiesFilter.join(" OR "))
.replace("$urlFilter", urlFilter.join(" OR "))
- .replace("$mimetypeFilter", mimetypeFilter.join(" OR "))
;
}
@@ -316,7 +302,6 @@
" , rsc.usedActivity as activity \n"
" , rsc.initiatingAgent as agent \n"
" , COALESCE(ri.title, rsc.targettedResource) as title \n"
- " , ri.mimetype as mimetype \n"
"FROM \n"
" ResourceScoreCache rsc \n"
@@ -328,7 +313,6 @@
" ($agentsFilter) \n"
" AND ($activitiesFilter) \n"
" AND ($urlFilter)\n"
- " AND ($mimetypeFilter)\n"
"GROUP BY resource, title \n"
"ORDER BY $orderingColumn resource ASC\n";
@@ -355,10 +339,6 @@
QStringList urlFilter = transformedList(
queryDefinition.urlFilters(), &Private::urlFilterClause);
- // WHERE clause for filtering on resource mime
- QStringList mimetypeFilter = transformedList(
- queryDefinition.types(), &Private::mimetypeClause);
-
auto query = _query;
return kamd::utils::debug_and_return("Query: ",
@@ -367,7 +347,6 @@
.replace("$agentsFilter", agentsFilter.join(" OR "))
.replace("$activitiesFilter", activitiesFilter.join(" OR "))
.replace("$urlFilter", urlFilter.join(" OR "))
- .replace("$mimetypeFilter", mimetypeFilter.join(" OR "))
);
}
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/Application.cpp
^
|
| @@ -138,7 +138,7 @@
Application *Application::Private::s_instance = Q_NULLPTR;
Application::Application(int &argc, char **argv)
- : QGuiApplication(argc, argv)
+ : QCoreApplication(argc, argv)
{
}
@@ -203,7 +203,7 @@
using namespace std::placeholders;
const auto pluginsDir(QLatin1String(KAMD_PLUGIN_DIR));
- QGuiApplication::addLibraryPath(pluginsDir);
+ QCoreApplication::addLibraryPath(pluginsDir);
const auto config
= KSharedConfig::openConfig(QStringLiteral("kactivitymanagerdrc"))
@@ -269,7 +269,7 @@
void Application::quit()
{
- QGuiApplication::quit();
+ QCoreApplication::quit();
}
#include "../lib/core/version.h"
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/Application.h
^
|
| @@ -21,7 +21,7 @@
#define APPLICATION_H
// Qt
-#include <QGuiApplication>
+#include <QCoreApplication>
// Utils
#include <utils/d_ptr.h>
@@ -33,10 +33,8 @@
/**
* Main application object
- * This can *not* be a QCoreApplication because
- * we need KWindowSystem events.
*/
-class Application : public QGuiApplication {
+class Application : public QCoreApplication {
Q_OBJECT
public:
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/Resources.cpp
^
|
| @@ -268,10 +268,10 @@
KDBusConnectionPool::threadConnection().registerObject(
KAMD_DBUS_OBJECT_PATH(Resources), this);
- connect(KWindowSystem::self(), &KWindowSystem::windowRemoved,
- d.operator->(), &Resources::Private::windowClosed);
- connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged,
- d.operator->(), &Resources::Private::activeWindowChanged);
+ d->connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)),
+ SLOT(windowClosed(WId)));
+ d->connect(KWindowSystem::self(), SIGNAL(activeWindowChanged(WId)),
+ SLOT(activeWindowChanged(WId)));
}
Resources::~Resources()
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/files/kactivitymanagerd.desktop
^
|
| @@ -60,7 +60,7 @@
Name[zh_TW]=活動管理員
Comment=The activity management backend
-Comment[ar]=سند إدارة الأنشطة
+Comment[ar]=سَنَد إدارة الأنشطة
Comment[bs]=Pozadina za upravljanje aktivnostima
Comment[ca]=El dorsal pel gestor d'activitats
Comment[ca@valencia]=Dorsal de gestió d'activitats
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop
^
|
| @@ -45,7 +45,6 @@
Comment[ar]=دعم إنشاء قوالب أنشطة
Comment[ca]=Suport per a la creació d'activitats amb plantilles
Comment[ca@valencia]=Suport per a la creació d'activitats aplantillades
-Comment[cs]=Podpora pro vytváření aktivit podle šablon
Comment[da]=Understøttelse af oprettelse af aktiviteter efter skabeloner
Comment[de]=Unterstützung für das Erstellen von Vorlagen für Aktivitäten
Comment[en_GB]=Support for creating templated activities
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/plugins/eventspy/kactivitymanagerd-plugin-eventspy.desktop
^
|
| @@ -1,16 +1,12 @@
[Desktop Entry]
Name=Event Spy
Name[ca]=Espia l'esdeveniment
-Name[cs]=Špeh událostí
-Name[da]=Hændelsesspion
Name[de]=Ereignisüberwachung
Name[en_GB]=Event Spy
Name[es]=Espía de eventos
Name[fi]=Tapahtumavakooja
Name[gl]=Espía de eventos
Name[he]=מרגל אירועים
-Name[it]=Indicatore degli eventi
-Name[ko]=이벤트 첩자
Name[nl]=Gebeurtenisspion
Name[pl]=Szpieg wydarzeń
Name[pt]=Monitor de Eventos
@@ -18,25 +14,16 @@
Name[ru]=Монитор событий
Name[sk]=Špión udalostí
Name[sl]=Nadzor dogodkov
-Name[sr]=Шпијун догађаја
-Name[sr@ijekavian]=Шпијун догађаја
-Name[sr@ijekavianlatin]=Špijun događaja
-Name[sr@latin]=Špijun događaja
Name[sv]=Händelseövervakare
Name[uk]=Журнал подій
Name[x-test]=xxEvent Spyxx
-Name[zh_CN]=事件间谍
Comment=Collects events from applications that support recent documents specification
Comment[ca]=Recull els esdeveniments de les aplicacions que admeten l'especificació dels documents recents
-Comment[cs]=Sbírá z aplikací události jenž podporují určení nedávných dokumentů
-Comment[da]=Indsamler hændelser fra programmer som understøtter specifikationen for nylige dokumenter
Comment[en_GB]=Collects events from applications that support recent documents specification
Comment[es]=Recopila eventos de aplicaciones que incorporan la especificación de documentos recientes
Comment[fi]=Kerää tapahtumia sovelluksilta, jotka tukevat viimeaikaisten tiedostojen määrittelyä
Comment[gl]=Recolle eventos dos programas compatíbeis coa especificación de documentos recentes.
Comment[he]=אוסף אירועים מאת יישומים שתומכים בתקן של מסמכים אחרונים
-Comment[it]=Raccoglie eventi dalle applicazioni che supportano la specifica dei documenti recenti
-Comment[ko]=최근 문서 규격을 지원하는 프로그램의 이벤트 수집
Comment[nl]=Verzamelt gebeurtenissen uit toepassingen die recente documentspecificaties ondersteunen
Comment[pl]=Gromadzi wydarzenia z aplikacji, które spełniają wymogi ostatnich dokumentów
Comment[pt]=Recolhe eventos das aplicações que suportam a especificação dos documentos recentes
@@ -44,14 +31,9 @@
Comment[ru]=Собирает от поддерживаемых приложений события о последних открытых документах
Comment[sk]=Zbiera udalosti z aplikácií, ktoré podporujú špecifikáciu nedávnych dokumentov
Comment[sl]=Zbira dogodke iz programov, ki podpirajo določitev nedavnih dokumentov
-Comment[sr]=Сакупља догађаје из програма који подржавају спецификацију недавних докумената
-Comment[sr@ijekavian]=Сакупља догађаје из програма који подржавају спецификацију недавних докумената
-Comment[sr@ijekavianlatin]=Sakuplja događaje iz programa koji podržavaju specifikaciju nedavnih dokumenata
-Comment[sr@latin]=Sakuplja događaje iz programa koji podržavaju specifikaciju nedavnih dokumenata
Comment[sv]=Samlar in händelser från program som stöder senare dokumentspecifikationer
Comment[uk]=Збирає записи подій від програм, у яких реалізовано специфікацію нещодавніх документів
Comment[x-test]=xxCollects events from applications that support recent documents specificationxx
-Comment[zh_CN]=从支持最近文档标准的应用程序收集事件
Type=Service
Icon=preferences-system
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.desktop
^
|
| @@ -50,7 +50,7 @@
Name[zh_CN]=全局快捷键
Name[zh_TW]=全域捷徑
Comment=Adds global keyboard shortcuts for activity switching
-Comment[ar]=يضيف اختصارات لوحة المفاتيح العموميّة لتبديل النّشاط
+Comment[ar]=يضيف اختصارات لوحة المفاتيح العموميّة لتبديل النشاط
Comment[bs]=Dodaje globalne kratice tastature za prebacivanje aktivnosti
Comment[ca]=Afegeix dreceres de teclat globals per canviar d'activitat
Comment[ca@valencia]=Afig les dreceres de teclat globals per canvi d'activitats
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.desktop
^
|
| @@ -50,7 +50,7 @@
Name[zh_CN]=虚拟桌面切换器
Name[zh_TW]=虛擬桌面切換器
Comment=When switching to an activity, opens the virtual desktop last used with that activity
-Comment[ar]=عند التّبديل إلى نشاط ما، يفتح آخر سطح مكتب وهميّ مُستخدم بذلك النّشاط
+Comment[ar]=عند التّبديل إلى نشاط ما، يَفتَح آخر سطح مكتب وهميّ مُستخدَم بِذلك النّشاط
Comment[bs]=Pri prebacivanju na aktivnost, otvara vitruelni deskstop koji je zadnji korišten s tom aktivnošću
Comment[ca]=En canviar a una activitat, obre el darrer escriptori virtual utilitzat amb aquesta activitat
Comment[ca@valencia]=En canviar a una activitat, obri el darrer escriptori virtual utilitzat amb esta activitat
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop
^
|
| @@ -5,7 +5,6 @@
Name[bs]=Datoteka dodatka za povezivanje na aktivnost
Name[ca]=Connector per enllaçar fitxers amb activitats
Name[ca@valencia]=Fitxer a connector d'enllaç d'activitat
-Name[cs]=MOdul propojující soubor do činnosti
Name[da]=Fil til plugin til aktivitetslinking
Name[de]=Modul für die Verknüpfung von Dateien zu Aktivitäten
Name[el]=Αρχείο σε πρόσθετο σύνδεσης δραστηριοτήτων
|
|
[-]
[+]
|
Changed |
kactivities-5.9.0.tar.xz/tests/CMakeLists.txt
^
|
| @@ -4,6 +4,4 @@
add_subdirectory(stats/model)
endif ()
-add_subdirectory(slc-interface)
-
|
|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/tests/slc-interface
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/tests/slc-interface/CMakeLists.txt
^
|
| @@ -1,47 +0,0 @@
-# vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
-project (KActivitiesSLCTestApp)
-
-find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets)
-
-include_directories (
- ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/lib/core/
- ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/
- ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/autotests/
- ${CMAKE_BINARY_DIR}/src/lib/core/
- )
-
-set (
- KActivitiesSLCTestApp_SRCS
- window.cpp
- main.cpp
- )
-
-qt5_add_dbus_interface (
- KActivitiesSLCTestApp_SRCS
-
- ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/service/plugins/slc/org.kde.ActivityManager.SLC.xml
- slc_interface
- )
-
-qt5_wrap_ui(
- KActivitiesSLCTestApp_SRCS
- window.ui
- )
-
-if (NOT WIN32)
-
- add_executable (
- KActivitiesSLCTestApp
- ${KActivitiesSLCTestApp_SRCS}
- )
-
- target_link_libraries (
- KActivitiesSLCTestApp
- Qt5::Core
- Qt5::Gui
- Qt5::Widgets
- Qt5::DBus
- KF5::Activities
- )
-
-endif ()
|
|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/tests/slc-interface/main.cpp
^
|
| @@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2015 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 version 2,
- * or (at your option) any later version, as published by the Free
- * Software Foundation
- *
- * 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, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <QApplication>
-#include "window.h"
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv);
-
- Window w;
- w.show();
-
- // ResultSet results(UsedResources | Agent{"gvim"});
- //
- // int count = 20;
- // for (const auto& result: results) {
- // qDebug() << "Result:" << result.title << result.resource;
- // if (count -- == 0) break;
- // }
- //
- // ResultModel model(UsedResources | Agent{"gvim"});
- // model.setItemCountLimit(50);
- //
- // QListView view;
- // view.setModel(&model);
- //
- // view.show();
-
- return app.exec();
-}
-
|
|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/tests/slc-interface/window.cpp
^
|
| @@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2015 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 version 2,
- * or (at your option) any later version, as published by the Free
- * Software Foundation
- *
- * 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, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "window.h"
-
-#include "ui_window.h"
-
-#include <QDBusConnection>
-
-Window::Window()
- : ui(new Ui::MainWindow())
- , slc(new org::kde::ActivityManager::SLC(
- "org.kde.ActivityManager",
- "/SLC",
- QDBusConnection::sessionBus(),
- this))
-{
- ui->setupUi(this);
-
- connect(slc, &org::kde::ActivityManager::SLC::focusChanged,
- this, &Window::focusChanged);
-}
-
-Window::~Window()
-{
- delete ui;
-}
-
-void Window::focusChanged(const QString &uri, const QString &mimetype,
- const QString &title)
-{
- ui->textCurrentResource->setText(uri);
-
-}
-
|
|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/tests/slc-interface/window.h
^
|
| @@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 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 version 2,
- * or (at your option) any later version, as published by the Free
- * Software Foundation
- *
- * 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, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include <QMainWindow>
-#include "slc_interface.h"
-
-namespace Ui {
- class MainWindow;
-}
-
-class Window: public QMainWindow {
- Q_OBJECT
-
-public:
- Window();
- ~Window();
-
-private Q_SLOTS:
- void focusChanged(const QString &uri, const QString &mimetype, const QString &title);
-
-private:
- Ui::MainWindow *ui;
- org::kde::ActivityManager::SLC *slc;
-};
-
|
|
[-]
[+]
|
Deleted |
kactivities-5.9.0.tar.xz/tests/slc-interface/window.ui
^
|
| @@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>474</width>
- <height>74</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>MainWindow</string>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="icon">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>64</width>
- <height>64</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="labelCurrentResource">
- <property name="text">
- <string>Resource</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="textCurrentResource">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelCurrentResourceTitle">
- <property name="text">
- <string>Title</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="textCurrentResourceTitle">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="labelCurrentResourceMimetype">
- <property name="text">
- <string>Mimetype</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="textCurrentResourceMimetype">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
|
