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"

update freehand and color_sampler cursors

based on cursors proposed by Andrei Rudenko, that I remixed with previous cursors

I'm not sure if the tool_color_sampler_cursor is actually still used,
I see it's loaded in the scratchpad but I didn't find any way to activate it
(right click selects the color but don't change the cursor)

update move and move selection cursors

move-selection cursor by Andrei Rudenko

update exposure and gamma gesture cursors

based on cursors proposed by Andrei Rudenko, that I remixed with previous cursors

update color sampler cursors

based on cursors proposed by Andrei Rudenko, that I remixed with previous cursors

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"

Know Zero authored Apr 05, 2021 and Dmitry Kazakov committed Apr 05, 2021

This patch allows importing video and animated images directly into
krita using ffprobe and ffmpeg. It is mostly based on scott's python
plugin, with a few extras, these include:

- Wider video and animated images support (gif works properly)
- Using the slower ffmpeg copy, it works even without ffprobe if needed
- loading the thumbnails via stdout pipe without the disk overhead
- ability to create new documents or import into current document
 * note: ffmpeg import will use default settings for its export of pngs
    which may not exactly honor the users choice of colorspace as this
    is "basic support".

This patch also includes an ffmpeg wrapper that is based on trying to
merge in the future, both the videosaver and the recorder wrapper into
one. The wrapper includes the ability to not only find ffmpeg/ffprobe,
but also to record the capabilities of the ffmpeg encoders and decoders.

This patch as a whole should allow for importing pretty much almost any
format ffmpeg supports. This of course means any format not bundled into
ffmpeg such as an animated webp decoder, or in the case of FOSS versions
of ffmpeg, h264 and h265 will not work. If the user does get a version
that does support it, the capabilities would be recorded and they would
be able to open those formats as well.

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"

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"

At least until we know how to reliably list files with spaces
in their name.

CCMAIL:kde-i18n-doc@kde.org

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"

Paolo Amadini authored Mar 02, 2021 and Halla Rempt committed Mar 08, 2021

This adds a new entry named "Paste into Active Layer" to the Edit menu.
It pastes the image from the clipboard into the active layer or mask,
then activates the Transform tool, allowing the image to be positioned.

The layer is not erased under the pasted image, but the pasted image is
mixed in the same way as when a selection is moved.

Set all light icons color to #d2d2d2

After discussing with our artist crew, f2f2f2 was too much bright;
d2d2d2 is closer to what we had before, with just a little brightness bump.

update dark icons in pics/ to use #373737 as in krita/pics/
update light icons in krita/pics/ to use #f2f2f2 as in pics/

this improves icons contrast in dark and light themes.

So now, all light icons should use #f2f2f2, and all dark icons should use #373737 as before.

Anna Medonosová authored Jan 31, 2021 and Dmitry Kazakov committed Feb 04, 2021

Adds an input action for toggling the canvas-only mode on
and off and hooks it to a four-finger tap touch gesture.

This embeds these into the code and highly simplifies finding them.

(cherry picked from commit 60799a1409b1784507bf840f82f59e7611587b02)

It duplicates the convert layer actions we build since then.

This also needs updating the master branch of the manual!

CCMAIL:kimageshop@kde.org

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"

Halla Rempt authored Dec 16, 2020 and Halla Rempt committed Dec 16, 2020

(cherry picked from commit 9e7a791248af7c0c6d8fe7080450c0f76e834210)
(cherry picked from commit f65b95af95cc1db71af9c27cfe7195e3841c3c09)

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"