GitLab

Antonio Prcela authored Jan 19, 2022 and Nate Graham committed Jan 19, 2022

Rearranged code to check 'copy-image' before 'output', in case the command goes like:
spectacle -b -c -o ./file.png

So the file also gets saved. Otherwise, with the old arrangement, it would only save
to clipboard ignoring '-o'.

BUG: 447811
FIXED-IN: 22.04

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"

Antonio Prcela authored Jan 11, 2022 and Nate Graham committed Jan 11, 2022

Simplify the logic by removing the bool isBackgroundMode. Fix double notifications
where one has dots instead of the filename and save path.

Add missing notification text if mCopyLocationToClipboard is set. Uses 2in1
principle: Considering that when mCopyLocationToClipboard is true it means that
the image also gets saved as a file, so this makes the notification text show
both the path where it's saved & the name of it _and_ the information that the
file path has been added to the clipboard.

BUG: 447517
FIXED-IN: 22.04

Otherwise if one launches spectacle without taking a screenshot and
wants to record the screen using peek the required function can not
be called. So one has to launch spectacle, take a screenshot and then
launch a screen recording plugin like Peek.

MR107 was a bit too much :)
!107

(cherry picked from commit 984d767b)

Antonio Prcela authored Dec 30, 2021 and Bharadwaj Raju committed Jan 02, 2022

Don't treat it as an error when 'on click' is enabled and a user presses right mouse
click while taking a screenshot with rectangluar mode, instead of drawing a rectangle
with left click.
Instead, treat it as a simple cancel without failure.

BUG: 446882

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"

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"

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"

The latter is only for KF modules to use.

GIT_SILENT

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"

Antonio Prcela authored Dec 09, 2021 and Nate Graham committed Dec 13, 2021

Man page mentions `--clipboard` but in `SpectacleCore.cpp` it actually expects `--copy-image`.
Also, `--copy-path` is not mentioned at all in the man page.
Change man page to reflect codee and add `--copy-path` to man page.

BUG: 446710

BUG: 446578

Méven Car authored Nov 16, 2021 and Méven Car committed Dec 13, 2021

BUG: 429390

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"

(cherry picked from commit c8eedb63)

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"