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"

This reverts commit 0b18655f.

The previous refresh of assistant and measure icon might be enough to solve
the issue, so reverting this icon change for now.

new assistant tool icon

The previous icon could be confused with the measure tool,
so it was requested to make a different icon not related to measure

new snapshot-load icon

The previous icon was confusing,
as users could think it was meant to capture a snapshot

Also loading a snapshot can be dangerous as it will lose the current status
if not saved in a snapshot, so I added an exclamation mark inside the icon
as a warning sign

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

fix loading the QTabBar icon and QHeaderView spacing on startup

the tab bar icon and headerview spacing were not loaded anymore
unless manually changing the theme, so moving that in a dedicated function
and use it on startup.

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"

Now animators can skip to the next keyframe (or previous keyframe) that matches the onion skins
filtration settings. The actions are called `previous_unfiltered_keyframe` and `next_unfiltered_keyframe`
and must be bound to a keyboard shortcut via Krita settings.

BUG:405431

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"

Sachin Jindal authored Mar 31, 2021 and Dmitry Kazakov committed Mar 31, 2021

Move imagesize from plugins to libs/ui
Introduce new parameter in Export hierarchy
Creates a new Menu entry similar to Export.
Reuse the Scale Image to New Size in Export.

Bug: 397172

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"

Both deprecation warnings as unused parameter warnings.

Reinold Rojas authored Mar 12, 2021 and Dmitry Kazakov committed Mar 22, 2021

Currently the "Color" action in the toolbar does not have a
tooltip if you hover over it. This patch adds a tooltip to
that action.