Differential D7481 Diff 18588 libtaskmanager/xwindowtasksmodel.cpp

Changeset View

Standalone View

View Options

libtaskmanager/xwindowtasksmodel.cpp

Show All 15 Lines
16Lesser General Public License for more details. 16​Lesser General Public License for more details.
17 17​
18You should have received a copy of the GNU Lesser General Public 18​You should have received a copy of the GNU Lesser General Public
19License along with this library. If not, see <http://www.gnu.org/licenses/>. 19​License along with this library. If not, see <http://www.gnu.org/licenses/>.
20*********************************************************************/ 20​*********************************************************************/
21 21​
22#include "xwindowtasksmodel.h" 22​#include "xwindowtasksmodel.h"
23#include "tasktools.h" 23​#include "tasktools.h"
24​#include "xwindowsystemeventbatcher.h"
24 25​
25#include <KActivities/ResourceInstance> 26​#include <KActivities/ResourceInstance>
26#include <KConfigGroup> 27​#include <KConfigGroup>
27#include <KDesktopFile> 28​#include <KDesktopFile>
28#include <KDirWatch> 29​#include <KDirWatch>
29#include <KIconLoader> 30​#include <KIconLoader>
30#include <KRun> 31​#include <KRun>
31#include <KService> 32​#include <KService>
▲ Show 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s)145 [this](const QStringList &changedResources) {
145 if (changedResources.contains(QLatin1String("services")) 146​ if (changedResources.contains(QLatin1String("services"))
146 || changedResources.contains(QLatin1String("apps")) 147​ || changedResources.contains(QLatin1String("apps"))
147 || changedResources.contains(QLatin1String("xdgdata-apps"))) { 148​ || changedResources.contains(QLatin1String("xdgdata-apps"))) {
148 sycocaChangeTimer.start(); 149​ sycocaChangeTimer.start();
149 } 150​ }
150 } 151​ }
151 ); 152​ );
152 153​
153 QObject::connect(KWindowSystem::self(), &KWindowSystem::windowAdded, q, 154​ auto windowSystem = new XWindowSystemEventBatcher(q);
155​
156​ QObject::connect(windowSystem, &XWindowSystemEventBatcher::windowAdded, q,
154 [this](WId window) { 157​ [this](WId window) {
155 addWindow(window); 158​ addWindow(window);
156 } 159​ }
157 ); 160​ );
158 161​
159 QObject::connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, q, 162​ QObject::connect(windowSystem, &XWindowSystemEventBatcher::windowRemoved, q,
160 [this](WId window) { 163​ [this](WId window) {
161 removeWindow(window); 164​ removeWindow(window);
162 } 165​ }
163 ); 166​ );
164 167​
165 void (KWindowSystem::*myWindowChangeSignal)(WId window, 168​ QObject::connect(windowSystem, &XWindowSystemEventBatcher::windowChanged, q,
166 NET::Properties properties, NET::Properties2 properties2) = &KWindowSystem::windowChanged; ​
167 QObject::connect(KWindowSystem::self(), myWindowChangeSignal, q, ​
168 [this](WId window, NET::Properties properties, NET::Properties2 properties2) { 169​ [this](WId window, NET::Properties properties, NET::Properties2 properties2) {
169 windowChanged(window, properties, properties2); 170​ windowChanged(window, properties, properties2);
170 } 171​ }
171 ); 172​ );
172 173​
173 // Update IsActive for previously- and newly-active windows. 174​ // Update IsActive for previously- and newly-active windows.
174 QObject::connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, q, 175​ QObject::connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, q,
175 [this](WId window) { 176​ [this](WId window) {
▲ Show 20 Lines • Show All 1197 Lines • Show Last 20 Lines