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"

lock() call requests all the strokes to finish, which is not
what we want during autosave. Therefore, we just forbid autosave
while some action is running.

This patch will also fix some bugs with random hickups when doing
strokes (when autosave does something in the background).

That way, people can access all their disks more easily.

https://phabricator.kde.org/D3218

Coffeeeeee, I want coffee.

From https://phabricator.kde.org/diffusion/KRITA/ to
https://phabricator.kde.org/source/krita/

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"

I haven't managed to find time to optimize the performance
more, so give people a choice which version to use. The
config key is

popuppalette/usevisualcolorselector

If it's set to true, the new color selector is used.

Reviewers: dkazakov, rempt

Reviewed By: rempt

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

Patch by David Marquant. Thanks!

Its Linux driver supports openGL 3.0 only

BUG:373490

Ref T119

Merge remote-tracking branch 'origin/kazakov/scale-from-pivot-point-T119' into rempt/impex-refactoring

# Conflicts:
#	plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
#	plugins/tools/tool_transform2/wdg_tool_transform.ui

TODO: merge it into krita/3.1 after the release is done!

In that case we don't want to ise the framesdir for the resulting
animation.

Patch by Bruno Kinoshita. Thanks!
CCMAIL:brunodepaulak@yahoo.com.br

It appeared that my matrix decomposition could not decompose an
identity matrix :( Well, we need to implement a better one, e.g.
from CSS. For now just avoid division by zero.

Most probably, the problem appeared after introduction of cursor
snapping. Before snapping identity matrix was almost impossible
to get with a mouse cursor.

BUG:372677
Ref T4840

BUG:373316
Fixes T4837

Fixes T4790

The problem happens because some actions are created/added-to-collection
only after a document is created. Now we workaround it by faking the
absent actions and deleting them together with KisActionsSnapshot.

Another problem is that some of the actions, e.g. "show_color_history",
is created long before it is added to the global action collection. It
is _created_ right at the start of Krita, but _added_ only when a new document
is constructed. If we change the shortcut between these two events, then
the changed value will be lost. Now we workaround this problem by connecting
to the action collection, listening to 'inserted()' signal and updating
shortcuts when an action is added to the collection.

BUG:370720

This is both easier to find, and will work on Windows.

BUG:362869

To enable sanity check, uncomment the corresponding define in
KisActionsSnapshot.cpp

There should be no extra semicolon after functions in C++