diff --git a/krita/krita.action b/krita/krita.action
index 25aea754a5..0deae46fbd 100644
--- a/krita/krita.action
+++ b/krita/krita.action
@@ -1,3104 +1,3155 @@
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
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
&Invert Selection
Invert current selection
Invert Selection
10000000000
100
Ctrl+Shift+I
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
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
&Select Opaque
Select Opaque
Select Opaque
100000
100
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
&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
Lazy Brush Tool
Lazy Brush Tool
Lazy Brush Tool
Smart Patch Tool
Smart Patch Tool
Smart Patch Tool
Pan Tool
Pan Tool
Pan Tool
Shape Manipulation Tool
Shape Manipulation Tool
Shape Manipulation Tool
false
Color Picker
Select a color from the image or current layer
Select a color from the image or current layer
P
false
Text Editing Tool
Text editing
Text editing
false
Outline Selection Tool
Outline Selection Tool
Outline Selection Tool
false
Artistic Text Tool
Artistic text editing
Artistic text editing
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 ends the curve.
Bezier Curve Tool. Shift-mouseclick 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
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
Add blank frame
Add blank frame
Add blank frame
100000
0
false
Copy 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
Add blank frame
Add blank frame
Add blank frame
100000
0
false
Show in Timeline
true
+
+
+ Insert N Frame Left
+
+ Insert N Frame Left
+ Insert N Frame Left
+ 100000
+ 0
+
+ false
+
+
+
+
+ Insert N Frame Right
+
+ Insert N Frame Right
+ Insert N Frame Right
+ 100000
+ 0
+
+ false
+
+
+
+
+ Clear Columns
+
+ Clear Columns
+ Clear Columns
+ 100000
+ 0
+
+ false
+
+
+
+
+ Remove Columns
+
+ Remove Columns
+ Remove Columns
+ 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
100000
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/krita/kritamenu.action b/krita/kritamenu.action
index 88e12bd7f2..5c5bcb41a1 100644
--- a/krita/kritamenu.action
+++ b/krita/kritamenu.action
@@ -1,1819 +1,1822 @@
File
document-new
&New
Create new document
New
0
0
Ctrl+N
false
document-open
&Open...
Open an existing document
Open
0
0
Ctrl+O
false
document-open-recent
Open &Recent
Open a document which was recently opened
Open Recent
1
0
false
document-save
&Save
Save
Save
1
0
Ctrl+S
false
document-save-as
Save &As...
Save document under a new name
Save As
1
0
Ctrl+Shift+S
false
Sessions...
Open session manager
Sessions
0
0
false
document-import
Open ex&isting Document as Untitled Document...
Open existing Document as Untitled Document
Open existing Document as Untitled Document
0
0
false
document-export
E&xport...
Export
Export
1
0
false
application-pdf
&Export as PDF...
Export as PDF
Export as PDF
1
0
false
Import animation frames...
Import animation frames
Import animation frames
1
0
false
&Render Animation...
Render Animation to GIF, Image Sequence or Video
Render Animation
1000
0
false
&Render Image Sequence Again
Render Animation to Image Sequence Again
Render Animation
1000
0
false
Save Incremental &Version
Save Incremental Version
Save Incremental Version
1
0
Ctrl+Alt+S
false
Save Incremental &Backup
Save Incremental Backup
Save Incremental Backup
1
0
F4
false
&Create Template From Image...
Create Template From Image
Create Template From Image
1
0
false
Create Copy &From Current Image
Create Copy From Current Image
Create Copy From Current Image
1
0
false
document-print
&Print...
Print document
Print
1
0
Ctrl+P
false
document-print-preview
Print Previe&w
Show a print preview of document
Print Preview
1
0
false
configure
&Document Information
Document Information
Document Information
1
0
false
&Close All
Close All
Close All
1
0
Ctrl+Shift+W
false
C&lose
Close
Close
1
0
false
&Quit
Quit application
Quit
0
0
Ctrl+Q
false
Edit
edit-undo
Undo
Undo last action
Undo
1
0
Ctrl+Z
false
edit-redo
Redo
Redo last undone action
Redo
1
0
Ctrl+Shift+Z
false
edit-cut
Cu&t
Cut selection to clipboard
Cut
0
0
Ctrl+X
false
edit-copy
&Copy
Copy selection to clipboard
Copy
0
0
Ctrl+C
false
C&opy (sharp)
Copy (sharp)
Copy (sharp)
100000000
0
false
Cut (&sharp)
Cut (sharp)
Cut (sharp)
100000000
0
false
Copy &merged
Copy merged
Copy merged
100000000
0
Ctrl+Shift+C
false
edit-paste
&Paste
Paste clipboard content
Paste
0
0
Ctrl+V
false
Paste at Cursor
Paste at cursor
Paste at cursor
0
0
Ctrl+Alt+V
false
Paste into &New Image
Paste into New Image
Paste into New Image
0
0
Ctrl+Shift+N
false
edit-clear
C&lear
Clear
Clear
1
0
Del
false
&Fill with Foreground Color
Fill with Foreground Color
Fill with Foreground Color
10000
1
Shift+Backspace
false
Fill &with Background Color
Fill with Background Color
Fill with Background Color
10000
1
Backspace
false
F&ill with Pattern
Fill with Pattern
Fill with Pattern
10000
1
false
Fill Special
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
Stro&ke selected shapes
Stroke selected shapes
Stroke selected shapes
1000000000
0
false
Stroke Selec&tion...
Stroke selection
Stroke selection
10000000000
0
false
+
+
Delete keyframe
Delete keyframe
Delete keyframe
100000
0
false
+
Window
window-new
&New Window
New Window
New Window
0
0
false
N&ext
Next
Next
10
0
false
Previous
Previous
Previous
false
View
&Show Canvas Only
Show just the canvas or the whole window
Show Canvas Only
0
0
Tab
true
view-fullscreen
F&ull Screen Mode
Display the window in full screen
Full Screen Mode
0
0
Ctrl+Shift+F
true
&Wrap Around Mode
Wrap Around Mode
Wrap Around Mode
1
0
W
true
&Instant Preview Mode
Instant Preview Mode
Instant Preview Mode
1
0
Shift+L
true
Soft Proofing
Turns on Soft Proofing
Turns on Soft Proofing
Ctrl+Y
true
Out of Gamut Warnings
Turns on warnings for colors out of proofed gamut, needs soft proofing to be turned on.
Turns on warnings for colors out of proofed gamut, needs soft proofing to be turned on.
Ctrl+Shift+Y
true
mirror-view
Mirror View
Mirror View
Mirror View
M
false
zoom-original
&Reset zoom
Reset zoom
Reset zoom
1
0
Ctrl+0
false
zoom-in
Zoom &In
Zoom In
0
0
Ctrl++
false
zoom-out
Zoom &Out
Zoom Out
0
0
Ctrl+-
false
rotate-canvas-right
Rotate &Canvas Right
Rotate Canvas Right
Rotate Canvas Right
1
0
Ctrl+]
false
rotate-canvas-left
Rotate Canvas &Left
Rotate Canvas Left
Rotate Canvas Left
1
0
Ctrl+[
false
rotation-reset
Reset Canvas Rotation
Reset Canvas Rotation
Reset Canvas Rotation
1
0
false
Show &Rulers
The rulers show the horizontal and vertical positions of the mouse on the image and can be used to position your mouse at the right place on the canvas. <p>Uncheck this to hide the rulers.</p>
Show Rulers
Show Rulers
1
0
true
Rulers Track Pointer
The rulers will track current mouse position and show it on screen. It can cause suptle performance slowdown
Rulers Track Pointer
Rulers Track Pointer
1
0
true
Show Guides
Show or hide guides
Show Guides
1
0
true
Lock Guides
Lock or unlock guides
Lock Guides
1
0
true
Snap to Guides
Snap cursor to guides position
Snap to Guides
1
0
true
Show Status &Bar
Show or hide the status bar
Show Status Bar
0
0
true
Show Pixel Grid
Show Pixel Grid
Show Pixel Grid
1000
0
true
view-grid
Show &Grid
Show Grid
Show Grid
1000
0
Ctrl+Shift+'
true
Snap To Grid
Snap To Grid
Snap To Grid
1000
Ctrl+Shift+;
true
Show Snap Options Popup
Show Snap Options Popup
Show Snap Options Popup
1000
Shift+s
false
Snap Orthogonal
Snap Orthogonal
Snap Orthogonal
1000
true
Snap Node
Snap Node
Snap Node
1000
true
Snap Extension
Snap Extension
Snap Extension
1000
true
Snap Intersection
Snap Intersection
Snap Intersection
1000
true
Snap Bounding Box
Snap Bounding Box
Snap Bounding Box
1000
true
Snap Image Bounds
Snap Image Bounds
Snap Image Bounds
1000
true
Snap Image Center
Snap Image Center
Snap Image Center
1000
true
S&how Painting Assistants
Show Painting Assistants
Show Painting Assistants
1000
0
true
Show &Assistant Previews
Show Assistant Previews
Show Assistant Previews
1000
0
true
S&how Reference Images
Show Reference Images
Show Reference Images
1000
0
true
Image
document-properties
&Properties...
Properties
Properties
1000
0
false
format-stroke-color
&Image Background Color and Transparency...
Change the background color of the image
Image Background Color and Transparency
1000
0
false
&Convert Image Color Space...
Convert Image Color Space
Convert Image Color Space
1000
0
false
trim-to-image
&Trim to Image Size
Trim to Image Size
Trim to Image Size
1
0
false
Trim to Current &Layer
Trim to Current Layer
Trim to Current Layer
100000
0
false
Trim to S&election
Trim to Selection
Trim to Selection
100000000
0
false
&Rotate Image...
Rotate Image
Rotate Image
1000
0
false
object-rotate-right
Rotate &Image 90° to the Right
Rotate Image 90° to the Right
Rotate Image 90° to the Right
1000
0
false
object-rotate-left
Rotate Image &90° to the Left
Rotate Image 90° to the Left
Rotate Image 90° to the Left
1000
0
false
Rotate Image &180°
Rotate Image 180°
Rotate Image 180°
1000
0
false
&Shear Image...
Shear Image
Shear Image
1000
0
false
symmetry-horizontal
&Mirror Image Horizontally
Mirror Image Horizontally
Mirror Image Horizontally
1000
0
false
symmetry-vertical
Mirror Image &Vertically
Mirror Image Vertically
Mirror Image Vertically
1000
0
false
Scale Image To &New Size...
Scale Image To New Size
Scale Image To New Size
1000
0
Ctrl+Alt+I
false
&Offset Image...
Offset Image
Offset Image
1000
0
false
R&esize Canvas...
Resize Canvas
Resize Canvas
1000
0
Ctrl+Alt+C
false
Im&age Split
Image Split
Image Split
1000
0
false
Separate Ima&ge...
Separate Image
Separate Image
1000
0
false
Select
edit-select-all
Select &All
Select All
Select All
0
0
Ctrl+A
false
edit-select-all
&Deselect
Deselect
Deselect
1100000000
0
Ctrl+Shift+A
false
&Reselect
Reselect
Reselect
0
0
Ctrl+Shift+D
false
&Invert
Invert
Invert
10000
0
Ctrl+I
false
&Convert to Vector Selection
Convert to Vector Selection
Convert to Vector Selection
10000000000
0
false
Convert Shapes to &Vector Selection
Convert Shapes to Vector Selection
Convert Shapes to Vector Selection
1000000000
0
false
&Feather Selection...
Feather Selection
Feather Selection
10000000000
100
Shift+F6
false
Dis&play Selection
Display Selection
Display Selection
1000
0
Ctrl+H
true
Sca&le...
Scale
Scale
100000000
100
false
S&elect from Color Range...
Select from Color Range
Select from Color Range
10000
100
false
Select &Opaque
Select Opaque
Select Opaque
10000
100
false
&Grow Selection...
Grow Selection
Grow Selection
10000000000
100
false
S&hrink Selection...
Shrink Selection
Shrink Selection
10000000000
100
false
&Border Selection...
Border Selection
Border Selection
10000000000
100
false
S&mooth
Smooth
Smooth
10000000000
100
false
Filter
&Apply Filter Again
Apply Filter Again
Apply Filter Again
0
0
Ctrl+F
false
Adjust
Adjust
Adjust
false
Artistic
Artistic
Artistic
false
Blur
Blur
Blur
false
Colors
Colors
Colors
false
Edge Detection
Edge Detection
Edge Detection
false
Enhance
Enhance
Enhance
false
Emboss
Emboss
Emboss
false
Map
Map
Map
false
Other
Other
Other
false
gmic
Start G'MIC-Qt
Start G'Mic-Qt
Start G'Mic-Qt
false
gmic
Re-apply the last G'MIC filter
Apply the last G'Mic-Qt action again
Apply the last G'Mic-Qt action again
false
Tools
media-record
&Start recording macro
Start recording macro
Start recording macro
1000
0
false
media-playback-stop
Stop &recording actions
Stop recording actions
Stop recording actions
1000
0
false
media-playback-start
&Open and play...
Open and play
Open and play
0
0
false
document-edit
Open &and edit...
Open and edit
Open and edit
0
0
false
Settings
configure
&Configure Krita...
Configure Krita
Configure Krita
0
0
false
&Manage Resources...
Manage Resources
Manage Resources
0
0
false
preferences-desktop-locale
Switch Application &Language...
Switch Application Language
Switch Application Language
false
&Show Dockers
Show Dockers
Show Dockers
0
0
true
configure
Configure Tool&bars...
Configure Toolbars
Configure Toolbars
0
0
false
Dockers
Dockers
Dockers
false
&Themes
Themes
Themes
false
im-user
Active Author Profile
Active Author Profile
Active Author Profile
configure-shortcuts
Configure S&hortcuts...
Configure Shortcuts
Configure Shortcuts
0
0
false
&Window
Window
Window
false
Help
help-contents
Krita &Handbook
Krita Handbook
Krita Handbook
F1
false
tools-report-bug
&Report Bug...
Report Bug
Report Bug
false
calligrakrita
&About Krita
About Krita
About Krita
false
kde
About &KDE
About KDE
About KDE
false
Brushes and Stuff
&Gradients
Gradients
Gradients
false
&Patterns
Patterns
Patterns
false
&Color
Color
Color
false
&Painter's Tools
Painter's Tools
Painter's Tools
false
Brush composite
Brush composite
Brush composite
false
Brush option slider 1
Brush option slider 1
Brush option slider 1
false
Brush option slider 2
Brush option slider 2
Brush option slider 2
false
Brush option slider 3
Brush option slider 3
Brush option slider 3
false
Mirror
Mirror
Mirror
false
Layouts
Select layout
false
Workspaces
Workspaces
Workspaces
false
diff --git a/plugins/dockers/animation/animation_docker.cpp b/plugins/dockers/animation/animation_docker.cpp
index 25c7e71487..c787781aa7 100644
--- a/plugins/dockers/animation/animation_docker.cpp
+++ b/plugins/dockers/animation/animation_docker.cpp
@@ -1,664 +1,675 @@
/*
* Copyright (c) 2015 Jouni Pentikäinen
*
* 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 "animation_docker.h"
#include "kis_global.h"
#include "kis_canvas2.h"
#include "kis_image.h"
#include
#include
#include
#include "KisViewManager.h"
#include "kis_action_manager.h"
#include "kis_image_animation_interface.h"
#include "kis_animation_player.h"
#include "kis_time_range.h"
#include "kundo2command.h"
#include "kis_post_execution_undo_adapter.h"
#include "kis_keyframe_channel.h"
#include "kis_animation_utils.h"
#include "krita_utils.h"
#include "kis_image_config.h"
#include "kis_config.h"
#include "kis_signals_blocker.h"
#include "kis_node_manager.h"
#include "kis_transform_mask_params_factory_registry.h"
#include "ui_wdg_animation.h"
void setupActionButton(const QString &text,
KisAction::ActivationFlags flags,
bool defaultValue,
QToolButton *button,
KisAction **action)
{
*action = new KisAction(text, button);
(*action)->setActivationFlags(flags);
(*action)->setCheckable(true);
(*action)->setChecked(defaultValue);
button->setDefaultAction(*action);
}
AnimationDocker::AnimationDocker()
: QDockWidget(i18n("Animation"))
, m_canvas(0)
, m_animationWidget(new Ui_WdgAnimation)
, m_mainWindow(0)
{
QWidget* mainWidget = new QWidget(this);
setWidget(mainWidget);
- m_animationWidget->setupUi(mainWidget);
-
- // TODO: create all the actions using action manager!
- m_previousFrameAction = new KisAction(i18n("Previous Frame"), m_animationWidget->btnPreviousFrame);
- m_previousFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnPreviousFrame->setDefaultAction(m_previousFrameAction);
-
- m_nextFrameAction = new KisAction(i18n("Next Frame"), m_animationWidget->btnNextFrame);
- m_nextFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnNextFrame->setDefaultAction(m_nextFrameAction);
-
- m_previousKeyFrameAction = new KisAction(i18n("Previous Key Frame"), m_animationWidget->btnPreviousKeyFrame);
- m_previousKeyFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnPreviousKeyFrame->setDefaultAction(m_previousKeyFrameAction);
-
- m_nextKeyFrameAction = new KisAction(i18n("Next Key Frame"), m_animationWidget->btnNextKeyFrame);
- m_nextKeyFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnNextKeyFrame->setDefaultAction(m_nextKeyFrameAction);
-
- m_firstFrameAction = new KisAction(i18n("First Frame"), m_animationWidget->btnFirstFrame);
- m_firstFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnFirstFrame->setDefaultAction(m_firstFrameAction);
-
- m_lastFrameAction = new KisAction(i18n("Last Frame"), m_animationWidget->btnLastFrame);
- m_lastFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnLastFrame->setDefaultAction(m_lastFrameAction);
-
- m_playPauseAction = new KisAction(i18n("Play / Stop"), m_animationWidget->btnPlay);
- m_playPauseAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
- m_animationWidget->btnPlay->setDefaultAction(m_playPauseAction);
-
- m_addBlankFrameAction = new KisAction(KisAnimationUtils::addFrameActionName, m_animationWidget->btnAddKeyframe);
- m_addBlankFrameAction->setActivationFlags(KisAction::ACTIVE_NODE);
- m_animationWidget->btnAddKeyframe->setDefaultAction(m_addBlankFrameAction);
-
- m_addDuplicateFrameAction = new KisAction(KisAnimationUtils::duplicateFrameActionName, m_animationWidget->btnAddDuplicateFrame);
- m_addDuplicateFrameAction->setActivationFlags(KisAction::ACTIVE_DEVICE);
- m_animationWidget->btnAddDuplicateFrame->setDefaultAction(m_addDuplicateFrameAction);
-
- m_deleteKeyframeAction = new KisAction(KisAnimationUtils::removeFrameActionName, m_animationWidget->btnDeleteKeyframe);
- m_deleteKeyframeAction->setActivationFlags(KisAction::ACTIVE_NODE);
- m_animationWidget->btnDeleteKeyframe->setDefaultAction(m_deleteKeyframeAction);
-
- m_newKeyframeMenu = new QMenu(this);
- m_animationWidget->btnAddKeyframe->setMenu(m_newKeyframeMenu);
- m_animationWidget->btnAddKeyframe->setPopupMode(QToolButton::MenuButtonPopup);
-
- m_deleteKeyframeMenu = new QMenu(this);
- m_animationWidget->btnDeleteKeyframe->setMenu(m_deleteKeyframeMenu);
- m_animationWidget->btnDeleteKeyframe->setPopupMode(QToolButton::MenuButtonPopup);
-
- m_addOpacityKeyframeAction = new KisAction(KisAnimationUtils::addOpacityKeyframeActionName);
- m_deleteOpacityKeyframeAction = new KisAction(KisAnimationUtils::removeOpacityKeyframeActionName);
-
- m_addTransformKeyframeAction = new KisAction(KisAnimationUtils::addTransformKeyframeActionName);
- m_deleteTransformKeyframeAction = new KisAction(KisAnimationUtils::removeTransformKeyframeActionName);
-
- {
- KisImageConfig cfg;
- setupActionButton(KisAnimationUtils::lazyFrameCreationActionName,
- KisAction::ACTIVE_IMAGE,
- cfg.lazyFrameCreationEnabled(),
- m_animationWidget->btnLazyFrame,
- &m_lazyFrameAction);
- }
-
- {
- KisConfig cfg;
- setupActionButton(KisAnimationUtils::dropFramesActionName,
- KisAction::ACTIVE_IMAGE,
- cfg.animationDropFrames(),
- m_animationWidget->btnDropFrames,
- &m_dropFramesAction);
- }
-
- QFont font;
- font.setPointSize(1.7 * font.pointSize());
- font.setBold(true);
- m_animationWidget->intCurrentTime->setFont(font);
-
- connect(m_previousFrameAction, SIGNAL(triggered()), this, SLOT(slotPreviousFrame()));
- connect(m_nextFrameAction, SIGNAL(triggered()), this, SLOT(slotNextFrame()));
-
- connect(m_previousKeyFrameAction, SIGNAL(triggered()), this, SLOT(slotPreviousKeyFrame()));
- connect(m_nextKeyFrameAction, SIGNAL(triggered()), this, SLOT(slotNextKeyFrame()));
-
- connect(m_firstFrameAction, SIGNAL(triggered()), this, SLOT(slotFirstFrame()));
- connect(m_lastFrameAction, SIGNAL(triggered()), this, SLOT(slotLastFrame()));
-
- connect(m_playPauseAction, SIGNAL(triggered()), this, SLOT(slotPlayPause()));
-
- connect(m_addBlankFrameAction, SIGNAL(triggered()), this, SLOT(slotAddBlankFrame()));
- connect(m_addDuplicateFrameAction, SIGNAL(triggered()), this, SLOT(slotAddDuplicateFrame()));
- connect(m_deleteKeyframeAction, SIGNAL(triggered()), this, SLOT(slotDeleteKeyframe()));
- connect(m_lazyFrameAction, SIGNAL(toggled(bool)), this, SLOT(slotLazyFrameChanged(bool)));
- connect(m_dropFramesAction, SIGNAL(toggled(bool)), this, SLOT(slotDropFramesChanged(bool)));
-
- connect(m_addOpacityKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotAddOpacityKeyframe()));
- connect(m_deleteOpacityKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteOpacityKeyframe()));
-
- connect(m_addTransformKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotAddTransformKeyframe()));
- connect(m_deleteTransformKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTransformKeyframe()));
-
- m_animationWidget->btnOnionSkinOptions->setToolTip(i18n("Onion Skins"));
- connect(m_animationWidget->btnOnionSkinOptions, SIGNAL(clicked()), this, SLOT(slotOnionSkinOptions()));
-
- connect(m_animationWidget->spinFromFrame, SIGNAL(valueChanged(int)), this, SLOT(slotUIRangeChanged()));
- connect(m_animationWidget->spinToFrame, SIGNAL(valueChanged(int)), this, SLOT(slotUIRangeChanged()));
- connect(m_animationWidget->intFramerate, SIGNAL(valueChanged(int)), this, SLOT(slotUIFramerateChanged()));
-
- connect(m_animationWidget->intCurrentTime, SIGNAL(valueChanged(int)), SLOT(slotTimeSpinBoxChanged()));
+ m_animationWidget->setupUi(mainWidget);
}
AnimationDocker::~AnimationDocker()
{
delete m_animationWidget;
}
void AnimationDocker::setCanvas(KoCanvasBase * canvas)
{
if(m_canvas == canvas)
return;
setEnabled(canvas != 0);
if (m_canvas) {
m_canvas->disconnectCanvasObserver(this);
m_canvas->image()->disconnect(this);
m_canvas->image()->animationInterface()->disconnect(this);
m_canvas->animationPlayer()->disconnect(this);
m_canvas->viewManager()->nodeManager()->disconnect(this);
}
m_canvas = dynamic_cast(canvas);
if (m_canvas && m_canvas->image()) {
+
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
{
KisSignalsBlocker bloker(m_animationWidget->spinFromFrame,
m_animationWidget->spinToFrame,
m_animationWidget->intFramerate);
m_animationWidget->spinFromFrame->setValue(animation->fullClipRange().start());
m_animationWidget->spinToFrame->setValue(animation->fullClipRange().end());
m_animationWidget->intFramerate->setValue(animation->framerate());
}
+
connect(animation, SIGNAL(sigUiTimeChanged(int)), this, SLOT(slotGlobalTimeChanged()));
connect(m_canvas->animationPlayer(), SIGNAL(sigFrameChanged()), this, SLOT(slotGlobalTimeChanged()));
connect(m_canvas->animationPlayer(), SIGNAL(sigPlaybackStopped()), this, SLOT(slotGlobalTimeChanged()));
connect(m_canvas->animationPlayer(), SIGNAL(sigPlaybackStopped()), this, SLOT(updatePlayPauseIcon()));
connect(m_canvas->animationPlayer(), SIGNAL(sigPlaybackStatisticsUpdated()), this, SLOT(updateDropFramesIcon()));
connect(m_animationWidget->doublePlaySpeed,
SIGNAL(valueChanged(double)),
m_canvas->animationPlayer(),
SLOT(slotUpdatePlaybackSpeed(double)));
connect(m_canvas->viewManager()->nodeManager(), SIGNAL(sigNodeActivated(KisNodeSP)),
this, SLOT(slotCurrentNodeChanged(KisNodeSP)));
slotGlobalTimeChanged();
slotCurrentNodeChanged(m_canvas->viewManager()->nodeManager()->activeNode());
}
}
void AnimationDocker::unsetCanvas()
{
setCanvas(0);
}
void AnimationDocker::setMainWindow(KisViewManager *view)
{
- KisActionManager *actionManager = view->actionManager();
-
- actionManager->addAction("previous_frame", m_previousFrameAction);
- actionManager->addAction("next_frame", m_nextFrameAction);
-
- actionManager->addAction("previous_keyframe", m_previousKeyFrameAction);
- actionManager->addAction("next_keyframe", m_nextKeyFrameAction);
-
- actionManager->addAction("first_frame", m_firstFrameAction);
- actionManager->addAction("last_frame", m_lastFrameAction);
-
- actionManager->addAction("lazy_frame", m_lazyFrameAction);
- actionManager->addAction("drop_frames", m_dropFramesAction);
-
- actionManager->addAction("toggle_playback", m_playPauseAction);
- actionManager->addAction("add_blank_frame", m_addBlankFrameAction);
- actionManager->addAction("add_duplicate_frame", m_addDuplicateFrameAction);
- actionManager->addAction("delete_keyframe", m_deleteKeyframeAction);
+ setActions(view->actionManager());
slotUpdateIcons();
connect(view->mainWindow(), SIGNAL(themeChanged()), this, SLOT(slotUpdateIcons()));
-
-
m_mainWindow = view->mainWindow();
}
void AnimationDocker::slotAddBlankFrame()
{
addKeyframe(KisKeyframeChannel::Content.id(), false);
}
void AnimationDocker::slotAddDuplicateFrame()
{
addKeyframe(KisKeyframeChannel::Content.id(), true);
}
void AnimationDocker::slotDeleteKeyframe()
{
deleteKeyframe(KisKeyframeChannel::Content.id());
}
void AnimationDocker::slotAddOpacityKeyframe()
{
addKeyframe(KisKeyframeChannel::Opacity.id(), false);
}
void AnimationDocker::slotDeleteOpacityKeyframe()
{
deleteKeyframe(KisKeyframeChannel::Opacity.id());
}
void AnimationDocker::slotAddTransformKeyframe()
{
if (!m_canvas) return;
KisTransformMask *mask = dynamic_cast(m_canvas->viewManager()->activeNode().data());
if (!mask) return;
const int time = m_canvas->image()->animationInterface()->currentTime();
KUndo2Command *command = new KUndo2Command(kundo2_i18n("Add transform keyframe"));
KisTransformMaskParamsFactoryRegistry::instance()->autoAddKeyframe(mask, time, KisTransformMaskParamsInterfaceSP(), command);
command->redo();
m_canvas->currentImage()->postExecutionUndoAdapter()->addCommand(toQShared(command));
}
void AnimationDocker::slotDeleteTransformKeyframe()
{
deleteKeyframe(KisKeyframeChannel::TransformArguments.id());
}
void AnimationDocker::slotUIRangeChanged()
{
if (!m_canvas || !m_canvas->image()) return;
int fromTime = m_animationWidget->spinFromFrame->value();
int toTime = m_animationWidget->spinToFrame->value();
m_canvas->image()->animationInterface()->setFullClipRange(KisTimeRange::fromTime(fromTime, toTime));
}
void AnimationDocker::slotUIFramerateChanged()
{
if (!m_canvas || !m_canvas->image()) return;
m_canvas->image()->animationInterface()->setFramerate(m_animationWidget->intFramerate->value());
}
void AnimationDocker::slotOnionSkinOptions()
{
if (m_mainWindow) {
QDockWidget *docker = m_mainWindow->dockWidget("OnionSkinsDocker");
if (docker) {
docker->setVisible(!docker->isVisible());
}
}
}
void AnimationDocker::slotGlobalTimeChanged()
{
int time = m_canvas->animationPlayer()->isPlaying() ?
m_canvas->animationPlayer()->currentTime() :
m_canvas->image()->animationInterface()->currentUITime();
m_animationWidget->intCurrentTime->setValue(time);
const int frameRate = m_canvas->image()->animationInterface()->framerate();
const int msec = 1000 * time / frameRate;
QTime realTime;
realTime = realTime.addMSecs(msec);
QString realTimeString = realTime.toString("hh:mm:ss.zzz");
m_animationWidget->intCurrentTime->setToolTip(realTimeString);
}
void AnimationDocker::slotTimeSpinBoxChanged()
{
if (!m_canvas || !m_canvas->image()) return;
int newTime = m_animationWidget->intCurrentTime->value();
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
if (m_canvas->animationPlayer()->isPlaying() ||
newTime == animation->currentUITime()) {
return;
}
animation->requestTimeSwitchWithUndo(newTime);
}
void AnimationDocker::slotPreviousFrame()
{
if (!m_canvas) return;
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
int time = animation->currentUITime() - 1;
if (time >= 0) {
animation->requestTimeSwitchWithUndo(time);
}
}
void AnimationDocker::slotNextFrame()
{
if (!m_canvas) return;
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
int time = animation->currentUITime() + 1;
animation->requestTimeSwitchWithUndo(time);
}
void AnimationDocker::slotPreviousKeyFrame()
{
if (!m_canvas) return;
KisNodeSP node = m_canvas->viewManager()->activeNode();
if (!node) return;
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
int time = animation->currentUITime();
KisKeyframeChannel *content =
node->getKeyframeChannel(KisKeyframeChannel::Content.id());
if (!content) return;
KisKeyframeSP dstKeyframe;
KisKeyframeSP keyframe = content->keyframeAt(time);
if (!keyframe) {
dstKeyframe = content->activeKeyframeAt(time);
} else {
dstKeyframe = content->previousKeyframe(keyframe);
}
if (dstKeyframe) {
animation->requestTimeSwitchWithUndo(dstKeyframe->time());
}
}
void AnimationDocker::slotNextKeyFrame()
{
if (!m_canvas) return;
KisNodeSP node = m_canvas->viewManager()->activeNode();
if (!node) return;
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
int time = animation->currentUITime();
KisKeyframeChannel *content =
node->getKeyframeChannel(KisKeyframeChannel::Content.id());
if (!content) return;
KisKeyframeSP dstKeyframe;
KisKeyframeSP keyframe = content->activeKeyframeAt(time);
if (keyframe) {
dstKeyframe = content->nextKeyframe(keyframe);
}
if (dstKeyframe) {
animation->requestTimeSwitchWithUndo(dstKeyframe->time());
}
}
void AnimationDocker::slotFirstFrame()
{
if (!m_canvas) return;
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
animation->requestTimeSwitchWithUndo(0);
}
void AnimationDocker::slotLastFrame()
{
if (!m_canvas) return;
KisImageAnimationInterface *animation = m_canvas->image()->animationInterface();
animation->requestTimeSwitchWithUndo(animation->totalLength() - 1);
}
void AnimationDocker::slotPlayPause()
{
if (!m_canvas) return;
if (m_canvas->animationPlayer()->isPlaying()) {
m_canvas->animationPlayer()->stop();
} else {
m_canvas->animationPlayer()->play();
}
updatePlayPauseIcon();
}
void AnimationDocker::updatePlayPauseIcon()
{
bool isPlaying = m_canvas && m_canvas->animationPlayer() && m_canvas->animationPlayer()->isPlaying();
m_playPauseAction->setIcon(isPlaying ?
KisIconUtils::loadIcon("animation_stop") :
KisIconUtils::loadIcon("animation_play"));
}
void AnimationDocker::updateLazyFrameIcon()
{
KisImageConfig cfg;
const bool value = cfg.lazyFrameCreationEnabled();
m_lazyFrameAction->setIcon(value ?
KisIconUtils::loadIcon("lazyframeOn") :
KisIconUtils::loadIcon("lazyframeOff"));
m_lazyFrameAction->setText(QString("%1 (%2)")
.arg(KisAnimationUtils::lazyFrameCreationActionName)
.arg(KritaUtils::toLocalizedOnOff(value)));
}
void AnimationDocker::updateDropFramesIcon()
{
qreal effectiveFps = 0.0;
qreal realFps = 0.0;
qreal framesDropped = 0.0;
bool isPlaying = false;
KisAnimationPlayer *player =
m_canvas && m_canvas->animationPlayer() ?
m_canvas->animationPlayer() : 0;
if (player) {
effectiveFps = player->effectiveFps();
realFps = player->realFps();
framesDropped = player->framesDroppedPortion();
isPlaying = player->isPlaying();
}
KisConfig cfg;
const bool value = cfg.animationDropFrames();
m_dropFramesAction->setIcon(value ?
KisIconUtils::loadIcon(framesDropped > 0.05 ? "droppedframes" : "dropframe") :
KisIconUtils::loadIcon("dropframe"));
QString text;
if (!isPlaying) {
text = QString("%1 (%2)")
.arg(KisAnimationUtils::dropFramesActionName)
.arg(KritaUtils::toLocalizedOnOff(value));
} else {
text = QString("%1 (%2)\n"
"%3\n"
"%4\n"
"%5")
.arg(KisAnimationUtils::dropFramesActionName)
.arg(KritaUtils::toLocalizedOnOff(value))
.arg(i18n("Effective FPS:\t%1", effectiveFps))
.arg(i18n("Real FPS:\t%1", realFps))
.arg(i18n("Frames dropped:\t%1\%", framesDropped * 100));
}
m_dropFramesAction->setText(text);
}
void AnimationDocker::slotUpdateIcons()
{
m_previousFrameAction->setIcon(KisIconUtils::loadIcon("prevframe"));
m_nextFrameAction->setIcon(KisIconUtils::loadIcon("nextframe"));
m_previousKeyFrameAction->setIcon(KisIconUtils::loadIcon("prevkeyframe"));
m_nextKeyFrameAction->setIcon(KisIconUtils::loadIcon("nextkeyframe"));
m_firstFrameAction->setIcon(KisIconUtils::loadIcon("firstframe"));
m_lastFrameAction->setIcon(KisIconUtils::loadIcon("lastframe"));
updatePlayPauseIcon();
m_addBlankFrameAction->setIcon(KisIconUtils::loadIcon("addblankframe"));
m_addDuplicateFrameAction->setIcon(KisIconUtils::loadIcon("addduplicateframe"));
m_deleteKeyframeAction->setIcon(KisIconUtils::loadIcon("deletekeyframe"));
updateLazyFrameIcon();
updateDropFramesIcon();
m_animationWidget->btnOnionSkinOptions->setIcon(KisIconUtils::loadIcon("onion_skin_options"));
m_animationWidget->btnOnionSkinOptions->setIconSize(QSize(22, 22));
m_animationWidget->btnNextKeyFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnPreviousKeyFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnFirstFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnLastFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnPreviousFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnPlay->setIconSize(QSize(22, 22));
m_animationWidget->btnNextFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnAddKeyframe->setIconSize(QSize(22, 22));
m_animationWidget->btnAddDuplicateFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnDeleteKeyframe->setIconSize(QSize(22, 22));
m_animationWidget->btnLazyFrame->setIconSize(QSize(22, 22));
m_animationWidget->btnDropFrames->setIconSize(QSize(22, 22));
}
void AnimationDocker::slotLazyFrameChanged(bool value)
{
KisImageConfig cfg;
if (value != cfg.lazyFrameCreationEnabled()) {
cfg.setLazyFrameCreationEnabled(value);
updateLazyFrameIcon();
}
}
void AnimationDocker::slotDropFramesChanged(bool value)
{
KisConfig cfg;
if (value != cfg.animationDropFrames()) {
cfg.setAnimationDropFrames(value);
updateDropFramesIcon();
}
}
void AnimationDocker::slotCurrentNodeChanged(KisNodeSP node)
{
bool isNodeAnimatable = false;
m_newKeyframeMenu->clear();
m_deleteKeyframeMenu->clear();
if (!node.isNull()) {
if (KisAnimationUtils::supportsContentFrames(node)) {
isNodeAnimatable = true;
m_newKeyframeMenu->addAction(m_addBlankFrameAction);
m_deleteKeyframeMenu->addAction(m_deleteKeyframeAction);
}
if (node->inherits("KisLayer")) {
isNodeAnimatable = true;
m_newKeyframeMenu->addAction(m_addOpacityKeyframeAction);
m_deleteKeyframeMenu->addAction(m_deleteOpacityKeyframeAction);
}
/*
if (node->inherits("KisTransformMask")) {
isNodeAnimatable = true;
m_newKeyframeMenu->addAction(m_addTransformKeyframeAction);
m_deleteKeyframeMenu->addAction(m_deleteTransformKeyframeAction);
}
*/
}
m_animationWidget->btnAddKeyframe->setEnabled(isNodeAnimatable);
m_animationWidget->btnAddDuplicateFrame->setEnabled(isNodeAnimatable);
m_animationWidget->btnDeleteKeyframe->setEnabled(isNodeAnimatable);
}
void AnimationDocker::addKeyframe(const QString &channel, bool copy)
{
if (!m_canvas) return;
KisNodeSP node = m_canvas->viewManager()->activeNode();
if (!node) return;
const int time = m_canvas->image()->animationInterface()->currentTime();
KisAnimationUtils::createKeyframeLazy(m_canvas->image(), node, channel, time, copy);
}
void AnimationDocker::deleteKeyframe(const QString &channel)
{
if (!m_canvas) return;
KisNodeSP node = m_canvas->viewManager()->activeNode();
if (!node) return;
const int time = m_canvas->image()->animationInterface()->currentTime();
KisAnimationUtils::removeKeyframe(m_canvas->image(), node, channel, time);
}
+
+void AnimationDocker::setActions(KisActionManager *actionMan)
+{
+ KisActionManager *actionManager = actionMan;
+
+ m_previousFrameAction = new KisAction(i18n("Previous Frame"), m_animationWidget->btnPreviousFrame);
+ m_previousFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnPreviousFrame->setDefaultAction(m_previousFrameAction);
+
+ m_nextFrameAction = new KisAction(i18n("Next Frame"), m_animationWidget->btnNextFrame);
+ m_nextFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnNextFrame->setDefaultAction(m_nextFrameAction);
+
+ m_previousKeyFrameAction = new KisAction(i18n("Previous Key Frame"), m_animationWidget->btnPreviousKeyFrame);
+ m_previousKeyFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnPreviousKeyFrame->setDefaultAction(m_previousKeyFrameAction);
+
+ m_nextKeyFrameAction = new KisAction(i18n("Next Key Frame"), m_animationWidget->btnNextKeyFrame);
+ m_nextKeyFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnNextKeyFrame->setDefaultAction(m_nextKeyFrameAction);
+
+ m_firstFrameAction = new KisAction(i18n("First Frame"), m_animationWidget->btnFirstFrame);
+ m_firstFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnFirstFrame->setDefaultAction(m_firstFrameAction);
+
+ m_lastFrameAction = new KisAction(i18n("Last Frame"), m_animationWidget->btnLastFrame);
+ m_lastFrameAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnLastFrame->setDefaultAction(m_lastFrameAction);
+
+
+ m_playPauseAction = new KisAction(i18n("Play / Stop"), m_animationWidget->btnPlay);
+ m_playPauseAction->setActivationFlags(KisAction::ACTIVE_IMAGE);
+ m_animationWidget->btnPlay->setDefaultAction(m_playPauseAction);
+
+ m_addBlankFrameAction = new KisAction(KisAnimationUtils::addFrameActionName, m_animationWidget->btnAddKeyframe);
+ m_addBlankFrameAction->setActivationFlags(KisAction::ACTIVE_NODE);
+ m_animationWidget->btnAddKeyframe->setDefaultAction(m_addBlankFrameAction);
+
+ m_addDuplicateFrameAction = new KisAction(KisAnimationUtils::duplicateFrameActionName, m_animationWidget->btnAddDuplicateFrame);
+ m_addDuplicateFrameAction->setActivationFlags(KisAction::ACTIVE_DEVICE);
+ m_animationWidget->btnAddDuplicateFrame->setDefaultAction(m_addDuplicateFrameAction);
+
+ m_deleteKeyframeAction = new KisAction(KisAnimationUtils::removeFrameActionName, m_animationWidget->btnDeleteKeyframe);
+ m_deleteKeyframeAction->setActivationFlags(KisAction::ACTIVE_NODE);
+ m_animationWidget->btnDeleteKeyframe->setDefaultAction(m_deleteKeyframeAction);
+
+ m_newKeyframeMenu = new QMenu(this);
+ m_animationWidget->btnAddKeyframe->setMenu(m_newKeyframeMenu);
+ m_animationWidget->btnAddKeyframe->setPopupMode(QToolButton::MenuButtonPopup);
+
+ m_deleteKeyframeMenu = new QMenu(this);
+ m_animationWidget->btnDeleteKeyframe->setMenu(m_deleteKeyframeMenu);
+ m_animationWidget->btnDeleteKeyframe->setPopupMode(QToolButton::MenuButtonPopup);
+
+ m_addOpacityKeyframeAction = new KisAction(KisAnimationUtils::addOpacityKeyframeActionName);
+ m_deleteOpacityKeyframeAction = new KisAction(KisAnimationUtils::removeOpacityKeyframeActionName);
+
+ m_addTransformKeyframeAction = new KisAction(KisAnimationUtils::addTransformKeyframeActionName);
+ m_deleteTransformKeyframeAction = new KisAction(KisAnimationUtils::removeTransformKeyframeActionName);
+
+
+ // other new stuff
+ actionManager->addAction("previous_frame", m_previousFrameAction);
+ actionManager->addAction("next_frame", m_nextFrameAction);
+
+ actionManager->addAction("previous_keyframe", m_previousKeyFrameAction);
+ actionManager->addAction("next_keyframe", m_nextKeyFrameAction);
+
+ actionManager->addAction("first_frame", m_firstFrameAction);
+ actionManager->addAction("last_frame", m_lastFrameAction);
+
+ {
+ KisImageConfig cfg;
+ setupActionButton(KisAnimationUtils::lazyFrameCreationActionName,
+ KisAction::ACTIVE_IMAGE,
+ cfg.lazyFrameCreationEnabled(),
+ m_animationWidget->btnLazyFrame,
+ &m_lazyFrameAction);
+ }
+
+ {
+ KisConfig cfg;
+ setupActionButton(KisAnimationUtils::dropFramesActionName,
+ KisAction::ACTIVE_IMAGE,
+ cfg.animationDropFrames(),
+ m_animationWidget->btnDropFrames,
+ &m_dropFramesAction);
+ }
+
+
+ // these actions are created in the setupActionButton() above, so we need to add actions after that
+ actionManager->addAction("lazy_frame", m_lazyFrameAction);
+ actionManager->addAction("drop_frames", m_dropFramesAction);
+
+ actionManager->addAction("toggle_playback", m_playPauseAction);
+ actionManager->addAction("add_blank_frame", m_addBlankFrameAction);
+ actionManager->addAction("add_duplicate_frame", m_addDuplicateFrameAction);
+
+ actionManager->addAction("delete_keyframe", m_deleteKeyframeAction);
+
+
+ QFont font;
+ font.setPointSize(1.7 * font.pointSize());
+ font.setBold(true);
+ m_animationWidget->intCurrentTime->setFont(font);
+
+ connect(m_previousFrameAction, SIGNAL(triggered()), this, SLOT(slotPreviousFrame()));
+ connect(m_nextFrameAction, SIGNAL(triggered()), this, SLOT(slotNextFrame()));
+
+ connect(m_previousKeyFrameAction, SIGNAL(triggered()), this, SLOT(slotPreviousKeyFrame()));
+ connect(m_nextKeyFrameAction, SIGNAL(triggered()), this, SLOT(slotNextKeyFrame()));
+
+ connect(m_firstFrameAction, SIGNAL(triggered()), this, SLOT(slotFirstFrame()));
+ connect(m_lastFrameAction, SIGNAL(triggered()), this, SLOT(slotLastFrame()));
+
+ connect(m_playPauseAction, SIGNAL(triggered()), this, SLOT(slotPlayPause()));
+
+ connect(m_addBlankFrameAction, SIGNAL(triggered()), this, SLOT(slotAddBlankFrame()));
+ connect(m_addDuplicateFrameAction, SIGNAL(triggered()), this, SLOT(slotAddDuplicateFrame()));
+ connect(m_deleteKeyframeAction, SIGNAL(triggered()), this, SLOT(slotDeleteKeyframe()));
+ connect(m_lazyFrameAction, SIGNAL(toggled(bool)), this, SLOT(slotLazyFrameChanged(bool)));
+ connect(m_dropFramesAction, SIGNAL(toggled(bool)), this, SLOT(slotDropFramesChanged(bool)));
+
+ connect(m_addOpacityKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotAddOpacityKeyframe()));
+ connect(m_deleteOpacityKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteOpacityKeyframe()));
+
+ connect(m_addTransformKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotAddTransformKeyframe()));
+ connect(m_deleteTransformKeyframeAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTransformKeyframe()));
+
+ m_animationWidget->btnOnionSkinOptions->setToolTip(i18n("Onion Skins"));
+ connect(m_animationWidget->btnOnionSkinOptions, SIGNAL(clicked()), this, SLOT(slotOnionSkinOptions()));
+
+ connect(m_animationWidget->spinFromFrame, SIGNAL(valueChanged(int)), this, SLOT(slotUIRangeChanged()));
+ connect(m_animationWidget->spinToFrame, SIGNAL(valueChanged(int)), this, SLOT(slotUIRangeChanged()));
+ connect(m_animationWidget->intFramerate, SIGNAL(valueChanged(int)), this, SLOT(slotUIFramerateChanged()));
+
+ connect(m_animationWidget->intCurrentTime, SIGNAL(valueChanged(int)), SLOT(slotTimeSpinBoxChanged()));
+}
diff --git a/plugins/dockers/animation/animation_docker.h b/plugins/dockers/animation/animation_docker.h
index 2f0c375238..be77c8767b 100644
--- a/plugins/dockers/animation/animation_docker.h
+++ b/plugins/dockers/animation/animation_docker.h
@@ -1,121 +1,123 @@
/*
* Copyright (c) 2015 Jouni Pentikäinen
*
* 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 _ANIMATION_DOCKER_H_
#define _ANIMATION_DOCKER_H_
#include "kritaimage_export.h"
#include
#include
#include
#include
#include
class Ui_WdgAnimation;
class KisMainWindow;
class AnimationDocker : public QDockWidget, public KisMainwindowObserver {
Q_OBJECT
public:
AnimationDocker();
~AnimationDocker() override;
QString observerName() override { return "AnimationDocker"; }
void setCanvas(KoCanvasBase *canvas) override;
void unsetCanvas() override;
- void setMainWindow(KisViewManager *kisview) override;
+ void setMainWindow(KisViewManager *kisview) override;
private Q_SLOTS:
void slotPreviousFrame();
void slotNextFrame();
void slotPreviousKeyFrame();
void slotNextKeyFrame();
void slotFirstFrame();
void slotLastFrame();
void slotPlayPause();
void slotAddBlankFrame();
void slotAddDuplicateFrame();
void slotDeleteKeyframe();
void slotAddOpacityKeyframe();
void slotDeleteOpacityKeyframe();
void slotAddTransformKeyframe();
void slotDeleteTransformKeyframe();
void slotUIRangeChanged();
void slotUIFramerateChanged();
void slotUpdateIcons();
void slotOnionSkinOptions();
void slotGlobalTimeChanged();
void slotTimeSpinBoxChanged();
void updatePlayPauseIcon();
void updateLazyFrameIcon();
void updateDropFramesIcon();
void slotLazyFrameChanged(bool value);
void slotDropFramesChanged(bool value);
void slotCurrentNodeChanged(KisNodeSP node);
private:
QPointer m_canvas;
Ui_WdgAnimation *m_animationWidget;
KisAction *m_previousFrameAction;
KisAction *m_nextFrameAction;
KisAction *m_previousKeyFrameAction;
KisAction *m_nextKeyFrameAction;
KisAction *m_firstFrameAction;
KisAction *m_lastFrameAction;
KisAction *m_playPauseAction;
KisAction *m_addBlankFrameAction;
KisAction *m_addDuplicateFrameAction;
KisAction *m_deleteKeyframeAction;
KisAction *m_lazyFrameAction;
KisAction *m_dropFramesAction;
QMenu *m_newKeyframeMenu;
KisAction *m_addOpacityKeyframeAction;
KisAction *m_addTransformKeyframeAction;
QMenu *m_deleteKeyframeMenu;
KisAction *m_deleteOpacityKeyframeAction;
KisAction *m_deleteTransformKeyframeAction;
KisMainWindow *m_mainWindow;
void addKeyframe(const QString &channel, bool copy);
void deleteKeyframe(const QString &channel);
+
+ void setActions(KisActionManager* actionManager);
};
#endif
diff --git a/plugins/dockers/animation/timeline_docker.cpp b/plugins/dockers/animation/timeline_docker.cpp
index e67033bb2a..acff860c8a 100644
--- a/plugins/dockers/animation/timeline_docker.cpp
+++ b/plugins/dockers/animation/timeline_docker.cpp
@@ -1,157 +1,159 @@
/*
* Copyright (c) 2015 Jouni Pentikäinen
*
* 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 "timeline_docker.h"
#include "kis_canvas2.h"
#include "kis_image.h"
#include
#include "KisViewManager.h"
#include "kis_paint_layer.h"
#include "KisDocument.h"
#include "kis_dummies_facade.h"
#include "kis_shape_controller.h"
#include "kis_action.h"
#include "kis_action_manager.h"
#include "timeline_frames_model.h"
#include "timeline_frames_view.h"
#include "kis_animation_frame_cache.h"
#include "kis_signal_auto_connection.h"
#include "kis_node_manager.h"
#include
struct TimelineDocker::Private
{
Private(QWidget *parent)
: model(new TimelineFramesModel(parent)),
view(new TimelineFramesView(parent))
{
view->setModel(model);
}
TimelineFramesModel *model;
TimelineFramesView *view;
QPointer canvas;
KisSignalAutoConnectionsStore canvasConnections;
};
TimelineDocker::TimelineDocker()
: QDockWidget(i18n("Timeline"))
, m_d(new Private(this))
{
setWidget(m_d->view);
}
TimelineDocker::~TimelineDocker()
{
}
struct NodeManagerInterface : TimelineFramesModel::NodeManipulationInterface
{
NodeManagerInterface(KisNodeManager *manager) : m_manager(manager) {}
KisLayerSP addPaintLayer() const override {
return m_manager->createPaintLayer();
}
void removeNode(KisNodeSP node) const override {
m_manager->removeSingleNode(node);
}
private:
KisNodeManager *m_manager;
};
void TimelineDocker::setCanvas(KoCanvasBase * canvas)
{
if (canvas && m_d->canvas == canvas) return;
if (m_d->model->hasConnectionToCanvas()) {
m_d->canvasConnections.clear();
m_d->model->setDummiesFacade(0, 0);
m_d->model->setFrameCache(0);
m_d->model->setAnimationPlayer(0);
m_d->model->setNodeManipulationInterface(0);
if (m_d->canvas) {
m_d->canvas->disconnectCanvasObserver(this);
}
}
m_d->canvas = dynamic_cast(canvas);
setEnabled(m_d->canvas != 0);
if(m_d->canvas) {
KisDocument *doc = static_cast(m_d->canvas->imageView()->document());
KisShapeController *kritaShapeController = dynamic_cast(doc->shapeController());
m_d->model->setDummiesFacade(kritaShapeController, m_d->canvas->image());
m_d->model->setFrameCache(m_d->canvas->frameCache());
m_d->model->setAnimationPlayer(m_d->canvas->animationPlayer());
m_d->model->setNodeManipulationInterface(
new NodeManagerInterface(m_d->canvas->viewManager()->nodeManager()));
m_d->canvasConnections.addConnection(
m_d->canvas->viewManager()->nodeManager(), SIGNAL(sigNodeActivated(KisNodeSP)),
m_d->model, SLOT(slotCurrentNodeChanged(KisNodeSP)));
m_d->canvasConnections.addConnection(
m_d->model, SIGNAL(requestCurrentNodeChanged(KisNodeSP)),
m_d->canvas->viewManager()->nodeManager(), SLOT(slotNonUiActivatedNode(KisNodeSP)));
m_d->model->slotCurrentNodeChanged(m_d->canvas->viewManager()->activeNode());
m_d->canvasConnections.addConnection(
m_d->canvas->viewManager()->mainWindow(), SIGNAL(themeChanged()),
this, SLOT(slotUpdateIcons()) );
}
}
void TimelineDocker::slotUpdateIcons()
{
if (m_d->view) {
m_d->view->slotUpdateIcons();
}
}
void TimelineDocker::unsetCanvas()
{
setCanvas(0);
}
void TimelineDocker::setMainWindow(KisViewManager *view)
{
KisActionManager *actionManager = view->actionManager();
QMap actions = m_d->view->globalActions();
QMap::const_iterator it = actions.constBegin();
QMap::const_iterator end = actions.constEnd();
for (; it != end; ++it) {
actionManager->addAction(it.key(), it.value());
}
m_d->view->setShowInTimeline(actionManager->actionByName("show_in_timeline"));
+
+ m_d->view->setActionManager(actionManager);
}
diff --git a/plugins/dockers/animation/timeline_frames_view.cpp b/plugins/dockers/animation/timeline_frames_view.cpp
index bf0a207107..d42f1c582d 100644
--- a/plugins/dockers/animation/timeline_frames_view.cpp
+++ b/plugins/dockers/animation/timeline_frames_view.cpp
@@ -1,1106 +1,1120 @@
/*
* Copyright (c) 2015 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 "timeline_frames_view.h"
#include "timeline_frames_model.h"
#include "timeline_ruler_header.h"
#include "timeline_layers_header.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include "kis_debug.h"
#include "timeline_frames_item_delegate.h"
#include "kis_zoom_button.h"
#include "kis_icon_utils.h"
#include "kis_animation_utils.h"
#include "kis_custom_modifiers_catcher.h"
#include "kis_action.h"
#include "kis_signal_compressor.h"
#include "kis_time_range.h"
#include "kis_color_label_selector_widget.h"
#include "kis_slider_spin_box.h"
#include
#include
#include
#include
#include
#include "config-qtmultimedia.h"
typedef QPair QItemViewPaintPair;
typedef QList QItemViewPaintPairs;
struct TimelineFramesView::Private
{
Private(TimelineFramesView *_q)
: q(_q),
fps(1),
zoomStillPointIndex(-1),
zoomStillPointOriginalOffset(0),
dragInProgress(false),
dragWasSuccessful(false),
modifiersCatcher(0),
selectionChangedCompressor(300, KisSignalCompressor::FIRST_INACTIVE)
{}
TimelineFramesView *q;
TimelineFramesModel *model;
TimelineRulerHeader *horizontalRuler;
TimelineLayersHeader *layersHeader;
int fps;
int zoomStillPointIndex;
int zoomStillPointOriginalOffset;
QPoint initialDragPanValue;
QPoint initialDragPanPos;
QToolButton *addLayersButton;
KisAction *showHideLayerAction;
QToolButton *audioOptionsButton;
KisColorLabelSelectorWidget *colorSelector;
QWidgetAction *colorSelectorAction;
KisColorLabelSelectorWidget *multiframeColorSelector;
QWidgetAction *multiframeColorSelectorAction;
QMenu *audioOptionsMenu;
QAction *openAudioAction;
QAction *audioMuteAction;
KisSliderSpinBox *volumeSlider;
QMenu *layerEditingMenu;
QMenu *existingLayersMenu;
QMenu *frameCreationMenu;
QMenu *frameEditingMenu;
QMenu *multipleFrameEditingMenu;
QMap globalActions;
KisZoomButton *zoomDragButton;
bool dragInProgress;
bool dragWasSuccessful;
KisCustomModifiersCatcher *modifiersCatcher;
QPoint lastPressedPosition;
Qt::KeyboardModifiers lastPressedModifier;
KisSignalCompressor selectionChangedCompressor;
QStyleOptionViewItem viewOptionsV4() const;
QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
QPixmap renderToPixmap(const QModelIndexList &indexes, QRect *r) const;
KoIconToolTip tip;
+
+ KisActionManager * actionMan = 0;
};
TimelineFramesView::TimelineFramesView(QWidget *parent)
: QTableView(parent),
m_d(new Private(this))
{
m_d->modifiersCatcher = new KisCustomModifiersCatcher(this);
m_d->modifiersCatcher->addModifier("pan-zoom", Qt::Key_Space);
m_d->modifiersCatcher->addModifier("offset-frame", Qt::Key_Alt);
setCornerButtonEnabled(false);
setSelectionBehavior(QAbstractItemView::SelectItems);
setSelectionMode(QAbstractItemView::ExtendedSelection);
setItemDelegate(new TimelineFramesItemDelegate(this));
setDragEnabled(true);
setDragDropMode(QAbstractItemView::DragDrop);
setAcceptDrops(true);
setDropIndicatorShown(true);
setDefaultDropAction(Qt::MoveAction);
m_d->horizontalRuler = new TimelineRulerHeader(this);
this->setHorizontalHeader(m_d->horizontalRuler);
m_d->layersHeader = new TimelineLayersHeader(this);
m_d->layersHeader->setSectionResizeMode(QHeaderView::Fixed);
m_d->layersHeader->setDefaultSectionSize(24);
m_d->layersHeader->setMinimumWidth(60);
m_d->layersHeader->setHighlightSections(true);
this->setVerticalHeader(m_d->layersHeader);
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), SLOT(slotUpdateInfiniteFramesCount()));
connect(horizontalScrollBar(), SIGNAL(sliderReleased()), SLOT(slotUpdateInfiniteFramesCount()));
/********** New Layer Menu ***********************************************************/
m_d->addLayersButton = new QToolButton(this);
m_d->addLayersButton->setAutoRaise(true);
m_d->addLayersButton->setIcon(KisIconUtils::loadIcon("addlayer"));
m_d->addLayersButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
m_d->addLayersButton->setPopupMode(QToolButton::InstantPopup);
m_d->layerEditingMenu = new QMenu(this);
m_d->layerEditingMenu->addAction(KisAnimationUtils::newLayerActionName, this, SLOT(slotAddNewLayer()));
m_d->existingLayersMenu = m_d->layerEditingMenu->addMenu(KisAnimationUtils::addExistingLayerActionName);
m_d->layerEditingMenu->addSeparator();
m_d->layerEditingMenu->addAction(KisAnimationUtils::removeLayerActionName, this, SLOT(slotRemoveLayer()));
connect(m_d->existingLayersMenu, SIGNAL(aboutToShow()), SLOT(slotUpdateLayersMenu()));
connect(m_d->existingLayersMenu, SIGNAL(triggered(QAction*)), SLOT(slotAddExistingLayer(QAction*)));
connect(m_d->layersHeader, SIGNAL(sigRequestContextMenu(const QPoint&)), SLOT(slotLayerContextMenuRequested(const QPoint&)));
m_d->addLayersButton->setMenu(m_d->layerEditingMenu);
/********** Audio Channel Menu *******************************************************/
m_d->audioOptionsButton = new QToolButton(this);
m_d->audioOptionsButton->setAutoRaise(true);
m_d->audioOptionsButton->setIcon(KisIconUtils::loadIcon("audio-none"));
m_d->audioOptionsButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
m_d->audioOptionsButton->setPopupMode(QToolButton::InstantPopup);
m_d->audioOptionsMenu = new QMenu(this);
#ifndef HAVE_QT_MULTIMEDIA
m_d->audioOptionsMenu->addSection(i18nc("@item:inmenu", "Audio playback is not supported in this build!"));
#endif
m_d->openAudioAction= new QAction("XXX", this);
connect(m_d->openAudioAction, SIGNAL(triggered()), this, SLOT(slotSelectAudioChannelFile()));
m_d->audioOptionsMenu->addAction(m_d->openAudioAction);
m_d->audioMuteAction = new QAction(i18nc("@item:inmenu", "Mute"), this);
m_d->audioMuteAction->setCheckable(true);
connect(m_d->audioMuteAction, SIGNAL(triggered(bool)), SLOT(slotAudioChannelMute(bool)));
m_d->audioOptionsMenu->addAction(m_d->audioMuteAction);
m_d->audioOptionsMenu->addAction(i18nc("@item:inmenu", "Remove audio"), this, SLOT(slotAudioChannelRemove()));
m_d->audioOptionsMenu->addSeparator();
m_d->volumeSlider = new KisSliderSpinBox(this);
m_d->volumeSlider->setRange(0, 100);
m_d->volumeSlider->setSuffix("%");
m_d->volumeSlider->setPrefix(i18nc("@item:inmenu, slider", "Volume:"));
m_d->volumeSlider->setSingleStep(1);
m_d->volumeSlider->setPageStep(10);
m_d->volumeSlider->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
connect(m_d->volumeSlider, SIGNAL(valueChanged(int)), SLOT(slotAudioVolumeChanged(int)));
QWidgetAction *volumeAction = new QWidgetAction(m_d->audioOptionsMenu);
volumeAction->setDefaultWidget(m_d->volumeSlider);
m_d->audioOptionsMenu->addAction(volumeAction);
m_d->audioOptionsButton->setMenu(m_d->audioOptionsMenu);
/********** Frame Editing Context Menu ***********************************************/
m_d->frameCreationMenu = new QMenu(this);
m_d->frameCreationMenu->addAction(KisAnimationUtils::addFrameActionName, this, SLOT(slotNewFrame()));
m_d->frameCreationMenu->addAction(KisAnimationUtils::duplicateFrameActionName, this, SLOT(slotCopyFrame()));
m_d->colorSelector = new KisColorLabelSelectorWidget(this);
m_d->colorSelectorAction = new QWidgetAction(this);
m_d->colorSelectorAction->setDefaultWidget(m_d->colorSelector);
connect(m_d->colorSelector, &KisColorLabelSelectorWidget::currentIndexChanged, this, &TimelineFramesView::slotColorLabelChanged);
m_d->frameEditingMenu = new QMenu(this);
m_d->frameEditingMenu->addAction(KisAnimationUtils::removeFrameActionName, this, SLOT(slotRemoveFrame()));
m_d->frameEditingMenu->addAction(m_d->colorSelectorAction);
m_d->multiframeColorSelector = new KisColorLabelSelectorWidget(this);
m_d->multiframeColorSelectorAction = new QWidgetAction(this);
m_d->multiframeColorSelectorAction->setDefaultWidget(m_d->multiframeColorSelector);
connect(m_d->multiframeColorSelector, &KisColorLabelSelectorWidget::currentIndexChanged, this, &TimelineFramesView::slotColorLabelChanged);
m_d->multipleFrameEditingMenu = new QMenu(this);
m_d->multipleFrameEditingMenu->addAction(KisAnimationUtils::removeFramesActionName, this, SLOT(slotRemoveFrame()));
m_d->multipleFrameEditingMenu->addAction(m_d->multiframeColorSelectorAction);
/********** Zoom Button **************************************************************/
m_d->zoomDragButton = new KisZoomButton(this);
m_d->zoomDragButton->setAutoRaise(true);
m_d->zoomDragButton->setIcon(KisIconUtils::loadIcon("zoom-horizontal"));
m_d->zoomDragButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
m_d->zoomDragButton->setToolTip(i18nc("@info:tooltip", "Zoom Timeline. Hold down and drag left or right."));
m_d->zoomDragButton->setPopupMode(QToolButton::InstantPopup);
connect(m_d->zoomDragButton, SIGNAL(zoomLevelChanged(qreal)), SLOT(slotZoomButtonChanged(qreal)));
connect(m_d->zoomDragButton, SIGNAL(zoomStarted(qreal)), SLOT(slotZoomButtonPressed(qreal)));
setFramesPerSecond(12);
setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
connect(&m_d->selectionChangedCompressor, SIGNAL(timeout()),
SLOT(slotSelectionChanged()));
}
TimelineFramesView::~TimelineFramesView()
{
}
QMap TimelineFramesView::globalActions() const
{
return m_d->globalActions;
}
void TimelineFramesView::setShowInTimeline(KisAction* action)
{
m_d->showHideLayerAction = action;
m_d->layerEditingMenu->addAction(m_d->showHideLayerAction);
}
+
+void TimelineFramesView::setActionManager( KisActionManager * actionManager)
+{
+ m_d->actionMan = actionManager;
+ m_d->horizontalRuler->setActionManager(actionManager);
+}
+
+
+
+
+
+
void resizeToMinimalSize(QAbstractButton *w, int minimalSize) {
QSize buttonSize = w->sizeHint();
if (buttonSize.height() > minimalSize) {
buttonSize = QSize(minimalSize, minimalSize);
}
w->resize(buttonSize);
}
void TimelineFramesView::updateGeometries()
{
QTableView::updateGeometries();
const int availableHeight = m_d->horizontalRuler->height();
const int margin = 2;
const int minimalSize = availableHeight - 2 * margin;
resizeToMinimalSize(m_d->addLayersButton, minimalSize);
resizeToMinimalSize(m_d->audioOptionsButton, minimalSize);
resizeToMinimalSize(m_d->zoomDragButton, minimalSize);
int x = 2 * margin;
int y = (availableHeight - minimalSize) / 2;
m_d->addLayersButton->move(x, 2 * y);
m_d->audioOptionsButton->move(x + minimalSize + 2 * margin, 2 * y);
const int availableWidth = m_d->layersHeader->width();
x = availableWidth - margin - minimalSize;
m_d->zoomDragButton->move(x, 2 * y);
}
void TimelineFramesView::setModel(QAbstractItemModel *model)
{
TimelineFramesModel *framesModel = qobject_cast(model);
m_d->model = framesModel;
QTableView::setModel(model);
connect(m_d->model, SIGNAL(headerDataChanged(Qt::Orientation, int, int)),
this, SLOT(slotHeaderDataChanged(Qt::Orientation, int, int)));
connect(m_d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(slotDataChanged(QModelIndex,QModelIndex)));
connect(m_d->model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
this, SLOT(slotReselectCurrentIndex()));
connect(m_d->model, SIGNAL(sigInfiniteTimelineUpdateNeeded()),
this, SLOT(slotUpdateInfiniteFramesCount()));
connect(m_d->model, SIGNAL(sigAudioChannelChanged()),
this, SLOT(slotUpdateAudioActions()));
connect(selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
&m_d->selectionChangedCompressor, SLOT(start()));
connect(m_d->model, SIGNAL(sigEnsureRowVisible(int)), SLOT(slotEnsureRowVisible(int)));
slotUpdateAudioActions();
}
void TimelineFramesView::setFramesPerSecond(int fps)
{
m_d->fps = fps;
m_d->horizontalRuler->setFramePerSecond(fps);
// For some reason simple update sometimes doesn't work here, so
// reset the whole header
//
// m_d->horizontalRuler->reset();
}
void TimelineFramesView::slotZoomButtonPressed(qreal staticPoint)
{
m_d->zoomStillPointIndex =
qIsNaN(staticPoint) ? currentIndex().column() : staticPoint;
const int w = m_d->horizontalRuler->defaultSectionSize();
m_d->zoomStillPointOriginalOffset =
w * m_d->zoomStillPointIndex -
horizontalScrollBar()->value();
}
void TimelineFramesView::slotZoomButtonChanged(qreal zoomLevel)
{
if (m_d->horizontalRuler->setZoom(zoomLevel)) {
slotUpdateInfiniteFramesCount();
const int w = m_d->horizontalRuler->defaultSectionSize();
horizontalScrollBar()->setValue(w * m_d->zoomStillPointIndex - m_d->zoomStillPointOriginalOffset);
viewport()->update();
}
}
void TimelineFramesView::slotColorLabelChanged(int label)
{
Q_FOREACH(QModelIndex index, selectedIndexes()) {
m_d->model->setData(index, label, TimelineFramesModel::FrameColorLabelIndexRole);
}
KisImageConfig config;
config.setDefaultFrameColorLabel(label);
}
void TimelineFramesView::slotSelectAudioChannelFile()
{
if (!m_d->model) return;
QString defaultDir = QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
const QString currentFile = m_d->model->audioChannelFileName();
QDir baseDir = QFileInfo(currentFile).absoluteDir();
if (baseDir.exists()) {
defaultDir = baseDir.absolutePath();
}
const QString result = KisImportExportManager::askForAudioFileName(defaultDir, this);
const QFileInfo info(result);
if (info.exists()) {
m_d->model->setAudioChannelFileName(info.absoluteFilePath());
}
}
void TimelineFramesView::slotAudioChannelMute(bool value)
{
if (!m_d->model) return;
if (value != m_d->model->isAudioMuted()) {
m_d->model->setAudioMuted(value);
}
}
void TimelineFramesView::slotUpdateIcons()
{
m_d->addLayersButton->setIcon(KisIconUtils::loadIcon("addlayer"));
m_d->audioOptionsButton->setIcon(KisIconUtils::loadIcon("audio-none"));
m_d->zoomDragButton->setIcon(KisIconUtils::loadIcon("zoom-horizontal"));
}
void TimelineFramesView::slotAudioChannelRemove()
{
if (!m_d->model) return;
m_d->model->setAudioChannelFileName(QString());
}
void TimelineFramesView::slotUpdateAudioActions()
{
if (!m_d->model) return;
const QString currentFile = m_d->model->audioChannelFileName();
if (currentFile.isEmpty()) {
m_d->openAudioAction->setText(i18nc("@item:inmenu", "Open audio..."));
} else {
QFileInfo info(currentFile);
m_d->openAudioAction->setText(i18nc("@item:inmenu", "Change audio (%1)...", info.fileName()));
}
m_d->audioMuteAction->setChecked(m_d->model->isAudioMuted());
QIcon audioIcon;
if (currentFile.isEmpty()) {
audioIcon = KisIconUtils::loadIcon("audio-none");
} else {
if (m_d->model->isAudioMuted()) {
audioIcon = KisIconUtils::loadIcon("audio-volume-mute");
} else {
audioIcon = KisIconUtils::loadIcon("audio-volume-high");
}
}
m_d->audioOptionsButton->setIcon(audioIcon);
m_d->volumeSlider->setEnabled(!m_d->model->isAudioMuted());
KisSignalsBlocker b(m_d->volumeSlider);
m_d->volumeSlider->setValue(qRound(m_d->model->audioVolume() * 100.0));
}
void TimelineFramesView::slotAudioVolumeChanged(int value)
{
m_d->model->setAudioVolume(qreal(value) / 100.0);
}
void TimelineFramesView::slotUpdateInfiniteFramesCount()
{
if (horizontalScrollBar()->isSliderDown()) return;
const int sectionWidth = m_d->horizontalRuler->defaultSectionSize();
const int calculatedIndex =
(horizontalScrollBar()->value() +
m_d->horizontalRuler->width() - 1) / sectionWidth;
m_d->model->setLastVisibleFrame(calculatedIndex);
}
void TimelineFramesView::currentChanged(const QModelIndex ¤t, const QModelIndex &previous)
{
QTableView::currentChanged(current, previous);
if (previous.column() != current.column()) {
m_d->model->setData(previous, false, TimelineFramesModel::ActiveFrameRole);
m_d->model->setData(current, true, TimelineFramesModel::ActiveFrameRole);
}
}
QItemSelectionModel::SelectionFlags TimelineFramesView::selectionCommand(const QModelIndex &index,
const QEvent *event) const
{
// WARNING: Copy-pasted from KisNodeView! Please keep in sync!
/**
* Qt has a bug: when we Ctrl+click on an item, the item's
* selections gets toggled on mouse *press*, whereas usually it is
* done on mouse *release*. Therefore the user cannot do a
* Ctrl+D&D with the default configuration. This code fixes the
* problem by manually returning QItemSelectionModel::NoUpdate
* flag when the user clicks on an item and returning
* QItemSelectionModel::Toggle on release.
*/
if (event &&
(event->type() == QEvent::MouseButtonPress ||
event->type() == QEvent::MouseButtonRelease) &&
index.isValid()) {
const QMouseEvent *mevent = static_cast(event);
if (mevent->button() == Qt::RightButton &&
selectionModel()->selectedIndexes().contains(index)) {
// Allow calling context menu for multiple layers
return QItemSelectionModel::NoUpdate;
}
if (event->type() == QEvent::MouseButtonPress &&
(mevent->modifiers() & Qt::ControlModifier)) {
return QItemSelectionModel::NoUpdate;
}
if (event->type() == QEvent::MouseButtonRelease &&
(mevent->modifiers() & Qt::ControlModifier)) {
return QItemSelectionModel::Toggle;
}
}
return QAbstractItemView::selectionCommand(index, event);
}
void TimelineFramesView::slotSelectionChanged()
{
int minColumn = std::numeric_limits::max();
int maxColumn = std::numeric_limits::min();
foreach (const QModelIndex &idx, selectedIndexes()) {
if (idx.column() > maxColumn) {
maxColumn = idx.column();
}
if (idx.column() < minColumn) {
minColumn = idx.column();
}
}
KisTimeRange range;
if (maxColumn > minColumn) {
range = KisTimeRange(minColumn, maxColumn - minColumn + 1);
}
m_d->model->setPlaybackRange(range);
}
void TimelineFramesView::slotReselectCurrentIndex()
{
QModelIndex index = currentIndex();
currentChanged(index, index);
}
void TimelineFramesView::slotEnsureRowVisible(int row)
{
QModelIndex index = currentIndex();
if (!index.isValid() || row < 0) return;
index = m_d->model->index(row, index.column());
scrollTo(index);
}
void TimelineFramesView::slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
{
if (m_d->model->isPlaybackActive()) return;
int selectedColumn = -1;
for (int j = topLeft.column(); j <= bottomRight.column(); j++) {
QVariant value = m_d->model->data(
m_d->model->index(topLeft.row(), j),
TimelineFramesModel::ActiveFrameRole);
if (value.isValid() && value.toBool()) {
selectedColumn = j;
break;
}
}
QModelIndex index = currentIndex();
if (!index.isValid() && selectedColumn < 0) {
return;
}
if (selectedColumn == -1) {
selectedColumn = index.column();
}
if (selectedColumn != index.column() && !m_d->dragInProgress) {
int row= index.isValid() ? index.row() : 0;
setCurrentIndex(m_d->model->index(row, selectedColumn));
}
}
void TimelineFramesView::slotHeaderDataChanged(Qt::Orientation orientation, int first, int last)
{
Q_UNUSED(first);
Q_UNUSED(last);
if (orientation == Qt::Horizontal) {
const int newFps = m_d->model->headerData(0, Qt::Horizontal, TimelineFramesModel::FramesPerSecondRole).toInt();
if (newFps != m_d->fps) {
setFramesPerSecond(newFps);
}
}
}
void TimelineFramesView::rowsInserted(const QModelIndex& parent, int start, int end)
{
QTableView::rowsInserted(parent, start, end);
}
inline bool isIndexDragEnabled(QAbstractItemModel *model, const QModelIndex &index) {
return (model->flags(index) & Qt::ItemIsDragEnabled);
}
QStyleOptionViewItem TimelineFramesView::Private::viewOptionsV4() const
{
QStyleOptionViewItem option = q->viewOptions();
option.locale = q->locale();
option.locale.setNumberOptions(QLocale::OmitGroupSeparator);
option.widget = q;
return option;
}
QItemViewPaintPairs TimelineFramesView::Private::draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const
{
Q_ASSERT(r);
QRect &rect = *r;
const QRect viewportRect = q->viewport()->rect();
QItemViewPaintPairs ret;
for (int i = 0; i < indexes.count(); ++i) {
const QModelIndex &index = indexes.at(i);
const QRect current = q->visualRect(index);
if (current.intersects(viewportRect)) {
ret += qMakePair(current, index);
rect |= current;
}
}
rect &= viewportRect;
return ret;
}
QPixmap TimelineFramesView::Private::renderToPixmap(const QModelIndexList &indexes, QRect *r) const
{
Q_ASSERT(r);
QItemViewPaintPairs paintPairs = draggablePaintPairs(indexes, r);
if (paintPairs.isEmpty())
return QPixmap();
QPixmap pixmap(r->size());
pixmap.fill(Qt::transparent);
QPainter painter(&pixmap);
QStyleOptionViewItem option = viewOptionsV4();
option.state |= QStyle::State_Selected;
for (int j = 0; j < paintPairs.count(); ++j) {
option.rect = paintPairs.at(j).first.translated(-r->topLeft());
const QModelIndex ¤t = paintPairs.at(j).second;
//adjustViewOptionsForIndex(&option, current);
q->itemDelegate(current)->paint(&painter, option, current);
}
return pixmap;
}
void TimelineFramesView::startDrag(Qt::DropActions supportedActions)
{
QModelIndexList indexes = selectionModel()->selectedIndexes();
if (!indexes.isEmpty() && m_d->modifiersCatcher->modifierPressed("offset-frame")) {
QVector rows;
int leftmostColumn = std::numeric_limits::max();
Q_FOREACH (const QModelIndex &index, indexes) {
leftmostColumn = qMin(leftmostColumn, index.column());
if (!rows.contains(index.row())) {
rows.append(index.row());
}
}
const int lastColumn = m_d->model->columnCount() - 1;
selectionModel()->clear();
Q_FOREACH (const int row, rows) {
QItemSelection sel(m_d->model->index(row, leftmostColumn), m_d->model->index(row, lastColumn));
selectionModel()->select(sel, QItemSelectionModel::Select);
}
supportedActions = Qt::MoveAction;
{
QModelIndexList indexes = selectedIndexes();
for(int i = indexes.count() - 1 ; i >= 0; --i) {
if (!isIndexDragEnabled(m_d->model, indexes.at(i)))
indexes.removeAt(i);
}
selectionModel()->clear();
if (indexes.count() > 0) {
QMimeData *data = m_d->model->mimeData(indexes);
if (!data)
return;
QRect rect;
QPixmap pixmap = m_d->renderToPixmap(indexes, &rect);
rect.adjust(horizontalOffset(), verticalOffset(), 0, 0);
QDrag *drag = new QDrag(this);
drag->setPixmap(pixmap);
drag->setMimeData(data);
drag->setHotSpot(m_d->lastPressedPosition - rect.topLeft());
drag->exec(supportedActions, Qt::MoveAction);
setCurrentIndex(currentIndex());
}
}
} else {
/**
* Workaround for Qt5's bug: if we start a dragging action right during
* Shift-selection, Qt will get crazy. We cannot workaround it easily,
* because we would need to fork mouseMoveEvent() for that (where the
* decision about drag state is done). So we just abort dragging in that
* case.
*
* BUG:373067
*/
if (m_d->lastPressedModifier & Qt::ShiftModifier) {
return;
}
/**
* Workaround for Qt5's bugs:
*
* 1) Qt doesn't treat selection the selection on D&D
* correctly, so we save it in advance and restore
* afterwards.
*
* 2) There is a private variable in QAbstractItemView:
* QAbstractItemView::Private::currentSelectionStartIndex.
* It is initialized *only* when the setCurrentIndex() is called
* explicitly on the view object, not on the selection model.
* Therefore we should explicitly call setCurrentIndex() after
* D&D, even if it already has *correct* value!
*
* 2) We should also call selectionModel()->select()
* explicitly. There are two reasons for it: 1) Qt doesn't
* maintain selection over D&D; 2) when reselecting single
* element after D&D, Qt goes crazy, because it tries to
* read *global* keyboard modifiers. Therefore if we are
* dragging with Shift or Ctrl pressed it'll get crazy. So
* just reset it explicitly.
*/
QModelIndexList selectionBefore = selectionModel()->selectedIndexes();
QModelIndex currentBefore = selectionModel()->currentIndex();
// initialize a global status variable
m_d->dragWasSuccessful = false;
QAbstractItemView::startDrag(supportedActions);
QModelIndex newCurrent;
QPoint selectionOffset;
if (m_d->dragWasSuccessful) {
newCurrent = currentIndex();
selectionOffset = QPoint(newCurrent.column() - currentBefore.column(),
newCurrent.row() - currentBefore.row());
} else {
newCurrent = currentBefore;
selectionOffset = QPoint();
}
setCurrentIndex(newCurrent);
selectionModel()->clearSelection();
Q_FOREACH (const QModelIndex &idx, selectionBefore) {
QModelIndex newIndex =
model()->index(idx.row() + selectionOffset.y(),
idx.column() + selectionOffset.x());
selectionModel()->select(newIndex, QItemSelectionModel::Select);
}
}
}
void TimelineFramesView::dragEnterEvent(QDragEnterEvent *event)
{
m_d->dragInProgress = true;
m_d->model->setScrubState(true);
QTableView::dragEnterEvent(event);
}
void TimelineFramesView::dragMoveEvent(QDragMoveEvent *event)
{
m_d->dragInProgress = true;
m_d->model->setScrubState(true);
QTableView::dragMoveEvent(event);
if (event->isAccepted()) {
QModelIndex index = indexAt(event->pos());
if (!m_d->model->canDropFrameData(event->mimeData(), index)) {
event->ignore();
} else {
selectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
}
}
}
void TimelineFramesView::dropEvent(QDropEvent *event)
{
m_d->dragInProgress = false;
m_d->model->setScrubState(false);
QAbstractItemView::dropEvent(event);
m_d->dragWasSuccessful = event->isAccepted();
}
void TimelineFramesView::dragLeaveEvent(QDragLeaveEvent *event)
{
m_d->dragInProgress = false;
m_d->model->setScrubState(false);
QAbstractItemView::dragLeaveEvent(event);
}
void TimelineFramesView::mousePressEvent(QMouseEvent *event)
{
QPersistentModelIndex index = indexAt(event->pos());
if (m_d->modifiersCatcher->modifierPressed("pan-zoom")) {
if (event->button() == Qt::RightButton) {
// TODO: try calculate index under mouse cursor even when
// it is outside any visible row
qreal staticPoint = index.isValid() ? index.column() : currentIndex().column();
m_d->zoomDragButton->beginZoom(event->pos(), staticPoint);
} else if (event->button() == Qt::LeftButton) {
m_d->initialDragPanPos = event->pos();
m_d->initialDragPanValue =
QPoint(horizontalScrollBar()->value(),
verticalScrollBar()->value());
}
event->accept();
} else if (event->button() == Qt::RightButton) {
int numSelectedItems = selectionModel()->selectedIndexes().size();
if (index.isValid() &&
numSelectedItems <= 1 &&
m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
model()->setData(index, true, TimelineFramesModel::ActiveLayerRole);
model()->setData(index, true, TimelineFramesModel::ActiveFrameRole);
setCurrentIndex(index);
if (model()->data(index, TimelineFramesModel::FrameExistsRole).toBool() ||
model()->data(index, TimelineFramesModel::SpecialKeyframeExists).toBool()) {
{
KisSignalsBlocker b(m_d->colorSelector);
QVariant colorLabel = index.data(TimelineFramesModel::FrameColorLabelIndexRole);
int labelIndex = colorLabel.isValid() ? colorLabel.toInt() : 0;
m_d->colorSelector->setCurrentIndex(labelIndex);
}
m_d->frameEditingMenu->exec(event->globalPos());
} else {
m_d->frameCreationMenu->exec(event->globalPos());
}
} else if (numSelectedItems > 1) {
int labelIndex = -1;
bool haveFrames = false;
Q_FOREACH(QModelIndex index, selectedIndexes()) {
haveFrames |= index.data(TimelineFramesModel::FrameExistsRole).toBool();
QVariant colorLabel = index.data(TimelineFramesModel::FrameColorLabelIndexRole);
if (colorLabel.isValid()) {
if (labelIndex == -1) {
// First label
labelIndex = colorLabel.toInt();
} else if (labelIndex != colorLabel.toInt()) {
// Mixed colors in selection
labelIndex = -1;
break;
}
}
}
if (!haveFrames) {
m_d->multiframeColorSelectorAction->setVisible(false);
} else {
KisSignalsBlocker b(m_d->multiframeColorSelector);
m_d->multiframeColorSelector->setCurrentIndex(labelIndex);
m_d->multiframeColorSelectorAction->setVisible(true);
}
m_d->multipleFrameEditingMenu->exec(event->globalPos());
}
} else if (event->button() == Qt::MidButton) {
QModelIndex index = model()->buddy(indexAt(event->pos()));
if (index.isValid()) {
QStyleOptionViewItem option = viewOptions();
option.rect = visualRect(index);
// The offset of the headers is needed to get the correct position inside the view.
m_d->tip.showTip(this, event->pos() + QPoint(verticalHeader()->width(), horizontalHeader()->height()), option, index);
}
event->accept();
} else {
if (index.isValid()) {
m_d->model->setLastClickedIndex(index);
}
m_d->lastPressedPosition =
QPoint(horizontalOffset(), verticalOffset()) + event->pos();
m_d->lastPressedModifier = event->modifiers();
QAbstractItemView::mousePressEvent(event);
}
}
void TimelineFramesView::mouseMoveEvent(QMouseEvent *e)
{
if (m_d->modifiersCatcher->modifierPressed("pan-zoom")) {
if (e->buttons() & Qt::RightButton) {
m_d->zoomDragButton->continueZoom(e->pos());
} else if (e->buttons() & Qt::LeftButton) {
QPoint diff = e->pos() - m_d->initialDragPanPos;
QPoint offset = QPoint(m_d->initialDragPanValue.x() - diff.x(),
m_d->initialDragPanValue.y() - diff.y());
const int height = m_d->layersHeader->defaultSectionSize();
horizontalScrollBar()->setValue(offset.x());
verticalScrollBar()->setValue(offset.y() / height);
}
e->accept();
} else if (e->buttons() == Qt::MidButton) {
QModelIndex index = model()->buddy(indexAt(e->pos()));
if (index.isValid()) {
QStyleOptionViewItem option = viewOptions();
option.rect = visualRect(index);
// The offset of the headers is needed to get the correct position inside the view.
m_d->tip.showTip(this, e->pos() + QPoint(verticalHeader()->width(), horizontalHeader()->height()), option, index);
}
e->accept();
} else {
m_d->model->setScrubState(true);
QTableView::mouseMoveEvent(e);
}
}
void TimelineFramesView::mouseReleaseEvent(QMouseEvent *e)
{
if (m_d->modifiersCatcher->modifierPressed("pan-zoom")) {
e->accept();
} else {
m_d->model->setScrubState(false);
QTableView::mouseReleaseEvent(e);
}
}
void TimelineFramesView::wheelEvent(QWheelEvent *e)
{
QModelIndex index = currentIndex();
int column= -1;
if (index.isValid()) {
column= index.column() + ((e->delta() > 0) ? 1 : -1);
}
if (column >= 0 && !m_d->dragInProgress) {
setCurrentIndex(m_d->model->index(index.row(), column));
}
}
void TimelineFramesView::slotUpdateLayersMenu()
{
QAction *action = 0;
m_d->existingLayersMenu->clear();
QVariant value = model()->headerData(0, Qt::Vertical, TimelineFramesModel::OtherLayersRole);
if (value.isValid()) {
TimelineFramesModel::OtherLayersList list = value.value();
int i = 0;
Q_FOREACH (const TimelineFramesModel::OtherLayer &l, list) {
action = m_d->existingLayersMenu->addAction(l.name);
action->setData(i++);
}
}
}
void TimelineFramesView::slotLayerContextMenuRequested(const QPoint &globalPos)
{
m_d->layerEditingMenu->exec(globalPos);
}
void TimelineFramesView::slotAddNewLayer()
{
QModelIndex index = currentIndex();
const int newRow = index.isValid() ? index.row() : 0;
model()->insertRow(newRow);
}
void TimelineFramesView::slotAddExistingLayer(QAction *action)
{
QVariant value = action->data();
if (value.isValid()) {
QModelIndex index = currentIndex();
const int newRow = index.isValid() ? index.row() + 1 : 0;
m_d->model->insertOtherLayer(value.toInt(), newRow);
}
}
void TimelineFramesView::slotRemoveLayer()
{
QModelIndex index = currentIndex();
if (!index.isValid()) return;
model()->removeRow(index.row());
}
void TimelineFramesView::slotNewFrame()
{
QModelIndex index = currentIndex();
if (!index.isValid() ||
!m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
return;
}
m_d->model->createFrame(index);
}
void TimelineFramesView::slotCopyFrame()
{
QModelIndex index = currentIndex();
if (!index.isValid() ||
!m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
return;
}
m_d->model->copyFrame(index);
}
void TimelineFramesView::slotRemoveFrame()
{
QModelIndexList indexes = selectionModel()->selectedIndexes();
for (auto it = indexes.begin(); it != indexes.end(); /*noop*/) {
if (!m_d->model->data(*it, TimelineFramesModel::FrameEditableRole).toBool()) {
it = indexes.erase(it);
} else {
++it;
}
}
if (!indexes.isEmpty()) {
m_d->model->removeFrames(indexes);
}
}
bool TimelineFramesView::viewportEvent(QEvent *event)
{
if (event->type() == QEvent::ToolTip && model()) {
QHelpEvent *he = static_cast(event);
QModelIndex index = model()->buddy(indexAt(he->pos()));
if (index.isValid()) {
QStyleOptionViewItem option = viewOptions();
option.rect = visualRect(index);
// The offset of the headers is needed to get the correct position inside the view.
m_d->tip.showTip(this, he->pos() + QPoint(verticalHeader()->width(), horizontalHeader()->height()), option, index);
return true;
}
}
return QTableView::viewportEvent(event);
}
diff --git a/plugins/dockers/animation/timeline_frames_view.h b/plugins/dockers/animation/timeline_frames_view.h
index 5178d9ec27..4742154ff5 100644
--- a/plugins/dockers/animation/timeline_frames_view.h
+++ b/plugins/dockers/animation/timeline_frames_view.h
@@ -1,109 +1,111 @@
/*
* Copyright (c) 2015 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 __TIMELINE_FRAMES_VIEW_H
#define __TIMELINE_FRAMES_VIEW_H
#include
#include
-
+#include "kis_action_manager.h"
#include "kritaanimationdocker_export.h"
class KisAction;
class TimelineWidget;
class KRITAANIMATIONDOCKER_EXPORT TimelineFramesView : public QTableView
{
Q_OBJECT
public:
TimelineFramesView(QWidget *parent);
~TimelineFramesView() override;
void setModel(QAbstractItemModel *model) override;
void updateGeometries() override;
QMap globalActions() const;
void setShowInTimeline(KisAction *action);
+ void setActionManager( KisActionManager * actionManager);
+
public Q_SLOTS:
void slotSelectionChanged();
void slotUpdateIcons();
private Q_SLOTS:
void slotUpdateLayersMenu();
void slotAddNewLayer();
void slotAddExistingLayer(QAction *action);
void slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
void slotRemoveLayer();
void slotLayerContextMenuRequested(const QPoint &globalPos);
void slotNewFrame();
void slotCopyFrame();
void slotRemoveFrame();
void slotReselectCurrentIndex();
void slotUpdateInfiniteFramesCount();
void slotHeaderDataChanged(Qt::Orientation orientation, int first, int last);
void slotZoomButtonPressed(qreal staticPoint);
void slotZoomButtonChanged(qreal value);
void slotColorLabelChanged(int);
void slotEnsureRowVisible(int row);
void slotSelectAudioChannelFile();
void slotAudioChannelMute(bool value);
void slotAudioChannelRemove();
void slotUpdateAudioActions();
void slotAudioVolumeChanged(int value);
private:
void setFramesPerSecond(int fps);
protected:
QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &index,
const QEvent *event) const override;
void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override;
void startDrag(Qt::DropActions supportedActions) override;
void dragEnterEvent(QDragEnterEvent *event) override;
void dragMoveEvent(QDragMoveEvent *event) override;
void dropEvent(QDropEvent *event) override;
void dragLeaveEvent(QDragLeaveEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void wheelEvent(QWheelEvent *e) override;
void rowsInserted(const QModelIndex& parent, int start, int end) override;
bool viewportEvent(QEvent *event) override;
private:
struct Private;
const QScopedPointer m_d;
};
#endif /* __TIMELINE_FRAMES_VIEW_H */
diff --git a/plugins/dockers/animation/timeline_ruler_header.cpp b/plugins/dockers/animation/timeline_ruler_header.cpp
index eb4a626e5f..95588f29ed 100644
--- a/plugins/dockers/animation/timeline_ruler_header.cpp
+++ b/plugins/dockers/animation/timeline_ruler_header.cpp
@@ -1,500 +1,528 @@
/*
* Copyright (c) 2015 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 "timeline_ruler_header.h"
#include
#include
#include
#include
#include
#include
#include "kis_time_based_item_model.h"
#include "timeline_color_scheme.h"
+#include "kis_action.h"
#include "kis_debug.h"
struct TimelineRulerHeader::Private
{
Private() : fps(12), lastPressSectionIndex(-1) {}
int fps;
QMenu *columnEditingMenu;
- QAction *insertLeftAction;
- QAction *insertRightAction;
- QAction *removeAction;
- QAction *clearAction;
+ KisAction *insertLeftAction;
+ KisAction *insertRightAction;
+ KisAction *removeAction;
+ KisAction *clearAction;
KisTimeBasedItemModel *model;
int lastPressSectionIndex;
int calcSpanWidth(const int sectionWidth);
QModelIndexList prepareFramesSlab(int startCol, int endCol);
+
+ KisActionManager* actionMan = 0;
+
};
TimelineRulerHeader::TimelineRulerHeader(QWidget *parent)
: QHeaderView(Qt::Horizontal, parent),
m_d(new Private)
{
setSectionResizeMode(QHeaderView::Fixed);
setDefaultSectionSize(18);
- m_d->columnEditingMenu = new QMenu(this);
- m_d->insertLeftAction = m_d->columnEditingMenu->addAction("Insert 1 Left", this, SLOT(slotInsertColumnLeft()));
- m_d->insertRightAction = m_d->columnEditingMenu->addAction("Insert 1 Right", this, SLOT(slotInsertColumnRight()));
- m_d->clearAction = m_d->columnEditingMenu->addAction("Clear Columns", this, SLOT(slotClearColumns()));
- m_d->removeAction = m_d->columnEditingMenu->addAction("Remove Columns", this, SLOT(slotRemoveColumns()));
+
+
}
TimelineRulerHeader::~TimelineRulerHeader()
{
}
+
+void TimelineRulerHeader::setActionManager( KisActionManager * actionManager)
+{
+ m_d->actionMan = actionManager;
+
+ m_d->insertLeftAction = actionManager->createAction("insert_n_frames_left");
+ connect(m_d->insertLeftAction, SIGNAL(triggered()), SLOT(slotInsertColumnLeft()));
+
+ m_d->insertRightAction = actionManager->createAction("insert_n_frames_right");
+ connect(m_d->insertRightAction, SIGNAL(triggered()), SLOT(slotInsertColumnRight()));
+
+ m_d->clearAction = actionManager->createAction("clear_animation_columns");
+ connect(m_d->clearAction, SIGNAL(triggered()), SLOT(slotClearColumns()));
+
+ m_d->removeAction = actionManager->createAction("remove_animation_columns");
+ connect(m_d->removeAction, SIGNAL(triggered()), SLOT(slotRemoveColumns()));
+
+
+ m_d->columnEditingMenu = new QMenu(this);
+ m_d->columnEditingMenu->addAction(static_cast(m_d->insertLeftAction));
+ m_d->columnEditingMenu->addAction(static_cast(m_d->insertRightAction));
+ m_d->columnEditingMenu->addAction(static_cast(m_d->clearAction));
+ m_d->columnEditingMenu->addAction(static_cast(m_d->removeAction));
+}
+
+
void TimelineRulerHeader::paintEvent(QPaintEvent *e)
{
QHeaderView::paintEvent(e);
// Copied from Qt 4.8...
if (count() == 0)
return;
QPainter painter(viewport());
const QPoint offset = dirtyRegionOffset();
QRect translatedEventRect = e->rect();
translatedEventRect.translate(offset);
int start = -1;
int end = -1;
if (orientation() == Qt::Horizontal) {
start = visualIndexAt(translatedEventRect.left());
end = visualIndexAt(translatedEventRect.right());
} else {
start = visualIndexAt(translatedEventRect.top());
end = visualIndexAt(translatedEventRect.bottom());
}
const bool reverseImpl = orientation() == Qt::Horizontal && isRightToLeft();
if (reverseImpl) {
start = (start == -1 ? count() - 1 : start);
end = (end == -1 ? 0 : end);
} else {
start = (start == -1 ? 0 : start);
end = (end == -1 ? count() - 1 : end);
}
int tmp = start;
start = qMin(start, end);
end = qMax(tmp, end);
///////////////////////////////////////////////////
/// Krita specific code. We should update in spans!
const int spanStart = start - start % m_d->fps;
const int spanEnd = end - end % m_d->fps + m_d->fps - 1;
start = spanStart;
end = qMin(count() - 1, spanEnd);
/// End of Krita specific code
///////////////////////////////////////////////////
QRect currentSectionRect;
int logical;
const int width = viewport()->width();
const int height = viewport()->height();
for (int i = start; i <= end; ++i) {
// DK: cannot copy-paste easily...
// if (d->isVisualIndexHidden(i))
// continue;
painter.save();
logical = logicalIndex(i);
if (orientation() == Qt::Horizontal) {
currentSectionRect.setRect(sectionViewportPosition(logical), 0, sectionSize(logical), height);
} else {
currentSectionRect.setRect(0, sectionViewportPosition(logical), width, sectionSize(logical));
}
currentSectionRect.translate(offset);
QVariant variant = model()->headerData(logical, orientation(),
Qt::FontRole);
if (variant.isValid() && variant.canConvert()) {
QFont sectionFont = qvariant_cast(variant);
painter.setFont(sectionFont);
}
paintSection1(&painter, currentSectionRect, logical);
painter.restore();
}
}
void TimelineRulerHeader::paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const
{
// Base paint event should paint nothing in the sections area
Q_UNUSED(painter);
Q_UNUSED(rect);
Q_UNUSED(logicalIndex);
}
void TimelineRulerHeader::paintSpan(QPainter *painter, int userFrameId,
const QRect &spanRect,
bool isIntegralLine,
bool isPrevIntegralLine,
QStyle *style,
const QPalette &palette,
const QPen &gridPen) const
{
painter->fillRect(spanRect, palette.brush(QPalette::Button));
int safeRight = spanRect.right();
QPen oldPen = painter->pen();
painter->setPen(gridPen);
int adjustedTop = spanRect.top() + (!isIntegralLine ? spanRect.height() / 2 : 0);
painter->drawLine(safeRight, adjustedTop, safeRight, spanRect.bottom());
if (isPrevIntegralLine) {
painter->drawLine(spanRect.left() + 1, spanRect.top(), spanRect.left() + 1, spanRect.bottom());
}
painter->setPen(oldPen);
QString frameIdText = QString::number(userFrameId);
QRect textRect(spanRect.topLeft() + QPoint(2, 0), QSize(spanRect.width() - 2, spanRect.height()));
QStyleOptionHeader opt;
initStyleOption(&opt);
QStyle::State state = QStyle::State_None;
if (isEnabled())
state |= QStyle::State_Enabled;
if (window()->isActiveWindow())
state |= QStyle::State_Active;
opt.state |= state;
opt.selectedPosition = QStyleOptionHeader::NotAdjacent;
opt.textAlignment = Qt::AlignLeft | Qt::AlignTop;
opt.rect = textRect;
opt.text = frameIdText;
style->drawControl(QStyle::CE_HeaderLabel, &opt, painter, this);
}
int TimelineRulerHeader::Private::calcSpanWidth(const int sectionWidth) {
const int minWidth = 36;
int spanWidth = this->fps;
while (spanWidth * sectionWidth < minWidth) {
spanWidth *= 2;
}
bool splitHappened = false;
do {
splitHappened = false;
if (!(spanWidth & 0x1) &&
spanWidth * sectionWidth / 2 > minWidth) {
spanWidth /= 2;
splitHappened = true;
} else if (!(spanWidth % 3) &&
spanWidth * sectionWidth / 3 > minWidth) {
spanWidth /= 3;
splitHappened = true;
} else if (!(spanWidth % 5) &&
spanWidth * sectionWidth / 5 > minWidth) {
spanWidth /= 5;
splitHappened = true;
}
} while (splitHappened);
if (sectionWidth > minWidth) {
spanWidth = 1;
}
return spanWidth;
}
void TimelineRulerHeader::paintSection1(QPainter *painter, const QRect &rect, int logicalIndex) const
{
if (!rect.isValid())
return;
QFontMetrics metrics(this->font());
const int textHeight = metrics.height();
QPoint p1 = rect.topLeft() + QPoint(0, textHeight);
QPoint p2 = rect.topRight() + QPoint(0, textHeight);
QRect frameRect = QRect(p1, QSize(rect.width(), rect.height() - textHeight));
const int width = rect.width();
int spanWidth = m_d->calcSpanWidth(width);
const int internalIndex = logicalIndex % spanWidth;
const int userFrameId = logicalIndex;
const int spanEnd = qMin(count(), logicalIndex + spanWidth);
QRect spanRect(rect.topLeft(), QSize(width * (spanEnd - logicalIndex), textHeight));
QStyleOptionViewItem option = viewOptions();
const int gridHint = style()->styleHint(QStyle::SH_Table_GridLineColor, &option, this);
const QColor gridColor = static_cast(gridHint);
const QPen gridPen = QPen(gridColor);
if (!internalIndex) {
bool isIntegralLine = (logicalIndex + spanWidth) % m_d->fps == 0;
bool isPrevIntegralLine = logicalIndex % m_d->fps == 0;
paintSpan(painter, userFrameId, spanRect, isIntegralLine, isPrevIntegralLine, style(), palette(), gridPen);
}
{
QBrush fillColor = TimelineColorScheme::instance()->headerEmpty();
QVariant activeValue = model()->headerData(logicalIndex, orientation(),
KisTimeBasedItemModel::ActiveFrameRole);
QVariant cachedValue = model()->headerData(logicalIndex, orientation(),
KisTimeBasedItemModel::FrameCachedRole);
if (activeValue.isValid() && activeValue.toBool()) {
fillColor = TimelineColorScheme::instance()->headerActive();
} else if (cachedValue.isValid() && cachedValue.toBool()) {
fillColor = TimelineColorScheme::instance()->headerCachedFrame();
}
painter->fillRect(frameRect, fillColor);
QVector lines;
lines << QLine(p1, p2);
lines << QLine(frameRect.topRight(), frameRect.bottomRight());
lines << QLine(frameRect.bottomLeft(), frameRect.bottomRight());
QPen oldPen = painter->pen();
painter->setPen(gridPen);
painter->drawLines(lines);
painter->setPen(oldPen);
}
}
void TimelineRulerHeader::changeEvent(QEvent *event)
{
Q_UNUSED(event);
updateMinimumSize();
}
void TimelineRulerHeader::setFramePerSecond(int fps)
{
m_d->fps = fps;
update();
}
bool TimelineRulerHeader::setZoom(qreal zoom)
{
const int minSectionSize = 4;
const int unitSectionSize = 18;
int newSectionSize = zoom * unitSectionSize;
if (newSectionSize < minSectionSize) {
newSectionSize = minSectionSize;
zoom = qreal(newSectionSize) / unitSectionSize;
}
if (newSectionSize != defaultSectionSize()) {
setDefaultSectionSize(newSectionSize);
return true;
}
return false;
}
void TimelineRulerHeader::updateMinimumSize()
{
QFontMetrics metrics(this->font());
const int textHeight = metrics.height();
setMinimumSize(0, 1.5 * textHeight);
}
void TimelineRulerHeader::setModel(QAbstractItemModel *model)
{
KisTimeBasedItemModel *framesModel = qobject_cast(model);
m_d->model = framesModel;
QHeaderView::setModel(model);
}
int getColumnCount(const QModelIndexList &indexes, int *leftmostCol, int *rightmostCol)
{
QVector columns;
int leftmost = std::numeric_limits::max();
int rightmost = std::numeric_limits::min();
Q_FOREACH (const QModelIndex &index, indexes) {
leftmost = qMin(leftmost, index.column());
rightmost = qMax(rightmost, index.column());
if (!columns.contains(index.column())) {
columns.append(index.column());
}
}
if (leftmostCol) *leftmostCol = leftmost;
if (rightmostCol) *rightmostCol = rightmost;
return columns.size();
}
void TimelineRulerHeader::mousePressEvent(QMouseEvent *e)
{
int logical = logicalIndexAt(e->pos());
if (logical != -1) {
QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
int numSelectedColumns = getColumnCount(selectedIndexes, 0, 0);
if (e->button() == Qt::RightButton) {
if (numSelectedColumns <= 1) {
model()->setHeaderData(logical, orientation(), true, KisTimeBasedItemModel::ActiveFrameRole);
}
+
m_d->insertLeftAction->setText(i18n("Insert %1 left", numSelectedColumns));
m_d->insertRightAction->setText(i18n("Insert %1 right", numSelectedColumns));
m_d->clearAction->setText(i18n("Clear %1 columns", numSelectedColumns));
m_d->removeAction->setText(i18n("Remove %1 columns", numSelectedColumns));
m_d->columnEditingMenu->exec(e->globalPos());
return;
} else if (e->button() == Qt::LeftButton) {
m_d->lastPressSectionIndex = logical;
model()->setHeaderData(logical, orientation(), true, KisTimeBasedItemModel::ActiveFrameRole);
}
}
QHeaderView::mousePressEvent(e);
}
void TimelineRulerHeader::mouseMoveEvent(QMouseEvent *e)
{
int logical = logicalIndexAt(e->pos());
if (logical != -1) {
if (e->buttons() & Qt::LeftButton) {
m_d->model->setScrubState(true);
model()->setHeaderData(logical, orientation(), true, KisTimeBasedItemModel::ActiveFrameRole);
if (m_d->lastPressSectionIndex >= 0 &&
logical != m_d->lastPressSectionIndex &&
e->modifiers() & Qt::ShiftModifier) {
const int minCol = qMin(m_d->lastPressSectionIndex, logical);
const int maxCol = qMax(m_d->lastPressSectionIndex, logical);
QItemSelection sel(m_d->model->index(0, minCol), m_d->model->index(0, maxCol));
selectionModel()->select(sel,
QItemSelectionModel::Columns |
QItemSelectionModel::SelectCurrent);
}
}
}
QHeaderView::mouseMoveEvent(e);
}
void TimelineRulerHeader::mouseReleaseEvent(QMouseEvent *e)
{
if (e->button() == Qt::LeftButton) {
m_d->model->setScrubState(false);
}
QHeaderView::mouseReleaseEvent(e);
}
QModelIndexList TimelineRulerHeader::Private::prepareFramesSlab(int startCol, int endCol)
{
QModelIndexList frames;
const int numRows = model->rowCount();
for (int i = 0; i < numRows; i++) {
for (int j = startCol; j <= endCol; j++) {
QModelIndex index = model->index(i, j);
const bool exists = model->data(index, KisTimeBasedItemModel::FrameExistsRole).toBool();
if (exists) {
frames << index;
}
}
}
return frames;
}
void TimelineRulerHeader::slotInsertColumnLeft()
{
QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
int leftmostCol = 0, rightmostCol = 0;
int numColumns = getColumnCount(selectedIndexes, &leftmostCol, &rightmostCol);
QModelIndexList movingFrames = m_d->prepareFramesSlab(leftmostCol, m_d->model->columnCount() - 1);
m_d->model->offsetFrames(movingFrames, QPoint(numColumns, 0), false);
}
void TimelineRulerHeader::slotInsertColumnRight()
{
QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
int leftmostCol = 0, rightmostCol = 0;
int numColumns = getColumnCount(selectedIndexes, &leftmostCol, &rightmostCol);
QModelIndexList movingFrames = m_d->prepareFramesSlab(rightmostCol + 1, m_d->model->columnCount() - 1);
m_d->model->offsetFrames(movingFrames, QPoint(numColumns, 0), false);
}
void TimelineRulerHeader::slotClearColumns(bool removeColumns)
{
QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
int leftmostCol = 0, rightmostCol = 0;
int numColumns = getColumnCount(selectedIndexes, &leftmostCol, &rightmostCol);
QModelIndexList movingFrames = m_d->prepareFramesSlab(leftmostCol, rightmostCol);
m_d->model->removeFrames(movingFrames);
if (removeColumns) {
QModelIndexList movingFrames = m_d->prepareFramesSlab(rightmostCol + 1, m_d->model->columnCount() - 1);
m_d->model->offsetFrames(movingFrames, QPoint(-numColumns, 0), false);
}
}
void TimelineRulerHeader::slotRemoveColumns()
{
slotClearColumns(true);
}
diff --git a/plugins/dockers/animation/timeline_ruler_header.h b/plugins/dockers/animation/timeline_ruler_header.h
index 6b9a3be097..f0bd04b72f 100644
--- a/plugins/dockers/animation/timeline_ruler_header.h
+++ b/plugins/dockers/animation/timeline_ruler_header.h
@@ -1,72 +1,74 @@
/*
* Copyright (c) 2015 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 TIMELINE_RULER_HEADER_H
#define TIMELINE_RULER_HEADER_H
#include
-
#include
+#include "kis_action_manager.h"
class QPaintEvent;
class TimelineRulerHeader : public QHeaderView
{
Q_OBJECT
public:
TimelineRulerHeader(QWidget *parent = 0);
~TimelineRulerHeader() override;
void setFramePerSecond(int fps);
bool setZoom(qreal zoomLevel);
void setModel(QAbstractItemModel *model) override;
+ void setActionManager( KisActionManager * actionManager);
+
protected:
void mousePressEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void paintEvent(QPaintEvent *e) override;
void paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const override;
void paintSection1(QPainter *painter, const QRect &rect, int logicalIndex) const;
void changeEvent(QEvent *event) override;
private:
void updateMinimumSize();
void paintSpan(QPainter *painter, int userFrameId,
const QRect &spanRect,
bool isIntegralLine,
bool isPrevIntegralLine,
QStyle *style,
const QPalette &palette,
const QPen &gridPen) const;
private Q_SLOTS:
void slotInsertColumnLeft();
void slotInsertColumnRight();
void slotClearColumns(bool removeColumns = false);
void slotRemoveColumns();
private:
struct Private;
const QScopedPointer m_d;
};
#endif // TIMELINE_RULER_HEADER_H