diff --git a/krita/krita.action b/krita/krita.action
index 87c6cb96d4..2a524c374f 100644
--- a/krita/krita.action
+++ b/krita/krita.action
@@ -1,3467 +1,3507 @@
General
Open Resources Folder
Opens a file browser at the location Krita saves resources such as brushes to.
Opens a file browser at the location Krita saves resources such as brushes to.
Open Resources Folder
0
0
false
Cleanup removed files...
Cleanup removed files
Cleanup removed files
0
0
false
C&ascade
Cascade
Cascade
10
0
false
&Tile
Tile
Tile
10
0
false
Create Resource Bundle...
Create Resource Bundle
Create Resource Bundle
0
0
false
Show File Toolbar
Show File Toolbar
Show File Toolbar
false
Show color selector
Show color selector
Show color selector
Shift+I
false
Show MyPaint shade selector
Show MyPaint shade selector
Show MyPaint shade selector
Shift+M
false
Show minimal shade selector
Show minimal shade selector
Show minimal shade selector
Shift+N
false
Show color history
Show color history
Show color history
H
false
Show common colors
Show common colors
Show common colors
U
false
Show Tool Options
Show Tool Options
Show Tool Options
\
false
Show Brush Editor
Show Brush Editor
Show Brush Editor
F5
false
Show Brush Presets
Show Brush Presets
Show Brush Presets
F6
false
Toggle Tablet Debugger
Toggle Tablet Debugger
Toggle Tablet Debugger
0
0
Ctrl+Shift+T
false
Show system information for bug reports.
Show system information for bug reports.
Show system information for bug reports.
false
Rename Composition...
Rename Composition
Rename Composition
0
0
false
Update Composition
Update Composition
Update Composition
0
0
false
Use multiple of 2 for pixel scale
Use multiple of 2 for pixel scale
Use multiple of 2 for pixel scale
Use multiple of 2 for pixel scale
1
0
true
&Invert Selection
Invert current selection
Invert Selection
10000000000
100
Ctrl+Shift+I
false
Painting
lightness-increase
Make brush color lighter
Make brush color lighter
Make brush color lighter
0
0
L
false
lightness-decrease
Make brush color darker
Make brush color darker
Make brush color darker
0
0
K
false
Make brush color more saturated
Make brush color more saturated
Make brush color more saturated
false
Make brush color more desaturated
Make brush color more desaturated
Make brush color more desaturated
false
Shift brush color hue clockwise
Shift brush color hue clockwise
Shift brush color hue clockwise
false
Shift brush color hue counter-clockwise
Shift brush color hue counter-clockwise
Shift brush color hue counter-clockwise
false
Make brush color more red
Make brush color more red
Make brush color more red
false
Make brush color more green
Make brush color more green
Make brush color more green
false
Make brush color more blue
Make brush color more blue
Make brush color more blue
false
Make brush color more yellow
Make brush color more yellow
Make brush color more yellow
false
opacity-increase
Increase opacity
Increase opacity
Increase opacity
0
0
O
false
opacity-decrease
Decrease opacity
Decrease opacity
Decrease opacity
0
0
I
false
draw-eraser
Set eraser mode
Set eraser mode
Set eraser mode
10000
0
E
true
view-refresh
Reload Original Preset
Reload Original Preset
Reload Original Preset
10000
false
transparency-unlocked
Preserve Alpha
Preserve Alpha
Preserve Alpha
10000
true
transform_icons_penPressure
Use Pen Pressure
Use Pen Pressure
Use Pen Pressure
10000
true
symmetry-horizontal
Horizontal Mirror Tool
Horizontal Mirror Tool
Horizontal Mirror Tool
0
true
symmetry-vertical
Vertical Mirror Tool
Vertical Mirror Tool
Vertical Mirror Tool
0
true
Hide Mirror X Line
Hide Mirror X Line
Hide Mirror X Line
10000
true
Hide Mirror Y Line
Hide Mirror Y Line
Hide Mirror Y Line
10000
true
Lock
Lock X Line
Lock X Line
10000
true
Lock Y Line
Lock Y Line
Lock Y Line
10000
true
Move to Canvas Center
Move to Canvas Center X
Move to Canvas Center X
10000
false
Move to Canvas Center Y
Move to Canvas Center Y
Move to Canvas Center Y
10000
false
&Toggle Selection Display Mode
Toggle Selection Display Mode
Toggle Selection Display Mode
0
0
false
Next Favourite Preset
Next Favourite Preset
Next Favourite Preset
,
false
Previous Favourite Preset
Previous Favourite Preset
Previous Favourite Preset
.
false
preset-switcher
Switch to Previous Preset
Switch to Previous Preset
Switch to Previous Preset
/
false
Hide Brushes and Stuff Toolbar
Hide Brushes and Stuff Toolbar
Hide Brushes and Stuff Toolbar
true
Reset Foreground and Background Color
Reset Foreground and Background Color
Reset Foreground and Background Color
D
false
Swap Foreground and Background Color
Swap Foreground and Background Color
Swap Foreground and Background Color
X
false
+
+
+ Selection Mode: Add
+
+ Selection Mode: Add
+ Selection Mode: Add
+ A
+ false
+
+
+
+
+ Selection Mode: Subtract
+
+ Selection Mode: Subtract
+ Selection Mode: Subtract
+ S
+ false
+
+
+
+
+ Selection Mode: Intersect
+
+ Selection Mode: Intersect
+ Selection Mode: Intersect
+
+ false
+
+
+
+
+ Selection Mode: Replace
+
+ Selection Mode: Replace
+ Selection Mode: Replace
+ R
+ false
+
+
smoothing-weighted
Brush Smoothing: Weighted
Brush Smoothing: Weighted
Brush Smoothing: Weighted
false
smoothing-no
Brush Smoothing: Disabled
Brush Smoothing: Disabled
Brush Smoothing: Disabled
false
smoothing-stabilizer
Brush Smoothing: Stabilizer
Brush Smoothing: Stabilizer
Brush Smoothing: Stabilizer
false
brushsize-decrease
Decrease Brush Size
Decrease Brush Size
Decrease Brush Size
0
0
[
false
smoothing-basic
Brush Smoothing: Basic
Brush Smoothing: Basic
Brush Smoothing: Basic
false
brushsize-increase
Increase Brush Size
Increase Brush Size
Increase Brush Size
0
0
]
false
Toggle Assistant
Toggle Assistant
ToggleAssistant
Ctrl+Shift+L
true
Undo Polygon Selection Points
Undo Polygon Selection Points
Undo Polygon Selection Points
Shift+Z
false
Fill with Foreground Color (Opacity)
Fill with Foreground Color (Opacity)
Fill with Foreground Color (Opacity)
10000
1
Ctrl+Shift+Backspace
false
Fill with Background Color (Opacity)
Fill with Background Color (Opacity)
Fill with Background Color (Opacity)
10000
1
Ctrl+Backspace
false
Fill with Pattern (Opacity)
Fill with Pattern (Opacity)
Fill with Pattern (Opacity)
10000
1
false
Convert &to Shape
Convert to Shape
Convert to Shape
10000000000
0
false
&Show Global Selection Mask
Shows global selection as a usual selection mask in <interface>Layers</interface> docker
Show Global Selection Mask
100000
100
true
Filters
color-to-alpha
&Color to Alpha...
Color to Alpha
Color to Alpha
10000
0
false
&Top Edge Detection
Top Edge Detection
Top Edge Detection
10000
0
false
&Index Colors...
Index Colors
Index Colors
10000
0
false
Emboss Horizontal &Only
Emboss Horizontal Only
Emboss Horizontal Only
10000
0
false
D&odge
Dodge
Dodge
10000
0
false
&Sharpen
Sharpen
Sharpen
10000
0
false
B&urn
Burn
Burn
10000
0
false
&Mean Removal
Mean Removal
Mean Removal
10000
0
false
&Gaussian Blur...
Gaussian Blur
Gaussian Blur
10000
0
false
Emboss &in All Directions
Emboss in All Directions
Emboss in All Directions
10000
0
false
&Small Tiles...
Small Tiles
Small Tiles
10000
0
false
&Levels...
Levels
Levels
10000
0
Ctrl+L
false
&Sobel...
Sobel
Sobel
10000
0
false
&Wave...
Wave
Wave
10000
0
false
&Motion Blur...
Motion Blur
Motion Blur
10000
0
false
&Invert
Invert
Invert
10000
0
Ctrl+I
false
&Color Adjustment curves...
Color Adjustment curves
Color Adjustment curves
10000
0
Ctrl+M
false
Pi&xelize...
Pixelize
Pixelize
10000
0
false
Emboss (&Laplacian)
Emboss (Laplacian)
Emboss (Laplacian)
10000
0
false
&Left Edge Detection
Left Edge Detection
Left Edge Detection
10000
0
false
&Blur...
Blur
Blur
10000
0
false
&Raindrops...
Raindrops
Raindrops
10000
0
false
&Bottom Edge Detection
Bottom Edge Detection
Bottom Edge Detection
10000
0
false
&Random Noise...
Random Noise
Random Noise
10000
0
false
&Brightness/Contrast curve...
Brightness/Contrast curve
Brightness/Contrast curve
10000
0
false
Colo&r Balance...
Color Balance
Color Balance
10000
0
Ctrl+B
false
&Phong Bumpmap...
Phong Bumpmap
Phong Bumpmap
10000
0
false
&Desaturate
Desaturate
Desaturate
10000
0
Ctrl+Shift+U
false
Color &Transfer...
Color Transfer
Color Transfer
10000
0
false
Emboss &Vertical Only
Emboss Vertical Only
Emboss Vertical Only
10000
0
false
&Lens Blur...
Lens Blur
Lens Blur
10000
0
false
M&inimize Channel
Minimize Channel
Minimize Channel
10000
0
false
M&aximize Channel
Maximize Channel
Maximize Channel
10000
0
false
&Oilpaint...
Oilpaint
Oilpaint
10000
0
false
&Right Edge Detection
Right Edge Detection
Right Edge Detection
10000
0
false
&Auto Contrast
Auto Contrast
Auto Contrast
10000
0
false
&Round Corners...
Round Corners
Round Corners
10000
0
false
&Unsharp Mask...
Unsharp Mask
Unsharp Mask
10000
0
false
&Emboss with Variable Depth...
Emboss with Variable Depth
Emboss with Variable Depth
10000
0
false
Emboss &Horizontal && Vertical
Emboss Horizontal & Vertical
Emboss Horizontal & Vertical
10000
0
false
Random &Pick...
Random Pick
Random Pick
10000
0
false
&Gaussian Noise Reduction...
Gaussian Noise Reduction
Gaussian Noise Reduction
10000
0
false
&Posterize...
Posterize
Posterize
10000
0
false
&Wavelet Noise Reducer...
Wavelet Noise Reducer
Wavelet Noise Reducer
10000
0
false
&HSV Adjustment...
HSV Adjustment
HSV Adjustment
10000
0
Ctrl+U
false
Tool Shortcuts
Dynamic Brush Tool
Dynamic Brush Tool
Dynamic Brush Tool
false
Crop Tool
Crop the image to an area
Crop the image to an area
C
false
Polygon Tool
Polygon Tool. Shift-mouseclick ends the polygon.
Polygon Tool. Shift-mouseclick ends the polygon.
false
Rectangle Tool
Rectangle Tool
Rectangle Tool
false
Multibrush Tool
Multibrush Tool
Multibrush Tool
Q
false
Colorize Mask Tool
Colorize Mask Tool
Colorize Mask Tool
Smart Patch Tool
Smart Patch Tool
Smart Patch Tool
Pan Tool
Pan Tool
Pan Tool
Select Shapes Tool
Select Shapes Tool
Select Shapes Tool
false
Color Picker
Select a color from the image or current layer
Select a color from the image or current layer
P
false
Outline Selection Tool
Outline Selection Tool
Outline Selection Tool
false
Bezier Curve Selection Tool
Select a
Bezier Curve Selection Tool
false
Similar Color Selection Tool
Select a
Similar Color Selection Tool
false
Fill Tool
Fill a contiguous area of color with a color, or fill a selection.
Fill a contiguous area of color with a color, or fill a selection.
F
false
Line Tool
Line Tool
Line Tool
false
Freehand Path Tool
Freehand Path Tool
Freehand Path Tool
false
Bezier Curve Tool
Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.
Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.
false
Ellipse Tool
Ellipse Tool
Ellipse Tool
false
Freehand Brush Tool
Freehand Brush Tool
Freehand Brush Tool
B
false
Create object
Create object
Create object
false
Elliptical Selection Tool
Elliptical Selection Tool
Elliptical Selection Tool
J
false
Contiguous Selection Tool
Contiguous Selection Tool
Contiguous Selection Tool
false
Pattern editing
Pattern editing
Pattern editing
false
Review
Review
Review
false
Draw a gradient.
Draw a gradient.
Draw a gradient.
G
false
Polygonal Selection Tool
Polygonal Selection Tool
Polygonal Selection Tool
false
Measurement Tool
Measure the distance between two points
Measure the distance between two points
false
Rectangular Selection Tool
Rectangular Selection Tool
Rectangular Selection Tool
Ctrl+R
false
Move Tool
Move a layer
Move a layer
T
false
Vector Image Tool
Vector Image (EMF/WMF/SVM/SVG) tool
Vector Image (EMF/WMF/SVM/SVG) tool
false
Calligraphy
Calligraphy
Calligraphy
false
Path editing
Path editing
Path editing
false
Zoom Tool
Zoom Tool
Zoom Tool
false
Polyline Tool
Polyline Tool. Shift-mouseclick ends the polyline.
Polyline Tool. Shift-mouseclick ends the polyline.
false
Transform Tool
Transform a layer or a selection
Transform a layer or a selection
Ctrl+T
false
Assistant Tool
Assistant Tool
Assistant Tool
false
Text tool
Text tool
Text tool
false
Gradient Editing Tool
Gradient editing
Gradient editing
false
Reference Images Tool
Reference Images Tool
Reference Images Tool
false
Blending Modes
Select Normal Blending Mode
Select Normal Blending Mode
Select Normal Blending Mode
0
0
Alt+Shift+N
false
Select Dissolve Blending Mode
Select Dissolve Blending Mode
Select Dissolve Blending Mode
0
0
Alt+Shift+I
false
Select Behind Blending Mode
Select Behind Blending Mode
Select Behind Blending Mode
0
0
Alt+Shift+Q
false
Select Clear Blending Mode
Select Clear Blending Mode
Select Clear Blending Mode
0
0
Alt+Shift+R
false
Select Darken Blending Mode
Select Darken Blending Mode
Select Darken Blending Mode
0
0
Alt+Shift+K
false
Select Multiply Blending Mode
Select Multiply Blending Mode
Select Multiply Blending Mode
0
0
Alt+Shift+M
false
Select Color Burn Blending Mode
Select Color Burn Blending Mode
Select Color Burn Blending Mode
0
0
Alt+Shift+B
false
Select Linear Burn Blending Mode
Select Linear Burn Blending Mode
Select Linear Burn Blending Mode
0
0
Alt+Shift+A
false
Select Lighten Blending Mode
Select Lighten Blending Mode
Select Lighten Blending Mode
0
0
Alt+Shift+G
false
Select Screen Blending Mode
Select Screen Blending Mode
Select Screen Blending Mode
0
0
Alt+Shift+S
false
Select Color Dodge Blending Mode
Select Color Dodge Blending Mode
Select Color Dodge Blending Mode
0
0
Alt+Shift+D
false
Select Linear Dodge Blending Mode
Select Linear Dodge Blending Mode
Select Linear Dodge Blending Mode
0
0
Alt+Shift+W
false
Select Overlay Blending Mode
Select Overlay Blending Mode
Select Overlay Blending Mode
0
0
Alt+Shift+O
false
Select Hard Overlay Blending Mode
Select Hard Overlay Blending Mode
Select Hard Overlay Blending Mode
0
0
Alt+Shift+P
false
Select Soft Light Blending Mode
Select Soft Light Blending Mode
Select Soft Light Blending Mode
0
0
Alt+Shift+F
false
Select Hard Light Blending Mode
Select Hard Light Blending Mode
Select Hard Light Blending Mode
0
0
Alt+Shift+H
false
Select Vivid Light Blending Mode
Select Vivid Light Blending Mode
Select Vivid Light Blending Mode
0
0
Alt+Shift+V
false
Select Linear Light Blending Mode
Select Linear Light Blending Mode
Select Linear Light Blending Mode
0
0
Alt+Shift+J
false
Select Pin Light Blending Mode
Select Pin Light Blending Mode
Select Pin Light Blending Mode
0
0
Alt+Shift+Z
false
Select Hard Mix Blending Mode
Select Hard Mix Blending Mode
Select Hard Mix Blending Mode
0
0
Alt+Shift+L
false
Select Difference Blending Mode
Select Difference Blending Mode
Select Difference Blending Mode
0
0
Alt+Shift+E
false
Select Exclusion Blending Mode
Select Exclusion Blending Mode
Select Exclusion Blending Mode
0
0
Alt+Shift+X
false
Select Hue Blending Mode
Select Hue Blending Mode
Select Hue Blending Mode
0
0
Alt+Shift+U
false
Select Saturation Blending Mode
Select Saturation Blending Mode
Select Saturation Blending Mode
0
0
Alt+Shift+T
false
Select Color Blending Mode
Select Color Blending Mode
Select Color Blending Mode
0
0
Alt+Shift+C
false
Select Luminosity Blending Mode
Select Luminosity Blending Mode
Select Luminosity Blending Mode
0
0
Alt+Shift+Y
false
Animation
Previous frame
Move to previous frame
Move to previous frame
1
0
false
Next frame
Move to next frame
Move to next frame
1
0
false
Play / pause animation
Play / pause animation
Play / pause animation
1
0
false
addblankframe
Create Blank Frame
Add blank frame
Add blank frame
100000
0
false
addduplicateframe
Create Duplicate Frame
Add duplicate frame
Add duplicate frame
100000
0
false
Toggle onion skin
Toggle onion skin
Toggle onion skin
100000
0
false
Previous Keyframe
false
Next Keyframe
false
First Frame
false
Last Frame
false
Auto Frame Mode
true
true
Show in Timeline
true
Insert Keyframe Left
Insert keyframes to the left of selection, moving the tail of animation to the right.
100000
0
false
Insert Keyframe Right
Insert keyframes to the right of selection, moving the tail of animation to the right.
100000
0
false
Insert Multiple Keyframes
Insert several keyframes based on user parameters.
100000
0
false
Remove Frame and Pull
Remove keyframes moving the tail of animation to the left
100000
0
false
deletekeyframe
Remove Keyframe
Remove keyframes without moving anything around
100000
0
false
Insert Column Left
Insert column to the left of selection, moving the tail of animation to the right
100000
0
false
Insert Column Right
Insert column to the right of selection, moving the tail of animation to the right
100000
0
false
Insert Multiple Columns
Insert several columns based on user parameters.
100000
0
false
Remove Column and Pull
Remove columns moving the tail of animation to the left
100000
0
false
Remove Column
Remove columns without moving anything around
100000
0
false
Insert Hold Frame
Insert a hold frame after every keyframe
100000
0
false
Insert Multiple Hold Frames
Insert N hold frames after every keyframe
100000
0
false
Remove Hold Frame
Remove a hold frame after every keyframe
100000
0
false
Remove Multiple Hold Frames
Remove N hold frames after every keyframe
100000
0
false
Insert Hold Column
Insert a hold column into the frame at the current position
100000
0
false
Insert Multiple Hold Columns
Insert N hold columns into the frame at the current position
100000
0
false
Remove Hold Column
Remove a hold column from the frame at the current position
100000
0
false
Remove Multiple Hold Columns
Remove N hold columns from the frame at the current position
100000
0
false
Mirror Frames
Mirror frames' position
100000
0
false
Mirror Columns
Mirror columns' position
100000
0
false
Copy to Clipboard
Copy frames to clipboard
100000
0
false
Cut to Clipboard
Cut frames to clipboard
100000
0
false
Paste from Clipboard
Paste frames from clipboard
100000
0
false
Copy Columns to Clipboard
Copy columns to clipboard
100000
0
false
Cut Columns to Clipboard
Cut columns to clipboard
100000
0
false
Paste Columns from Clipboard
Paste columns from clipboard
100000
0
false
Set Start Time
100000
0
false
Set End Time
100000
0
false
Update Playback Range
100000
0
false
Layers
Activate next layer
Activate next layer
Activate next layer
1000
0
PgUp
false
Activate previous layer
Activate previous layer
Activate previous layer
1000
0
PgDown
false
Activate previously selected layer
Activate previously selected layer
Activate previously selected layer
1000
0
;
false
groupLayer
&Group Layer
Group Layer
Group Layer
1000
0
false
cloneLayer
&Clone Layer
Clone Layer
Clone Layer
1000
0
false
vectorLayer
&Vector Layer
Vector Layer
Vector Layer
1000
0
false
filterLayer
&Filter Layer...
Filter Layer
Filter Layer
1000
0
false
fillLayer
&Fill Layer...
Fill Layer
Fill Layer
1000
0
false
fileLayer
&File Layer...
File Layer
File Layer
1000
0
false
transparencyMask
&Transparency Mask
Transparency Mask
Transparency Mask
100000
0
false
filterMask
&Filter Mask...
Filter Mask
Filter Mask
100000
0
false
filterMask
&Colorize Mask
Colorize Mask
Colorize Mask
100000
0
false
transformMask
&Transform Mask...
Transform Mask
Transform Mask
100000
0
false
selectionMask
&Local Selection
Local Selection
Local Selection
100000
0
false
view-filter
&Isolate Layer
Isolate Layer
Isolate Layer
1000
0
true
layer-locked
&Toggle layer lock
Toggle layer lock
Toggle layer lock
1000
0
false
visible
Toggle layer &visibility
Toggle layer visibility
Toggle layer visibility
1000
0
false
transparency-locked
Toggle layer &alpha
Toggle layer alpha
Toggle layer alpha
1000
0
false
transparency-enabled
Toggle layer alpha &inheritance
Toggle layer alpha inheritance
Toggle layer alpha inheritance
1000
0
false
paintLayer
&Paint Layer
Paint Layer
Paint Layer
1000
0
Insert
false
&New Layer From Visible
New layer from visible
New layer from visible
1000
0
false
duplicatelayer
&Duplicate Layer or Mask
Duplicate Layer or Mask
Duplicate Layer or Mask
1000
0
Ctrl+J
false
&Cut Selection to New Layer
Cut Selection to New Layer
Cut Selection to New Layer
100000000
1
Ctrl+Shift+J
false
Copy &Selection to New Layer
Copy Selection to New Layer
Copy Selection to New Layer
100000000
0
Ctrl+Alt+J
false
Copy Layer
Copy layer to clipboard
Copy layer to clipboard
1000
0
false
Cut Layer
Cut layer to clipboard
Cut layer to clipboard
1000
0
false
Paste Layer
Paste layer from clipboard
Paste layer from clipboard
1000
0
false
Quick Group
Create a group layer containing selected layers
Quick Group
1000
0
Ctrl+G
false
Quick Ungroup
Remove grouping of the layers or remove one layer out of the group
Quick Ungroup
100000
0
Ctrl+Alt+G
false
Quick Clipping Group
Group selected layers and add a layer with clipped alpha channel
Quick Clipping Group
100000
0
Ctrl+Shift+G
false
All Layers
Select all layers
Select all layers
10000
0
false
Visible Layers
Select all visible layers
Select all visible layers
10000
0
false
Locked Layers
Select all locked layers
Select all locked layers
10000
0
false
Invisible Layers
Select all invisible layers
Select all invisible layers
10000
0
false
Unlocked Layers
Select all unlocked layers
Select all unlocked layers
10000
0
false
document-save
&Save Layer/Mask...
Save Layer/Mask
Save Layer/Mask
1000
0
false
document-save
Save Vector Layer as SVG...
Save Vector Layer as SVG
Save Vector Layer as SVG
1000
0
false
document-save
Save &Group Layers...
Save Group Layers
Save Group Layers
100000
0
false
Convert group to &animated layer
Convert child layers into animation frames
Convert child layers into animation frames
100000
0
false
fileLayer
to &File Layer
Saves out the layers into a new image and then references that image.
Convert to File Layer
100000
0
false
I&mport Layer...
Import Layer
Import Layer
100000
0
false
paintLayer
&as Paint Layer...
as Paint Layer
as Paint Layer
1000
0
false
transparencyMask
as &Transparency Mask...
as Transparency Mask
as Transparency Mask
1000
0
false
filterMask
as &Filter Mask...
as Filter Mask
as Filter Mask
1000
0
false
selectionMask
as &Selection Mask...
as Selection Mask
as Selection Mask
1000
0
false
paintLayer
to &Paint Layer
to Paint Layer
to Paint Layer
1000
0
false
transparencyMask
to &Transparency Mask
to Transparency Mask
to Transparency Mask
1000
0
false
filterMask
to &Filter Mask...
to Filter Mask
to Filter Mask
1000
0
false
selectionMask
to &Selection Mask
to Selection Mask
to Selection Mask
1000
0
false
transparencyMask
&Alpha into Mask
Alpha into Mask
Alpha into Mask
100000
10
false
transparency-enabled
&Write as Alpha
Write as Alpha
Write as Alpha
1000000
1
false
document-save
&Save Merged...
Save Merged
Save Merged
1000000
0
false
split-layer
Split Layer...
Split Layer
Split Layer
1000
0
false
Wavelet Decompose ...
Wavelet Decompose
Wavelet Decompose
1000
1
false
symmetry-horizontal
Mirror Layer Hori&zontally
Mirror Layer Horizontally
Mirror Layer Horizontally
1000
1
false
symmetry-vertical
Mirror Layer &Vertically
Mirror Layer Vertically
Mirror Layer Vertically
1000
1
false
&Rotate Layer...
Rotate Layer
Rotate Layer
1000
1
false
object-rotate-right
Rotate &Layer 90° to the Right
Rotate Layer 90° to the Right
Rotate Layer 90° to the Right
1000
1
false
object-rotate-left
Rotate Layer &90° to the Left
Rotate Layer 90° to the Left
Rotate Layer 90° to the Left
1000
1
false
Rotate Layer &180°
Rotate Layer 180°
Rotate Layer 180°
1000
1
false
Scale &Layer to new Size...
Scale Layer to new Size
Scale Layer to new Size
100000
1
false
&Shear Layer...
Shear Layer
Shear Layer
1000
1
false
&Offset Layer...
Offset Layer
Offset Layer
100000
1
false
Clones &Array...
Clones Array
Clones Array
100000
0
false
&Edit metadata...
Edit metadata
Edit metadata
100000
1
false
&Histogram...
Histogram
Histogram
100000
0
false
&Convert Layer Color Space...
Convert Layer Color Space
Convert Layer Color Space
100000
1
false
merge-layer-below
&Merge with Layer Below
Merge with Layer Below
Merge with Layer Below
100000
0
Ctrl+E
false
&Flatten Layer
Flatten Layer
Flatten Layer
100000
0
false
Ras&terize Layer
Rasterize Layer
Rasterize Layer
10000000
1
false
Flatten ima&ge
Flatten image
Flatten image
100000
0
Ctrl+Shift+E
false
La&yer Style...
Layer Style
Layer Style
100000
1
false
Move into previous group
Move into previous group
Move into previous group
0
0
false
Move into next group
Move into next group
Move into next group
0
0
false
Rename current layer
Rename current layer
Rename current layer
100000
0
F2
false
deletelayer
&Remove Layer
Remove Layer
Remove Layer
1000
1
Shift+Delete
false
arrowupblr
Move Layer or Mask Up
Move Layer or Mask Up
Ctrl+PgUp
false
arrowdown
Move Layer or Mask Down
Move Layer or Mask Down
Ctrl+PgDown
false
properties
&Properties...
Properties
Properties
1000
1
F3
false
diff --git a/libs/ui/tool/kis_selection_tool_config_widget_helper.cpp b/libs/ui/tool/kis_selection_tool_config_widget_helper.cpp
index cad29cbc4c..94a3b95a2b 100644
--- a/libs/ui/tool/kis_selection_tool_config_widget_helper.cpp
+++ b/libs/ui/tool/kis_selection_tool_config_widget_helper.cpp
@@ -1,136 +1,131 @@
/*
* Copyright (c) 2011 Dmitry Kazakov
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_selection_tool_config_widget_helper.h"
#include
#include "kis_selection_options.h"
#include "kis_canvas2.h"
#include "KisViewManager.h"
#include "kis_canvas_resource_provider.h"
#include "kis_signals_blocker.h"
#include
#include
KisSelectionToolConfigWidgetHelper::KisSelectionToolConfigWidgetHelper(const QString &windowTitle)
: m_optionsWidget(0),
m_windowTitle(windowTitle)
{
}
void KisSelectionToolConfigWidgetHelper::createOptionWidget(KisCanvas2 *canvas, const QString &toolId)
{
m_optionsWidget = new KisSelectionOptions(canvas);
Q_CHECK_PTR(m_optionsWidget);
m_optionsWidget->setObjectName(toolId + "option widget");
m_optionsWidget->setWindowTitle(m_windowTitle);
slotToolActivatedChanged(true);
// See https://bugs.kde.org/show_bug.cgi?id=316896
QWidget *specialSpacer = new QWidget(m_optionsWidget);
specialSpacer->setObjectName("SpecialSpacer");
specialSpacer->setFixedSize(0, 0);
m_optionsWidget->layout()->addWidget(specialSpacer);
connect(m_optionsWidget, &KisSelectionOptions::actionChanged,
this, &KisSelectionToolConfigWidgetHelper::slotWidgetActionChanged);
connect(m_optionsWidget, &KisSelectionOptions::modeChanged,
this, &KisSelectionToolConfigWidgetHelper::slotWidgetModeChanged);
m_optionsWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
m_optionsWidget->adjustSize();
}
KisSelectionOptions* KisSelectionToolConfigWidgetHelper::optionWidget() const
{
return m_optionsWidget;
}
SelectionMode KisSelectionToolConfigWidgetHelper::selectionMode() const
{
return m_selectionMode;
}
SelectionAction KisSelectionToolConfigWidgetHelper::selectionAction() const
{
return m_selectionAction;
}
void KisSelectionToolConfigWidgetHelper::slotWidgetActionChanged(int action)
{
if (action >= SELECTION_REPLACE && action <= SELECTION_INTERSECT) {
m_selectionAction = (SelectionAction)action;
KConfigGroup cfg = KSharedConfig::openConfig()->group("KisToolSelectBase");
cfg.writeEntry("selectionAction", action);
}
}
void KisSelectionToolConfigWidgetHelper::slotWidgetModeChanged(int mode)
{
m_selectionMode = (SelectionMode)mode;
KConfigGroup cfg = KSharedConfig::openConfig()->group("KisToolSelectBase");
cfg.writeEntry("selectionMode", mode);
}
+void KisSelectionToolConfigWidgetHelper::slotReplaceModeRequested()
+{
+ m_optionsWidget->setAction(SELECTION_REPLACE);
+ slotWidgetActionChanged(m_optionsWidget->action());
+}
+
+void KisSelectionToolConfigWidgetHelper::slotAddModeRequested()
+{
+ m_optionsWidget->setAction(SELECTION_ADD);
+ slotWidgetActionChanged(m_optionsWidget->action());
+}
+
+void KisSelectionToolConfigWidgetHelper::slotSubtractModeRequested()
+{
+ m_optionsWidget->setAction(SELECTION_SUBTRACT);
+ slotWidgetActionChanged(m_optionsWidget->action());
+}
+
+void KisSelectionToolConfigWidgetHelper::slotIntersectModeRequested()
+{
+ m_optionsWidget->setAction(SELECTION_INTERSECT);
+ slotWidgetActionChanged(m_optionsWidget->action());
+}
+
void KisSelectionToolConfigWidgetHelper::slotToolActivatedChanged(bool isActivated)
{
if (!isActivated) return;
KConfigGroup cfg = KSharedConfig::openConfig()->group("KisToolSelectBase");
m_selectionAction = (SelectionAction)cfg.readEntry("selectionAction", (int)SELECTION_REPLACE);
m_selectionMode = (SelectionMode)cfg.readEntry("selectionMode", (int)SHAPE_PROTECTION);
KisSignalsBlocker b(m_optionsWidget);
m_optionsWidget->setAction(m_selectionAction);
m_optionsWidget->setMode(m_selectionMode);
}
-
-
-bool KisSelectionToolConfigWidgetHelper::processKeyPressEvent(QKeyEvent *event)
-{
- event->accept();
-
- switch(event->key()) {
- case Qt::Key_A:
- slotWidgetActionChanged(SELECTION_ADD);
- break;
- case Qt::Key_S:
- slotWidgetActionChanged(SELECTION_SUBTRACT);
- break;
- case Qt::Key_R:
- slotWidgetActionChanged(SELECTION_REPLACE);
- break;
- case Qt::Key_T:
- slotWidgetActionChanged(SELECTION_INTERSECT);
- break;
- default:
- event->ignore();
- }
-
- if (event->isAccepted()) {
- slotToolActivatedChanged(true);
- }
-
- return event->isAccepted();
-}
diff --git a/libs/ui/tool/kis_selection_tool_config_widget_helper.h b/libs/ui/tool/kis_selection_tool_config_widget_helper.h
index b42d078d05..0e58075994 100644
--- a/libs/ui/tool/kis_selection_tool_config_widget_helper.h
+++ b/libs/ui/tool/kis_selection_tool_config_widget_helper.h
@@ -1,68 +1,73 @@
/*
* Copyright (c) 2011 Dmitry Kazakov
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __KIS_SELECTION_TOOL_CONFIG_WIDGET_HELPER_H
#define __KIS_SELECTION_TOOL_CONFIG_WIDGET_HELPER_H
#include
#include "kritaui_export.h"
#include "kis_selection.h"
#include "kis_canvas_resource_provider.h"
class QKeyEvent;
class KisCanvas2;
class KisSelectionOptions;
class KoCanvasResourceManager;
class KRITAUI_EXPORT KisSelectionToolConfigWidgetHelper : public QObject
{
Q_OBJECT
public:
KisSelectionToolConfigWidgetHelper(const QString &windowTitle);
void createOptionWidget(KisCanvas2 *canvas, const QString &toolId);
KisSelectionOptions* optionWidget() const;
SelectionMode selectionMode() const;
SelectionAction selectionAction() const;
int action() const { return selectionAction(); }
bool processKeyPressEvent(QKeyEvent *event);
Q_SIGNALS:
void selectionActionChanged(int newAction);
void selectionModeChanged(int newMode);
public Q_SLOTS:
void slotToolActivatedChanged(bool isActivated);
void slotWidgetActionChanged(int action);
void slotWidgetModeChanged(int mode);
+ void slotReplaceModeRequested();
+ void slotAddModeRequested();
+ void slotSubtractModeRequested();
+ void slotIntersectModeRequested();
+
private:
KisSelectionOptions* m_optionsWidget;
QString m_windowTitle;
SelectionMode m_selectionMode;
SelectionAction m_selectionAction;
};
#endif /* __KIS_SELECTION_TOOL_CONFIG_WIDGET_HELPER_H */
diff --git a/libs/ui/tool/kis_tool_select_base.h b/libs/ui/tool/kis_tool_select_base.h
index 56181368e1..ebfe759ae4 100644
--- a/libs/ui/tool/kis_tool_select_base.h
+++ b/libs/ui/tool/kis_tool_select_base.h
@@ -1,331 +1,383 @@
/* This file is part of the KDE project
* Copyright (C) 2009 Boudewijn Rempt
* Copyright (C) 2015 Michael Abrahams
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef KISTOOLSELECTBASE_H
#define KISTOOLSELECTBASE_H
#include "KoPointerEvent.h"
#include "kis_tool.h"
#include "kis_canvas2.h"
#include "kis_selection.h"
#include "kis_selection_options.h"
#include "kis_selection_tool_config_widget_helper.h"
#include "KisViewManager.h"
#include "kis_selection_manager.h"
#include "kis_selection_modifier_mapper.h"
#include "strokes/move_stroke_strategy.h"
#include "kis_image.h"
#include "kis_cursor.h"
+#include "kis_action_manager.h"
+#include "kis_action.h"
+#include "kis_signal_auto_connection.h"
/**
* This is a basic template to create selection tools from basic path based drawing tools.
* The template overrides the ability to execute alternate actions correctly.
* The default behavior for the modifier keys is as follows:
*
* Shift: add to selection
* Alt: subtract from selection
* Shift+Alt: intersect current selection
* Ctrl: replace selection
*
* The mapping itself is done in KisSelectionModifierMapper.
*
* Certain tools also use modifier keys to alter their behavior, e.g. forcing square proportions with the rectangle tool.
* The template enables the following rules for forwarding keys:
* 1) Any modifier keys held *when the tool is first activated* will determine
* the new selection method. This is recorded in m_selectionActionAlternate. A
* value of m_selectionActionAlternate = SELECTION_DEFAULT means no modifier was
* being pressed when the tool was activated.
*
* 2) If the underlying tool *does not take modifier keys*, pressing modifier
* keys in the middle of a stroke will change the selection method. This is
* recorded in m_selectionAction. A value of SELECTION_DEFAULT means no modifier
* is being pressed. Applies to the lasso tool and polygon tool.
*
* 3) If the underlying tool *takes modifier keys,* they will always be
* forwarded to the underlying tool, and it is not possible to change the
* selection method in the middle of a stroke.
*/
template
class KisToolSelectBase : public BaseClass
{
public:
KisToolSelectBase(KoCanvasBase* canvas, const QString toolName)
:BaseClass(canvas),
m_widgetHelper(toolName),
m_selectionAction(SELECTION_DEFAULT),
m_selectionActionAlternate(SELECTION_DEFAULT)
{
KisSelectionModifierMapper::instance();
+ initShortcuts();
}
KisToolSelectBase(KoCanvasBase* canvas, const QCursor cursor, const QString toolName)
:BaseClass(canvas, cursor),
m_widgetHelper(toolName),
m_selectionAction(SELECTION_DEFAULT),
m_selectionActionAlternate(SELECTION_DEFAULT)
{
+ KisSelectionModifierMapper::instance();
+ initShortcuts();
}
KisToolSelectBase(KoCanvasBase* canvas, QCursor cursor, QString toolName, KisTool *delegateTool)
:BaseClass(canvas, cursor, delegateTool),
m_widgetHelper(toolName),
m_selectionAction(SELECTION_DEFAULT),
m_selectionActionAlternate(SELECTION_DEFAULT)
{
+ KisSelectionModifierMapper::instance();
+ initShortcuts();
+ }
+
+ void initShortcuts()
+ {
+ KisCanvas2 * kiscanvas = static_cast(canvas());
+ KisViewManager* viewManager = kiscanvas->viewManager();
+ KisActionManager *manager = viewManager->actionManager();
+
+ KisAction *action = 0;
+
+ action = manager->createAction("selection_tool_mode_add");
+ this->addAction(action->objectName(), action);
+
+ action = manager->createAction("selection_tool_mode_replace");
+ this->addAction(action->objectName(), action);
+
+ action = manager->createAction("selection_tool_mode_subtract");
+ this->addAction(action->objectName(), action);
+
+ action = manager->createAction("selection_tool_mode_intersect");
+ this->addAction(action->objectName(), action);
+ }
+
+ void activate(KoToolBase::ToolActivation activation, const QSet &shapes)
+ {
+ BaseClass::activate(activation, shapes);
+
+ m_modeConnections.addUniqueConnection(
+ this->action("selection_tool_mode_replace"), SIGNAL(triggered()),
+ &m_widgetHelper, SLOT(slotReplaceModeRequested()));
+
+ m_modeConnections.addUniqueConnection(
+ this->action("selection_tool_mode_add"), SIGNAL(triggered()),
+ &m_widgetHelper, SLOT(slotAddModeRequested()));
+
+ m_modeConnections.addUniqueConnection(
+ this->action("selection_tool_mode_subtract"), SIGNAL(triggered()),
+ &m_widgetHelper, SLOT(slotSubtractModeRequested()));
+
+ m_modeConnections.addUniqueConnection(
+ this->action("selection_tool_mode_intersect"), SIGNAL(triggered()),
+ &m_widgetHelper, SLOT(slotIntersectModeRequested()));
+
+ }
+
+ void deactivate()
+ {
+ BaseClass::deactivate();
+ m_modeConnections.clear();
}
QWidget* createOptionWidget()
{
KisCanvas2* canvas = dynamic_cast(this->canvas());
Q_ASSERT(canvas);
m_widgetHelper.createOptionWidget(canvas, this->toolId());
this->connect(this, SIGNAL(isActiveChanged(bool)), &m_widgetHelper, SLOT(slotToolActivatedChanged(bool)));
return m_widgetHelper.optionWidget();
}
- void keyPressEvent(QKeyEvent *event)
- {
- if (!m_widgetHelper.processKeyPressEvent(event)) {
- BaseClass::keyPressEvent(event);
- }
- }
-
SelectionMode selectionMode() const
{
return m_widgetHelper.selectionMode();
}
SelectionAction selectionAction() const
{
if (alternateSelectionAction() == SELECTION_DEFAULT) {
return m_widgetHelper.selectionAction();
}
return alternateSelectionAction();
}
bool antiAliasSelection() const
{
return m_widgetHelper.optionWidget()->antiAliasSelection();
}
SelectionAction alternateSelectionAction() const
{
return m_selectionActionAlternate;
}
KisSelectionOptions* selectionOptionWidget()
{
return m_widgetHelper.optionWidget();
}
virtual void setAlternateSelectionAction(SelectionAction action)
{
m_selectionActionAlternate = action;
dbgKrita << "Changing to selection action" << m_selectionActionAlternate;
}
void activateAlternateAction(KisTool::AlternateAction action)
{
Q_UNUSED(action);
BaseClass::activatePrimaryAction();
}
void deactivateAlternateAction(KisTool::AlternateAction action)
{
Q_UNUSED(action);
BaseClass::deactivatePrimaryAction();
}
void beginAlternateAction(KoPointerEvent *event, KisTool::AlternateAction action) {
Q_UNUSED(action);
beginPrimaryAction(event);
}
void continueAlternateAction(KoPointerEvent *event, KisTool::AlternateAction action) {
Q_UNUSED(action);
continuePrimaryAction(event);
}
void endAlternateAction(KoPointerEvent *event, KisTool::AlternateAction action) {
Q_UNUSED(action);
endPrimaryAction(event);
}
KisNodeSP locateSelectionMaskUnderCursor(const QPointF &pos, Qt::KeyboardModifiers modifiers) {
if (modifiers != Qt::NoModifier) return 0;
KisCanvas2* canvas = dynamic_cast(this->canvas());
KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(canvas, 0);
KisSelectionSP selection = canvas->viewManager()->selection();
if (selection &&
selection->outlineCacheValid() &&
selection->outlineCache().contains(pos)) {
KisNodeSP parent = selection->parentNode();
if (parent && parent->isEditable()) {
return parent;
}
}
return 0;
}
void mouseMoveEvent(KoPointerEvent *event) {
if (!this->hasUserInteractionRunning()) {
const QPointF pos = this->convertToPixelCoord(event->point);
KisNodeSP selectionMask = locateSelectionMaskUnderCursor(pos, event->modifiers());
if (selectionMask) {
this->useCursor(KisCursor::moveCursor());
} else {
this->resetCursorStyle();
}
}
BaseClass::mouseMoveEvent(event);
}
virtual void beginPrimaryAction(KoPointerEvent *event)
{
if (!this->hasUserInteractionRunning()) {
const QPointF pos = this->convertToPixelCoord(event->point);
KisCanvas2* canvas = dynamic_cast(this->canvas());
KIS_SAFE_ASSERT_RECOVER_RETURN(canvas);
KisNodeSP selectionMask = locateSelectionMaskUnderCursor(pos, event->modifiers());
if (selectionMask) {
KisStrokeStrategy *strategy = new MoveStrokeStrategy({selectionMask}, this->image().data(), this->image().data());
m_moveStrokeId = this->image()->startStroke(strategy);
m_dragStartPos = pos;
return;
}
}
keysAtStart = event->modifiers();
setAlternateSelectionAction(KisSelectionModifierMapper::map(keysAtStart));
if (alternateSelectionAction() != SELECTION_DEFAULT) {
BaseClass::listenToModifiers(false);
}
BaseClass::beginPrimaryAction(event);
}
virtual void continuePrimaryAction(KoPointerEvent *event)
{
if (m_moveStrokeId) {
const QPointF pos = this->convertToPixelCoord(event->point);
const QPoint offset((pos - m_dragStartPos).toPoint());
this->image()->addJob(m_moveStrokeId, new MoveStrokeStrategy::Data(offset));
return;
}
//If modifier keys have changed, tell the base tool it can start capturing modifiers
if ((keysAtStart != event->modifiers()) && !BaseClass::listeningToModifiers()) {
BaseClass::listenToModifiers(true);
}
//Always defer to the base class if it signals it is capturing modifier keys
if (!BaseClass::listeningToModifiers()) {
setAlternateSelectionAction(KisSelectionModifierMapper::map(event->modifiers()));
}
BaseClass::continuePrimaryAction(event);
}
void endPrimaryAction(KoPointerEvent *event)
{
if (m_moveStrokeId) {
this->image()->endStroke(m_moveStrokeId);
m_moveStrokeId.clear();
return;
}
keysAtStart = Qt::NoModifier; //reset this with each action
BaseClass::endPrimaryAction(event);
}
void changeSelectionAction(int newSelectionAction)
{
// Simple sanity check
if(newSelectionAction >= SELECTION_REPLACE &&
newSelectionAction <= SELECTION_INTERSECT &&
m_selectionAction != newSelectionAction)
{
m_selectionAction = (SelectionAction)newSelectionAction;
}
}
bool selectionDragInProgress() const {
return m_moveStrokeId;
}
protected:
using BaseClass::canvas;
KisSelectionToolConfigWidgetHelper m_widgetHelper;
SelectionAction m_selectionAction;
SelectionAction m_selectionActionAlternate;
private:
Qt::KeyboardModifiers keysAtStart;
QPointF m_dragStartPos;
KisStrokeId m_moveStrokeId;
+
+ KisSignalAutoConnectionsStore m_modeConnections;
};
struct FakeBaseTool : KisTool
{
FakeBaseTool(KoCanvasBase* canvas)
: KisTool(canvas, QCursor())
{
}
FakeBaseTool(KoCanvasBase* canvas, const QString &toolName)
: KisTool(canvas, QCursor())
{
Q_UNUSED(toolName);
}
FakeBaseTool(KoCanvasBase* canvas, const QCursor &cursor)
: KisTool(canvas, cursor)
{
}
bool hasUserInteractionRunning() const {
return false;
}
};
typedef KisToolSelectBase KisToolSelect;
#endif // KISTOOLSELECTBASE_H