Differential D1722 Diff 4228 libtaskmanager/activityinfo.cpp

Changeset View

Standalone View

View Options

libtaskmanager/activityinfo.cpp

  • This file was added.
1​/********************************************************************
2​Copyright 2016 Eike Hein <hein.org>
3​
4​This library is free software; you can redistribute it and/or
5​modify it under the terms of the GNU Lesser General Public
6​License as published by the Free Software Foundation; either
7​version 2.1 of the License, or (at your option) version 3, or any
8​later version accepted by the membership of KDE e.V. (or its
9​successor approved by the membership of KDE e.V.), which shall
10​act as a proxy defined in Section 6 of version 3 of the license.
11​
12​This library is distributed in the hope that it will be useful,
13​but WITHOUT ANY WARRANTY; without even the implied warranty of
14​MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​Lesser General Public License for more details.
16​
17​You should have received a copy of the GNU Lesser General Public
18​License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*********************************************************************/
20​
21​#include "activityinfo.h"
22​
23​#include <KActivities/Consumer>
24​
25​namespace TaskManager
26​{
27​
28​class ActivityInfo::Private
29​{
30​public:
31​ Private(ActivityInfo *q);
32​ ~Private();
33​
34​ QHash<QString, KActivities::Info *> activityInfos;
35​
36​ static int instanceCount;
37​ static KActivities::Consumer* activityConsumer;
38​
39​ void refreshActivityInfos();
40​
41​private:
42​ ActivityInfo *q;
43​};
44​
45​int ActivityInfo::Private::instanceCount = 0;
46​KActivities::Consumer* ActivityInfo::Private::activityConsumer = nullptr;
47​
48​ActivityInfo::Private::Private(ActivityInfo *q)
49​ : q(q)
50​{
51​ ++instanceCount;
52​}
53​
54​ActivityInfo::Private::~Private()
55​{
56​ --instanceCount;
davidedmundsonUnsubmitted
Done

..and set pointer to null

Otherwise you have a crash if you delete them all and then then create a new one.

(or use QWeak and QShared pointer )

davidedmundson: ..and set pointer to null Otherwise you have a crash if you delete them all and then then…
heinAuthorUnsubmitted
Not Done

Done, also in TasksModel.

hein: Done, also in TasksModel.
57​
58​ if (!instanceCount) {
59​ delete activityConsumer;
60​ }
61​}
62​
63​void ActivityInfo::Private::refreshActivityInfos()
64​{
65​ QMutableHashIterator<QString, KActivities::Info *> it(activityInfos);
66​
67​ // Cull invalid activities.
68​ while (it.hasNext()) {
69​ it.next();
70​
davidedmundsonUnsubmitted
Done

If I have 4 activities. 2 running, 2 not.

numberOfActivities returns 2

I set one to running:

the property changes
this signal is not emitted.

davidedmundson: If I have 4 activities. 2 running, 2 not. numberOfActivities returns 2 I set one to running…
heinAuthorUnsubmitted
Done

Good catch. I think the old lib had this issue too ...

KActivities has no convenient API to listen to changes in the list of running activities, it seems - instead you have to keep a KActivities::Info around for all activtities, and listen to their stateChanged signals. Annoying ...

hein: Good catch. I think the old lib had this issue too ... KActivities has no convenient API to…
heinAuthorUnsubmitted
Not Done

Implemented.

hein: Implemented.
71​ if (!it.value()->isValid()) {
72​ delete it.value();
73​ it.remove();
74​ }
75​ }
76​
77​ // Find new activities and start listening for changes in their state.
78​ foreach(const QString &activity, activityConsumer->activities()) {
79​ if (!activityInfos.contains(activity)) {
80​ KActivities::Info *info = new KActivities::Info(activity, q);
81​
82​ // By connecting to ourselves, we will immediately clean up when an
83​ // activity's state transitions to Invalid.
84​ connect(info, SIGNAL(stateChanged(KActivities::Info::State)),
85​ q, SLOT(refreshActivityInfos()));
86​
87​ activityInfos.insert(activity, info);
88​ }
89​ }
90​
91​ // Activity list or activity state changes -> number of running
92​ // activities may have changed.
93​ q->numberOfRunningActivitiesChanged();
94​}
95​
96​ActivityInfo::ActivityInfo(QObject *parent) : QObject(parent)
97​ , d(new Private(this))
98​{
99​ if (!d->activityConsumer) {
100​ d->activityConsumer = new KActivities::Consumer();
101​ }
102​
103​ d->refreshActivityInfos();
104​
105​ connect(d->activityConsumer, &KActivities::Consumer::currentActivityChanged,
106​ this, &ActivityInfo::currentActivityChanged);
107​ connect(d->activityConsumer, SIGNAL(activitiesChanged(QStringList)),
108​ this, SLOT(refreshActivityInfos()));
109​}
110​
111​ActivityInfo::~ActivityInfo()
112​{
113​}
114​
115​QString ActivityInfo::currentActivity() const
116​{
117​ return d->activityConsumer->currentActivity();
118​}
119​
120​int ActivityInfo::numberOfRunningActivities() const
121​{
122​ return d->activityConsumer->activities(KActivities::Info::State::Running).count();
123​}
124​
125​QStringList ActivityInfo::runningActivities() const
126​{
127​ return d->activityConsumer->activities(KActivities::Info::State::Running);
128​}
129​
130​QString ActivityInfo::activityName(const QString &id)
131​{
132​ KActivities::Info info(id);
133​
134​ if (info.state() != KActivities::Info::Invalid) {
135​ return info.name();
136​ }
137​
138​ return QString();
139​}
140​
141​}
142​
143​#include "moc_activityinfo.cpp"