GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This reverts commit 526b1e90.

It did not solve the problem described in bug 422052 :(

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG: 424380

BUG: 397121
FIXED-IN: 20.08.0

(cherry picked from commit 2eed8ce0)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary:
The feature adds a runtime dependency on D29407 Plasma 5.20.

BUG: 414532
BUG: 407489
FIXED-IN: 5.20

Reviewers: davidre, davidedmundson, apol, bport, ngraham

Reviewed By: davidre, apol

Subscribers: pejakm, #spectacle

Tags: #spectacle

Differential Revision: https://phabricator.kde.org/D29408

(cherry picked from commit 28e01818)

Summary:
Since Spectacle got DBus activation support in 09cd1188, it has been run in multiple instance mode.
But it has been shaddowed by using qbus ee862d16 in the desktop file to mimic singleton behavior.

This refactors Spectacle to run in true single instance mode using KDBusService::Unique.
This is to allow Spectacle to have its executable in its Exec desktop Entry, to allow KWin to match the executable to the service file, itself to allow screenshots under Wayland without intermediate click.

The listed bugs are fixed incidently except for 414739 where a simple fix was added in screenShotUpdated.

BUG: 420477
BUG: 414739

CCBUG: 412186

Test Plan:
Start spectacle, alternatively, from shortcut, command line.
Take screenshots, from alternative ways.

There is always at most one Spectacle window unless launched with `--new-instance`.

Reviewers: davidre, ngraham, bport, davidedmundson, apol

Reviewed By: davidre

Subscribers: broulik, anthonyfieroni, #spectacle

Tags: #spectacle

Differential Revision: https://phabricator.kde.org/D29487

GIT_SILENT

Summary: Remove unused variable mCopyImageToClipboard

Reviewers: #spectacle, davidre, ngraham

Reviewed By: #spectacle, davidre

Subscribers: #spectacle

Tags: #spectacle

Differential Revision: https://phabricator.kde.org/D29589

(cherry picked from commit cc6cb0d0)

Summary:
Only the Spectacle instance that requested a screenshot will receive it.
BUG:412186

Reviewers: meven, #spectacle

Reviewed By: meven

Tags: #spectacle

Differential Revision: https://phabricator.kde.org/D29620

Reviewers: davidre, davidedmundson, #spectacle

Reviewed By: davidedmundson

Tags: #spectacle

Differential Revision: https://phabricator.kde.org/D29305

This was once upon a time used because there was a dependency on kscreen.

Summary:
Changed position of message to change image quality.
I think the label is better read before the compression quality bar.
I used Qt Designer for this.

Before:
{F8254672}

After:
{F8254673}

Reviewers: #spectacle, #vdg, ngraham, davidre

Reviewed By: #spectacle, #vdg, ngraham, davidre

Subscribers: davidre, ngraham

Tags: #spectacle

Differential Revision: https://phabricator.kde.org/D29113