Changeset View
Changeset View
Standalone View
Standalone View
applets/taskmanager/package/contents/ui/main.qml
| Show First 20 Lines • Show All 176 Lines • ▼ Show 20 Line(s) | 176 | onAddLauncher: { | |||
|---|---|---|---|---|---|
| 177 | tasks.addLauncher(url); | 177 | tasks.addLauncher(url); | ||
| 178 | } | 178 | } | ||
| 179 | } | 179 | } | ||
| 180 | 180 | | |||
| 181 | PlasmaCore.DataSource { | 181 | PlasmaCore.DataSource { | ||
| 182 | id: mpris2Source | 182 | id: mpris2Source | ||
| 183 | engine: "mpris2" | 183 | engine: "mpris2" | ||
| 184 | connectedSources: sources | 184 | connectedSources: sources | ||
| 185 | 185 | function sourceNameForLauncherUrl(launcherUrl, pid) { | |||
| 186 | function sourceNameForLauncherUrl(launcherUrl) { | 186 | if (!launcherUrl || launcherUrl == "") { | ||
| 187 | if (!launcherUrl) { | | |||
| 188 | return ""; | 187 | return ""; | ||
| 189 | } | 188 | } | ||
| 190 | 189 | | |||
| 191 | // MPRIS spec explicitly mentions that "DesktopEntry" is with .desktop extension trimmed | 190 | // MPRIS spec explicitly mentions that "DesktopEntry" is with .desktop extension trimmed | ||
| 192 | // Moreover, remove URL parameters, like wmClass (part after the question mark) | 191 | // Moreover, remove URL parameters, like wmClass (part after the question mark) | ||
| 193 | var desktopFileName = launcherUrl.toString().split('/').pop().split('?')[0].replace(".desktop", "") | 192 | var desktopFileName = launcherUrl.toString().split('/').pop().split('?')[0].replace(".desktop", "") | ||
| 194 | 193 | | |||
| 195 | for (var i = 0, length = sources.length; i < length; ++i) { | 194 | for (var i = 0, length = connectedSources.length; i < length; ++i) { | ||
| 196 | var source = sources[i]; | 195 | var source = connectedSources[i]; | ||
| 196 | // we intend to connect directly, otherwise the multiplexer steals the connection away | ||||
| 197 | if (source === "@multiplex") { | ||||
| 198 | continue; | ||||
| 199 | } | ||||
| 197 | var sourceData = data[source]; | 200 | var sourceData = data[source]; | ||
| 198 | 201 | | |||
| 199 | if (sourceData && sourceData.DesktopEntry === desktopFileName) { | 202 | if (sourceData && sourceData.DesktopEntry === desktopFileName && sourceData.InstancePid === pid) { | ||
| 200 | return source | 203 | return source; | ||
| 201 | } | 204 | } | ||
| 202 | } | 205 | } | ||
| 203 | 206 | | |||
| 204 | return "" | 207 | return "" | ||
| 205 | } | 208 | } | ||
| 206 | 209 | | |||
| 207 | function startOperation(source, op) { | 210 | function startOperation(source, op) { | ||
| 208 | var service = serviceForSource(source) | 211 | var service = serviceForSource(source) | ||
| ▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Line(s) | 363 | Timer { | |||
| 361 | id: layoutTimer | 364 | id: layoutTimer | ||
| 362 | 365 | | |||
| 363 | interval: 0 | 366 | interval: 0 | ||
| 364 | repeat: false | 367 | repeat: false | ||
| 365 | 368 | | |||
| 366 | onTriggered: taskList.layout() | 369 | onTriggered: taskList.layout() | ||
| 367 | } | 370 | } | ||
| 368 | 371 | | |||
| 369 | Repeater { | 372 | Repeater { | ||
hein: Please use proper capitalization and punctuation in code comments throughout the patch. | |||||
| 370 | id: taskRepeater | 373 | id: taskRepeater | ||
| 371 | 374 | | |||
| 372 | delegate: Task {} | 375 | delegate: Task {} | ||
| 373 | | ||||
| 374 | onItemAdded: taskList.layout() | 376 | onItemAdded: taskList.layout() | ||
| 375 | onItemRemoved: taskList.layout() | 377 | onItemRemoved: taskList.layout() | ||
| 376 | } | 378 | } | ||
| 377 | } | 379 | } | ||
"Do things later" timers tend to be hacks that need a comment justifying their existence ... hein: "Do things later" timers tend to be hacks that need a comment justifying their existence ... | |||||
It's the same hack / workaround from Task.qml because of the Qt bugs of the submodel index. Clarified it. romangg: It's the same hack / workaround from Task.qml because of the Qt bugs of the submodel index. | |||||
| 378 | 380 | | |||
| 379 | GroupDialog { id: groupDialog } | 381 | GroupDialog { id: groupDialog } | ||
| 380 | 382 | | |||
| 381 | function hasLauncher(url) { | 383 | function hasLauncher(url) { | ||
| 382 | return tasksModel.launcherPosition(url) != -1; | 384 | return tasksModel.launcherPosition(url) != -1; | ||
| 383 | } | 385 | } | ||
| 384 | 386 | | |||
| 385 | function addLauncher(url) { | 387 | function addLauncher(url) { | ||
| Show All 13 Lines | 400 | if (task) { | |||
| 399 | TaskTools.activateTask(task.modelIndex(), task.m, null, task); | 401 | TaskTools.activateTask(task.modelIndex(), task.m, null, task); | ||
| 400 | } | 402 | } | ||
| 401 | } | 403 | } | ||
| 402 | 404 | | |||
| 403 | function resetDragSource() { | 405 | function resetDragSource() { | ||
| 404 | dragSource = null; | 406 | dragSource = null; | ||
| 405 | } | 407 | } | ||
| 406 | 408 | | |||
| 407 | function createContextMenu(task) { | 409 | function createContextMenu(rootTask, modelIndex) { | ||
| 408 | var menu = tasks.contextMenuComponent.createObject(task); | 410 | var menu = tasks.contextMenuComponent.createObject(rootTask); | ||
| 409 | menu.visualParent = task; | 411 | menu.visualParent = rootTask; | ||
| 412 | menu.modelIndex = modelIndex; | ||||
| 410 | menu.mpris2Source = mpris2Source; | 413 | menu.mpris2Source = mpris2Source; | ||
| 411 | return menu; | 414 | return menu; | ||
| 412 | } | 415 | } | ||
| 413 | 416 | | |||
| 414 | Component.onCompleted: { | 417 | Component.onCompleted: { | ||
| 415 | tasks.requestLayout.connect(layoutTimer.restart); | 418 | tasks.requestLayout.connect(layoutTimer.restart); | ||
| 416 | tasks.requestLayout.connect(iconGeometryTimer.restart); | 419 | tasks.requestLayout.connect(iconGeometryTimer.restart); | ||
| 417 | tasks.windowsHovered.connect(backend.windowsHovered); | 420 | tasks.windowsHovered.connect(backend.windowsHovered); | ||
| 418 | tasks.presentWindows.connect(backend.presentWindows); | 421 | tasks.presentWindows.connect(backend.presentWindows); | ||
| 419 | dragHelper.dropped.connect(resetDragSource); | 422 | dragHelper.dropped.connect(resetDragSource); | ||
| 420 | } | 423 | } | ||
| 421 | } | 424 | } | ||
Please use proper capitalization and punctuation in code comments throughout the patch.