diff --git a/krita/krita.action b/krita/krita.action
index 223a904edb..efccab0f4e 100644
--- a/krita/krita.action
+++ b/krita/krita.action
@@ -1,3502 +1,3476 @@
General
Open Resources Folder
Opens a file browser at the location Krita saves resources such as brushes to.
Opens a file browser at the location Krita saves resources such as brushes to.
Open Resources Folder
0
0
false
Cleanup removed files...
Cleanup removed files
Cleanup removed files
0
0
false
C&ascade
Cascade
Cascade
10
0
false
&Tile
Tile
Tile
10
0
false
Create Resource Bundle...
Create Resource Bundle
Create Resource Bundle
0
0
false
Show File Toolbar
Show File Toolbar
Show File Toolbar
false
Show color selector
Show color selector
Show color selector
Shift+I
false
Show MyPaint shade selector
Show MyPaint shade selector
Show MyPaint shade selector
Shift+M
false
Show minimal shade selector
Show minimal shade selector
Show minimal shade selector
Shift+N
false
Show color history
Show color history
Show color history
H
false
Show common colors
Show common colors
Show common colors
U
false
Show Tool Options
Show Tool Options
Show Tool Options
\
false
Show Brush Editor
Show Brush Editor
Show Brush Editor
F5
false
Show Brush Presets
Show Brush Presets
Show Brush Presets
F6
false
Toggle Tablet Debugger
Toggle Tablet Debugger
Toggle Tablet Debugger
0
0
Ctrl+Shift+T
false
Show system information for bug reports.
Show system information for bug reports.
Show system information for bug reports.
false
Rename Composition...
Rename Composition
Rename Composition
0
0
false
Update Composition
Update Composition
Update Composition
0
0
false
Use multiple of 2 for pixel scale
Use multiple of 2 for pixel scale
Use multiple of 2 for pixel scale
Use multiple of 2 for pixel scale
1
0
true
&Invert Selection
Invert current selection
Invert Selection
10000000000
100
Ctrl+Shift+I
false
Painting
lightness-increase
Make brush color lighter
Make brush color lighter
Make brush color lighter
0
0
L
false
lightness-decrease
Make brush color darker
Make brush color darker
Make brush color darker
0
0
K
false
Make brush color more saturated
Make brush color more saturated
Make brush color more saturated
false
Make brush color more desaturated
Make brush color more desaturated
Make brush color more desaturated
false
Shift brush color hue clockwise
Shift brush color hue clockwise
Shift brush color hue clockwise
false
Shift brush color hue counter-clockwise
Shift brush color hue counter-clockwise
Shift brush color hue counter-clockwise
false
Make brush color more red
Make brush color more red
Make brush color more red
false
Make brush color more green
Make brush color more green
Make brush color more green
false
Make brush color more blue
Make brush color more blue
Make brush color more blue
false
Make brush color more yellow
Make brush color more yellow
Make brush color more yellow
false
opacity-increase
Increase opacity
Increase opacity
Increase opacity
0
0
O
false
opacity-decrease
Decrease opacity
Decrease opacity
Decrease opacity
0
0
I
false
draw-eraser
Set eraser mode
Set eraser mode
Set eraser mode
10000
0
E
true
view-refresh
Reload Original Preset
Reload Original Preset
Reload Original Preset
10000
false
transparency-unlocked
Preserve Alpha
Preserve Alpha
Preserve Alpha
10000
true
transform_icons_penPressure
Use Pen Pressure
Use Pen Pressure
Use Pen Pressure
10000
true
symmetry-horizontal
Horizontal Mirror Tool
Horizontal Mirror Tool
Horizontal Mirror Tool
0
true
symmetry-vertical
Vertical Mirror Tool
Vertical Mirror Tool
Vertical Mirror Tool
0
true
Hide Mirror X Line
Hide Mirror X Line
Hide Mirror X Line
10000
true
Hide Mirror Y Line
Hide Mirror Y Line
Hide Mirror Y Line
10000
true
Lock
Lock X Line
Lock X Line
10000
true
Lock Y Line
Lock Y Line
Lock Y Line
10000
true
Move to Canvas Center
Move to Canvas Center X
Move to Canvas Center X
10000
false
Move to Canvas Center Y
Move to Canvas Center Y
Move to Canvas Center Y
10000
false
&Toggle Selection Display Mode
Toggle Selection Display Mode
Toggle Selection Display Mode
0
0
false
Next Favourite Preset
Next Favourite Preset
Next Favourite Preset
,
false
Previous Favourite Preset
Previous Favourite Preset
Previous Favourite Preset
.
false
preset-switcher
Switch to Previous Preset
Switch to Previous Preset
Switch to Previous Preset
/
false
Hide Brushes and Stuff Toolbar
Hide Brushes and Stuff Toolbar
Hide Brushes and Stuff Toolbar
true
Reset Foreground and Background Color
Reset Foreground and Background Color
Reset Foreground and Background Color
D
false
Swap Foreground and Background Color
Swap Foreground and Background Color
Swap Foreground and Background Color
X
false
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
Select Shapes Tool
Select Shapes Tool
Select Shapes Tool
false
Color Picker
Select a color from the image or current layer
Select a color from the image or current layer
P
false
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 or double-click ends the curve.
Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.
false
Ellipse Tool
Ellipse Tool
Ellipse Tool
false
Freehand Brush Tool
Freehand Brush Tool
Freehand Brush Tool
B
false
Create object
Create object
Create object
false
Elliptical Selection Tool
Elliptical Selection Tool
Elliptical Selection Tool
J
false
Contiguous Selection Tool
Contiguous Selection Tool
Contiguous Selection Tool
false
Pattern editing
Pattern editing
Pattern editing
false
Review
Review
Review
false
Draw a gradient.
Draw a gradient.
Draw a gradient.
G
false
Polygonal Selection Tool
Polygonal Selection Tool
Polygonal Selection Tool
false
Measurement Tool
Measure the distance between two points
Measure the distance between two points
false
Rectangular Selection Tool
Rectangular Selection Tool
Rectangular Selection Tool
Ctrl+R
false
Move Tool
Move a layer
Move a layer
T
false
Vector Image Tool
Vector Image (EMF/WMF/SVM/SVG) tool
Vector Image (EMF/WMF/SVM/SVG) tool
false
Calligraphy
Calligraphy
Calligraphy
false
Path editing
Path editing
Path editing
false
Zoom Tool
Zoom Tool
Zoom Tool
false
Polyline Tool
Polyline Tool. Shift-mouseclick ends the polyline.
Polyline Tool. Shift-mouseclick ends the polyline.
false
Transform Tool
Transform a layer or a selection
Transform a layer or a selection
Ctrl+T
false
Assistant Tool
Assistant Tool
Assistant Tool
false
Text tool
Text tool
Text tool
false
Gradient Editing Tool
Gradient editing
Gradient editing
false
Blending Modes
Select Normal Blending Mode
Select Normal Blending Mode
Select Normal Blending Mode
0
0
Alt+Shift+N
false
Select Dissolve Blending Mode
Select Dissolve Blending Mode
Select Dissolve Blending Mode
0
0
Alt+Shift+I
false
Select Behind Blending Mode
Select Behind Blending Mode
Select Behind Blending Mode
0
0
Alt+Shift+Q
false
Select Clear Blending Mode
Select Clear Blending Mode
Select Clear Blending Mode
0
0
Alt+Shift+R
false
Select Darken Blending Mode
Select Darken Blending Mode
Select Darken Blending Mode
0
0
Alt+Shift+K
false
Select Multiply Blending Mode
Select Multiply Blending Mode
Select Multiply Blending Mode
0
0
Alt+Shift+M
false
Select Color Burn Blending Mode
Select Color Burn Blending Mode
Select Color Burn Blending Mode
0
0
Alt+Shift+B
false
Select Linear Burn Blending Mode
Select Linear Burn Blending Mode
Select Linear Burn Blending Mode
0
0
Alt+Shift+A
false
Select Lighten Blending Mode
Select Lighten Blending Mode
Select Lighten Blending Mode
0
0
Alt+Shift+G
false
Select Screen Blending Mode
Select Screen Blending Mode
Select Screen Blending Mode
0
0
Alt+Shift+S
false
Select Color Dodge Blending Mode
Select Color Dodge Blending Mode
Select Color Dodge Blending Mode
0
0
Alt+Shift+D
false
Select Linear Dodge Blending Mode
Select Linear Dodge Blending Mode
Select Linear Dodge Blending Mode
0
0
Alt+Shift+W
false
Select Overlay Blending Mode
Select Overlay Blending Mode
Select Overlay Blending Mode
0
0
Alt+Shift+O
false
Select Hard Overlay Blending Mode
Select Hard Overlay Blending Mode
Select Hard Overlay Blending Mode
0
0
Alt+Shift+P
false
Select Soft Light Blending Mode
Select Soft Light Blending Mode
Select Soft Light Blending Mode
0
0
Alt+Shift+F
false
Select Hard Light Blending Mode
Select Hard Light Blending Mode
Select Hard Light Blending Mode
0
0
Alt+Shift+H
false
Select Vivid Light Blending Mode
Select Vivid Light Blending Mode
Select Vivid Light Blending Mode
0
0
Alt+Shift+V
false
Select Linear Light Blending Mode
Select Linear Light Blending Mode
Select Linear Light Blending Mode
0
0
Alt+Shift+J
false
Select Pin Light Blending Mode
Select Pin Light Blending Mode
Select Pin Light Blending Mode
0
0
Alt+Shift+Z
false
Select Hard Mix Blending Mode
Select Hard Mix Blending Mode
Select Hard Mix Blending Mode
0
0
Alt+Shift+L
false
Select Difference Blending Mode
Select Difference Blending Mode
Select Difference Blending Mode
0
0
Alt+Shift+E
false
Select Exclusion Blending Mode
Select Exclusion Blending Mode
Select Exclusion Blending Mode
0
0
Alt+Shift+X
false
Select Hue Blending Mode
Select Hue Blending Mode
Select Hue Blending Mode
0
0
Alt+Shift+U
false
Select Saturation Blending Mode
Select Saturation Blending Mode
Select Saturation Blending Mode
0
0
Alt+Shift+T
false
Select Color Blending Mode
Select Color Blending Mode
Select Color Blending Mode
0
0
Alt+Shift+C
false
Select Luminosity Blending Mode
Select Luminosity Blending Mode
Select Luminosity Blending Mode
0
0
Alt+Shift+Y
false
Animation
Previous frame
Move to previous frame
Move to previous frame
1
0
false
Next frame
Move to next frame
Move to next frame
1
0
false
Play / pause animation
Play / pause animation
Play / pause animation
1
0
false
addblankframe
Create Blank Frame
Add blank frame
Add blank frame
100000
0
false
addduplicateframe
Create Duplicate Frame
Add duplicate frame
Add duplicate frame
100000
0
false
Toggle onion skin
Toggle onion skin
Toggle onion skin
100000
0
false
Previous Keyframe
false
Next Keyframe
false
First Frame
false
Last Frame
false
Auto Frame Mode
true
true
Show in Timeline
true
-
-
- Insert Keyframe Right
-
- Insert keyframes to the right of selection moving the tail of animation to the right
-
- 100000
- 0
-
- false
-
-
-
-
+
Insert Keyframe Left
- Insert keyframes to the left of selection moving the tail of animation to the right
+ Insert keyframes to the left of selection, moving the tail of animation to the right.
100000
0
false
-
+
- Insert N Keyframes Right
+ Insert Keyframe Right
- Insert several keyframes to the right of selection moving the tail of animation to the right
+ Insert keyframes to the right of selection, moving the tail of animation to the right.
100000
0
false
-
+
- Insert N Keyframes Left
+ Insert Multiple Keyframes
- Insert several keyframes to the left of selection moving the tail of animation to the right
+ Insert several keyframes based on user parameters.
100000
0
false
Remove Frame and Pull
Remove keyframes moving the tail of animation to the left
100000
0
false
deletekeyframe
Remove Keyframe
Remove keyframes without moving anything around
100000
0
false
-
-
- Insert Column Right
-
- Insert column to the right of selection moving the tail of animation to the right
-
- 100000
- 0
-
- false
-
-
-
-
+
Insert Column Left
- Insert column to the left of selection moving the tail of animation to the right
+ Insert column to the left of selection, moving the tail of animation to the right
100000
0
false
-
+
- Insert N Columns Right
+ Insert Column Right
- Insert several columns to the right of selection moving the tail of animation to the right
+ Insert column to the right of selection, moving the tail of animation to the right
100000
0
false
-
+
- Insert N Columns Left
+ Insert Multiple Columns
- Insert several columns to the left of selection moving the tail of animation to the right
+ Insert several columns based on user parameters.
100000
0
false
Remove Column and Pull
Remove columns moving the tail of animation to the left
100000
0
false
Remove Column
Remove columns without moving anything around
100000
0
false
Insert Hold Frame
Insert a hold frame after every keyframe
100000
0
false
-
+
- Insert N Hold Frames
+ Insert Multiple Hold Frames
Insert N hold frames after every keyframe
100000
0
false
Remove Hold Frame
Remove a hold frame after every keyframe
100000
0
false
-
+
- Remove N Hold Frames
+ Remove Multiple Hold Frames
Remove N hold frames after every keyframe
100000
0
false
Insert Hold Column
Insert a hold column into the frame at the current position
100000
0
false
-
+
- Insert N Hold Columns
+ Insert Multiple Hold Columns
Insert N hold columns into the frame at the current position
100000
0
false
Remove Hold Column
Remove a hold column from the frame at the current position
100000
0
false
-
+
- Remove N Hold Columns
+ Remove Multiple Hold Columns
Remove N hold columns from the frame at the current position
100000
0
false
Mirror Frames
Mirror frames' position
100000
0
false
Mirror Columns
Mirror columns' position
100000
0
false
Copy to Clipboard
Copy frames to clipboard
100000
0
false
Cut to Clipboard
Cut frames to clipboard
100000
0
false
Paste from Clipboard
Paste frames from clipboard
100000
0
false
Copy Columns to Clipboard
Copy columns to clipboard
100000
0
false
Cut Columns to Clipboard
Cut columns to clipboard
100000
0
false
Paste Columns from Clipboard
Paste columns from clipboard
100000
0
false
Set Start Time
100000
0
false
Set End Time
100000
0
false
Update Playback Range
100000
0
false
Layers
Activate next layer
Activate next layer
Activate next layer
1000
0
PgUp
false
Activate previous layer
Activate previous layer
Activate previous layer
1000
0
PgDown
false
Activate previously selected layer
Activate previously selected layer
Activate previously selected layer
1000
0
;
false
groupLayer
&Group Layer
Group Layer
Group Layer
1000
0
false
cloneLayer
&Clone Layer
Clone Layer
Clone Layer
1000
0
false
vectorLayer
&Vector Layer
Vector Layer
Vector Layer
1000
0
false
filterLayer
&Filter Layer...
Filter Layer
Filter Layer
1000
0
false
fillLayer
&Fill Layer...
Fill Layer
Fill Layer
1000
0
false
fileLayer
&File Layer...
File Layer
File Layer
1000
0
false
transparencyMask
&Transparency Mask
Transparency Mask
Transparency Mask
100000
0
false
filterMask
&Filter Mask...
Filter Mask
Filter Mask
100000
0
false
filterMask
&Colorize Mask
Colorize Mask
Colorize Mask
100000
0
false
transformMask
&Transform Mask...
Transform Mask
Transform Mask
100000
0
false
selectionMask
&Local Selection
Local Selection
Local Selection
100000
0
false
view-filter
&Isolate Layer
Isolate Layer
Isolate Layer
1000
0
true
layer-locked
&Toggle layer lock
Toggle layer lock
Toggle layer lock
1000
0
false
visible
Toggle layer &visibility
Toggle layer visibility
Toggle layer visibility
1000
0
false
transparency-locked
Toggle layer &alpha
Toggle layer alpha
Toggle layer alpha
1000
0
false
transparency-enabled
Toggle layer alpha &inheritance
Toggle layer alpha inheritance
Toggle layer alpha inheritance
1000
0
false
paintLayer
&Paint Layer
Paint Layer
Paint Layer
1000
0
Insert
false
&New Layer From Visible
New layer from visible
New layer from visible
1000
0
false
duplicatelayer
&Duplicate Layer or Mask
Duplicate Layer or Mask
Duplicate Layer or Mask
1000
0
Ctrl+J
false
&Cut Selection to New Layer
Cut Selection to New Layer
Cut Selection to New Layer
100000000
1
Ctrl+Shift+J
false
Copy &Selection to New Layer
Copy Selection to New Layer
Copy Selection to New Layer
100000000
0
Ctrl+Alt+J
false
Copy Layer
Copy layer to clipboard
Copy layer to clipboard
1000
0
false
Cut Layer
Cut layer to clipboard
Cut layer to clipboard
1000
0
false
Paste Layer
Paste layer from clipboard
Paste layer from clipboard
1000
0
false
Quick Group
Create a group layer containing selected layers
Quick Group
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/plugins/dockers/animation/kis_time_based_item_model.cpp b/plugins/dockers/animation/kis_time_based_item_model.cpp
index 46aad05124..994a064e64 100644
--- a/plugins/dockers/animation/kis_time_based_item_model.cpp
+++ b/plugins/dockers/animation/kis_time_based_item_model.cpp
@@ -1,511 +1,511 @@
/*
* Copyright (c) 2016 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 "kis_time_based_item_model.h"
#include
#include
#include "kis_animation_frame_cache.h"
#include "kis_animation_player.h"
#include "kis_signal_compressor_with_param.h"
#include "kis_image.h"
#include "kis_image_animation_interface.h"
#include "kis_time_range.h"
#include "kis_animation_utils.h"
#include "kis_keyframe_channel.h"
#include "kis_processing_applicator.h"
#include "KisImageBarrierLockerWithFeedback.h"
#include "commands_new/kis_switch_current_time_command.h"
#include "kis_command_utils.h"
struct KisTimeBasedItemModel::Private
{
Private()
: animationPlayer(0)
, numFramesOverride(0)
, activeFrameIndex(0)
, scrubInProgress(false)
, scrubStartFrame(-1)
{}
KisImageWSP image;
KisAnimationFrameCacheWSP framesCache;
QPointer animationPlayer;
QVector cachedFrames;
int numFramesOverride;
int activeFrameIndex;
bool scrubInProgress;
int scrubStartFrame;
QScopedPointer > scrubbingCompressor;
int baseNumFrames() const {
auto imageSP = image.toStrongRef();
if (!imageSP) return 0;
KisImageAnimationInterface *i = imageSP->animationInterface();
if (!i) return 1;
return i->totalLength();
}
int effectiveNumFrames() const {
if (image.isNull()) return 0;
return qMax(baseNumFrames(), numFramesOverride);
}
int framesPerSecond() {
return image->animationInterface()->framerate();
}
};
KisTimeBasedItemModel::KisTimeBasedItemModel(QObject *parent)
: QAbstractTableModel(parent)
, m_d(new Private())
{
KisConfig cfg;
using namespace std::placeholders;
std::function callback(
std::bind(&KisTimeBasedItemModel::slotInternalScrubPreviewRequested, this, _1));
m_d->scrubbingCompressor.reset(
new KisSignalCompressorWithParam(cfg.scrubbingUpdatesDelay(), callback, KisSignalCompressor::FIRST_ACTIVE));
}
KisTimeBasedItemModel::~KisTimeBasedItemModel()
{}
void KisTimeBasedItemModel::setImage(KisImageWSP image)
{
KisImageWSP oldImage = m_d->image;
m_d->image = image;
if (image) {
KisImageAnimationInterface *ai = image->animationInterface();
slotCurrentTimeChanged(ai->currentUITime());
connect(ai, SIGNAL(sigFramerateChanged()), SLOT(slotFramerateChanged()));
connect(ai, SIGNAL(sigUiTimeChanged(int)), SLOT(slotCurrentTimeChanged(int)));
}
if (image != oldImage) {
beginResetModel();
endResetModel();
}
}
void KisTimeBasedItemModel::setFrameCache(KisAnimationFrameCacheSP cache)
{
if (KisAnimationFrameCacheSP(m_d->framesCache) == cache) return;
if (m_d->framesCache) {
m_d->framesCache->disconnect(this);
}
m_d->framesCache = cache;
if (m_d->framesCache) {
connect(m_d->framesCache, SIGNAL(changed()), SLOT(slotCacheChanged()));
}
}
void KisTimeBasedItemModel::setAnimationPlayer(KisAnimationPlayer *player)
{
if (m_d->animationPlayer == player) return;
if (m_d->animationPlayer) {
m_d->animationPlayer->disconnect(this);
}
m_d->animationPlayer = player;
if (m_d->animationPlayer) {
connect(m_d->animationPlayer, SIGNAL(sigPlaybackStopped()), SLOT(slotPlaybackStopped()));
connect(m_d->animationPlayer, SIGNAL(sigFrameChanged()), SLOT(slotPlaybackFrameChanged()));
}
}
void KisTimeBasedItemModel::setLastVisibleFrame(int time)
{
const int growThreshold = m_d->effectiveNumFrames() - 3;
const int growValue = time + 8;
const int shrinkThreshold = m_d->effectiveNumFrames() - 12;
const int shrinkValue = qMax(m_d->baseNumFrames(), qMin(growValue, shrinkThreshold));
const bool canShrink = m_d->effectiveNumFrames() > m_d->baseNumFrames();
if (time >= growThreshold) {
beginInsertColumns(QModelIndex(), m_d->effectiveNumFrames(), growValue - 1);
m_d->numFramesOverride = growValue;
endInsertColumns();
} else if (time < shrinkThreshold && canShrink) {
beginRemoveColumns(QModelIndex(), shrinkValue, m_d->effectiveNumFrames() - 1);
m_d->numFramesOverride = shrinkValue;
endRemoveColumns();
}
}
int KisTimeBasedItemModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return m_d->effectiveNumFrames();
}
QVariant KisTimeBasedItemModel::data(const QModelIndex &index, int role) const
{
switch (role) {
case ActiveFrameRole: {
return index.column() == m_d->activeFrameIndex;
}
}
return QVariant();
}
bool KisTimeBasedItemModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid()) return false;
switch (role) {
case ActiveFrameRole: {
setHeaderData(index.column(), Qt::Horizontal, value, role);
break;
}
}
return false;
}
QVariant KisTimeBasedItemModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (orientation == Qt::Horizontal) {
switch (role) {
case ActiveFrameRole:
return section == m_d->activeFrameIndex;
case FrameCachedRole:
return m_d->cachedFrames.size() > section ? m_d->cachedFrames[section] : false;
case FramesPerSecondRole:
return m_d->framesPerSecond();
}
}
return QVariant();
}
bool KisTimeBasedItemModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role)
{
if (orientation == Qt::Horizontal) {
switch (role) {
case ActiveFrameRole:
if (value.toBool() &&
section != m_d->activeFrameIndex) {
int prevFrame = m_d->activeFrameIndex;
m_d->activeFrameIndex = section;
scrubTo(m_d->activeFrameIndex, m_d->scrubInProgress);
/**
* Optimization Hack Alert:
*
* ideally, we should emit all four signals, but... The
* point is this code is used in a tight loop during
* playback, so it should run as fast as possible. To tell
* the story short, commenting out these three lines makes
* playback run 15% faster ;)
*/
if (m_d->scrubInProgress) {
//emit dataChanged(this->index(0, prevFrame), this->index(rowCount() - 1, prevFrame));
emit dataChanged(this->index(0, m_d->activeFrameIndex), this->index(rowCount() - 1, m_d->activeFrameIndex));
//emit headerDataChanged (Qt::Horizontal, prevFrame, prevFrame);
//emit headerDataChanged (Qt::Horizontal, m_d->activeFrameIndex, m_d->activeFrameIndex);
} else {
emit dataChanged(this->index(0, prevFrame), this->index(rowCount() - 1, prevFrame));
emit dataChanged(this->index(0, m_d->activeFrameIndex), this->index(rowCount() - 1, m_d->activeFrameIndex));
emit headerDataChanged (Qt::Horizontal, prevFrame, prevFrame);
emit headerDataChanged (Qt::Horizontal, m_d->activeFrameIndex, m_d->activeFrameIndex);
}
}
}
}
return false;
}
bool KisTimeBasedItemModel::removeFrames(const QModelIndexList &indexes)
{
KisAnimationUtils::FrameItemList frameItems;
{
KisImageBarrierLockerWithFeedback locker(m_d->image);
Q_FOREACH (const QModelIndex &index, indexes) {
int time = index.column();
Q_FOREACH(KisKeyframeChannel *channel, channelsAt(index)) {
if (channel->keyframeAt(time)) {
frameItems << KisAnimationUtils::FrameItem(channel->node(), channel->id(), index.column());
}
}
}
}
if (frameItems.isEmpty()) return false;
KisAnimationUtils::removeKeyframes(m_d->image, frameItems);
return true;
}
KUndo2Command* KisTimeBasedItemModel::createOffsetFramesCommand(QModelIndexList srcIndexes, const QPoint &offset, bool copyFrames, KUndo2Command *parentCommand, bool moveEmptyFrames)
{
if (srcIndexes.isEmpty()) return 0;
if (offset.isNull()) return 0;
KisAnimationUtils::sortPointsForSafeMove(&srcIndexes, offset);
KisAnimationUtils::FrameItemList srcFrameItems;
KisAnimationUtils::FrameItemList dstFrameItems;
Q_FOREACH (const QModelIndex &srcIndex, srcIndexes) {
QModelIndex dstIndex = index(
srcIndex.row() + offset.y(),
srcIndex.column() + offset.x());
KisNodeSP srcNode = nodeAt(srcIndex);
KisNodeSP dstNode = nodeAt(dstIndex);
if (!srcNode || !dstNode) {
return 0;
}
Q_FOREACH(KisKeyframeChannel *channel, channelsAt(srcIndex)) {
- if (moveEmptyFrames || channel->keyframeAt(srcIndex.column())) {
+ if (moveEmptyFrames || channel->keyframeAt(srcIndex.column())) {
srcFrameItems << KisAnimationUtils::FrameItem(srcNode, channel->id(), srcIndex.column());
dstFrameItems << KisAnimationUtils::FrameItem(dstNode, channel->id(), dstIndex.column());
}
}
}
KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(srcFrameItems.size() == dstFrameItems.size(), 0);
if (srcFrameItems.isEmpty()) return 0;
return
KisAnimationUtils::createMoveKeyframesCommand(srcFrameItems,
dstFrameItems,
copyFrames,
parentCommand);
}
bool KisTimeBasedItemModel::removeFramesAndOffset(QModelIndexList indexes)
{
if (indexes.isEmpty()) return true;
std::sort(indexes.begin(), indexes.end(),
[] (const QModelIndex &lhs, const QModelIndex &rhs) {
return lhs.column() > rhs.column();
});
const int minColumn = indexes.last().column();
KUndo2Command *parentCommand = new KUndo2Command(kundo2_i18np("Remove frame and shift", "Remove %1 frames and shift", indexes.size()));
{
KisImageBarrierLockerWithFeedback locker(m_d->image);
Q_FOREACH (const QModelIndex &index, indexes) {
QModelIndexList movedIndexes;
for (int column = index.column() + 1; column < columnCount(); column++) {
movedIndexes << this->index(index.row(), column);
}
createOffsetFramesCommand(movedIndexes, QPoint(-1, 0), false, parentCommand, true);
}
const int oldTime = m_d->image->animationInterface()->currentUITime();
const int newTime = minColumn;
new KisSwitchCurrentTimeCommand(m_d->image->animationInterface(),
oldTime,
- newTime, parentCommand);
-
+ newTime,
+ parentCommand);
}
KisProcessingApplicator::runSingleCommandStroke(m_d->image, parentCommand, KisStrokeJobData::BARRIER);
return true;
}
bool KisTimeBasedItemModel::mirrorFrames(QModelIndexList indexes)
{
QScopedPointer parentCommand(new KUndo2Command(kundo2_i18n("Mirror Frames")));
{
KisImageBarrierLockerWithFeedback locker(m_d->image);
QMap rowsList;
Q_FOREACH (const QModelIndex &index, indexes) {
rowsList[index.row()].append(index);
}
Q_FOREACH (int row, rowsList.keys()) {
QModelIndexList &list = rowsList[row];
KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(!list.isEmpty(), false);
std::sort(list.begin(), list.end(),
[] (const QModelIndex &lhs, const QModelIndex &rhs) {
return lhs.column() < rhs.column();
});
auto srcIt = list.begin();
auto dstIt = list.end();
KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(srcIt != dstIt, false);
--dstIt;
QList channels = channelsAt(*srcIt).values();
while (srcIt < dstIt) {
Q_FOREACH (KisKeyframeChannel *channel, channels) {
channel->swapFrames(srcIt->column(), dstIt->column(), parentCommand.data());
}
srcIt++;
dstIt--;
}
}
}
KisProcessingApplicator::runSingleCommandStroke(m_d->image,
new KisCommandUtils::SkipFirstRedoWrapper(parentCommand.take()),
KisStrokeJobData::BARRIER);
return true;
}
void KisTimeBasedItemModel::slotInternalScrubPreviewRequested(int time)
{
if (m_d->animationPlayer && !m_d->animationPlayer->isPlaying()) {
m_d->animationPlayer->displayFrame(time);
}
}
void KisTimeBasedItemModel::setScrubState(bool active)
{
if (!m_d->scrubInProgress && active) {
m_d->scrubStartFrame = m_d->activeFrameIndex;
m_d->scrubInProgress = true;
}
if (m_d->scrubInProgress && !active) {
m_d->scrubInProgress = false;
if (m_d->scrubStartFrame >= 0 &&
m_d->scrubStartFrame != m_d->activeFrameIndex) {
scrubTo(m_d->activeFrameIndex, false);
}
m_d->scrubStartFrame = -1;
}
}
void KisTimeBasedItemModel::scrubTo(int time, bool preview)
{
if (m_d->animationPlayer && m_d->animationPlayer->isPlaying()) return;
KIS_ASSERT_RECOVER_RETURN(m_d->image);
if (preview) {
if (m_d->animationPlayer) {
m_d->scrubbingCompressor->start(time);
}
} else {
m_d->image->animationInterface()->requestTimeSwitchWithUndo(time);
}
}
void KisTimeBasedItemModel::slotFramerateChanged()
{
emit headerDataChanged(Qt::Horizontal, 0, columnCount() - 1);
}
void KisTimeBasedItemModel::slotCurrentTimeChanged(int time)
{
if (time != m_d->activeFrameIndex) {
setHeaderData(time, Qt::Horizontal, true, ActiveFrameRole);
}
}
void KisTimeBasedItemModel::slotCacheChanged()
{
const int numFrames = columnCount();
m_d->cachedFrames.resize(numFrames);
for (int i = 0; i < numFrames; i++) {
m_d->cachedFrames[i] =
m_d->framesCache->frameStatus(i) == KisAnimationFrameCache::Cached;
}
emit headerDataChanged(Qt::Horizontal, 0, numFrames);
}
void KisTimeBasedItemModel::slotPlaybackFrameChanged()
{
if (!m_d->animationPlayer->isPlaying()) return;
setData(index(0, m_d->animationPlayer->currentTime()), true, ActiveFrameRole);
}
void KisTimeBasedItemModel::slotPlaybackStopped()
{
setData(index(0, m_d->image->animationInterface()->currentUITime()), true, ActiveFrameRole);
}
void KisTimeBasedItemModel::setPlaybackRange(const KisTimeRange &range)
{
if (m_d->image.isNull()) return;
KisImageAnimationInterface *i = m_d->image->animationInterface();
i->setPlaybackRange(range);
}
bool KisTimeBasedItemModel::isPlaybackActive() const
{
return m_d->animationPlayer && m_d->animationPlayer->isPlaying();
}
int KisTimeBasedItemModel::currentTime() const
{
return m_d->image->animationInterface()->currentUITime();
}
KisImageWSP KisTimeBasedItemModel::image() const
{
return m_d->image;
}
diff --git a/plugins/dockers/animation/timeline_frames_model.h b/plugins/dockers/animation/timeline_frames_model.h
index ab88a76e10..020135fd22 100644
--- a/plugins/dockers/animation/timeline_frames_model.h
+++ b/plugins/dockers/animation/timeline_frames_model.h
@@ -1,152 +1,153 @@
/*
* 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_MODEL_H
#define __TIMELINE_FRAMES_MODEL_H
+
#include
#include
#include "kritaanimationdocker_export.h"
#include "kis_node_model.h"
#include "kis_types.h"
#include "kis_node.h"
#include "timeline_node_list_keeper.h"
class KisNodeDummy;
class KisDummiesFacadeBase;
class KisAnimationPlayer;
class KRITAANIMATIONDOCKER_EXPORT TimelineFramesModel : public TimelineNodeListKeeper::ModelWithExternalNotifications
{
Q_OBJECT
public:
enum MimeCopyPolicy {
UndefinedPolicy = 0,
MoveFramesPolicy,
CopyFramesPolicy
};
public:
TimelineFramesModel(QObject *parent);
~TimelineFramesModel() override;
bool hasConnectionToCanvas() const;
void setDummiesFacade(KisDummiesFacadeBase *dummiesFacade, KisImageSP image);
bool canDropFrameData(const QMimeData *data, const QModelIndex &index);
bool insertOtherLayer(int index, int dstRow);
int activeLayerRow() const;
bool createFrame(const QModelIndex &dstIndex);
bool copyFrame(const QModelIndex &dstIndex);
bool insertFrames(int dstColumn, const QList &dstRows, int count, int timing = 1);
bool insertHoldFrames(QModelIndexList selectedIndexes, int count);
QString audioChannelFileName() const;
void setAudioChannelFileName(const QString &fileName);
bool isAudioMuted() const;
void setAudioMuted(bool value);
qreal audioVolume() const;
void setAudioVolume(qreal value);
void setFullClipRangeStart(int column);
void setFullClipRangeEnd(int column);
void setLastClickedIndex(const QModelIndex &index);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role) override;
Qt::DropActions supportedDragActions() const override;
Qt::DropActions supportedDropActions() const override;
QStringList mimeTypes() const override;
- QMimeData * mimeData(const QModelIndexList &indexes) const override;
- QMimeData * mimeDataExtended(const QModelIndexList &indexes, const QModelIndex &baseIndex, MimeCopyPolicy copyPolicy) const;
- bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent) override;
+ QMimeData *mimeData(const QModelIndexList &indexes) const override;
+ QMimeData *mimeDataExtended(const QModelIndexList &indexes, const QModelIndex &baseIndex, MimeCopyPolicy copyPolicy) const;
+ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
bool dropMimeDataExtended(const QMimeData *data, Qt::DropAction action, const QModelIndex &parent, bool *dataMoved = 0);
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool insertRows(int row, int count, const QModelIndex &parent) override;
bool removeRows(int row, int count, const QModelIndex &parent) override;
enum ItemDataRole
{
ActiveLayerRole = KisTimeBasedItemModel::UserRole,
TimelinePropertiesRole,
OtherLayersRole,
LayerUsedInTimelineRole,
FrameColorLabelIndexRole
};
// metatype is added by the original implementation
typedef KisBaseNode::Property Property;
typedef KisBaseNode::PropertyList PropertyList;
typedef TimelineNodeListKeeper::OtherLayer OtherLayer;
typedef TimelineNodeListKeeper::OtherLayersList OtherLayersList;
struct NodeManipulationInterface {
virtual ~NodeManipulationInterface() {}
virtual KisLayerSP addPaintLayer() const = 0;
virtual void removeNode(KisNodeSP node) const = 0;
};
/**
* NOTE: the model has an ownership over the interface, that is it'll
* be deleted automatically later
*/
void setNodeManipulationInterface(NodeManipulationInterface *iface);
protected:
KisNodeSP nodeAt(QModelIndex index) const override;
QMap channelsAt(QModelIndex index) const override;
private Q_SLOTS:
void slotDummyChanged(KisNodeDummy *dummy);
void slotImageContentChanged();
void processUpdateQueue();
public Q_SLOTS:
void slotCurrentNodeChanged(KisNodeSP node);
Q_SIGNALS:
void requestCurrentNodeChanged(KisNodeSP node);
void sigInfiniteTimelineUpdateNeeded();
void sigAudioChannelChanged();
void sigEnsureRowVisible(int row);
private:
struct Private;
const QScopedPointer m_d;
};
#endif /* __TIMELINE_FRAMES_MODEL_H */
diff --git a/plugins/dockers/animation/timeline_frames_view.cpp b/plugins/dockers/animation/timeline_frames_view.cpp
index 688382a986..0d128a1540 100644
--- a/plugins/dockers/animation/timeline_frames_view.cpp
+++ b/plugins/dockers/animation/timeline_frames_view.cpp
@@ -1,1725 +1,1550 @@
/*
* 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 "timeline_insert_keyframe_dialog.h"
-
-#include
-#include
+#include "timeline_frames_item_delegate.h"
#include
-
-#include
#include
-#include
#include
-#include
#include
#include
-#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
#include "KSharedConfig"
-#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
-#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;
TimelineInsertKeyframeDialog *insertKeyframeDialog;
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;
+ 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);
- connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsLeft()), SLOT(slotInsertColumnsLeft()));
- connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsRight()), SLOT(slotInsertColumnsRight()));
+ connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnLeft()), SLOT(slotInsertKeyframeColumnLeft()));
+ connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnRight()), SLOT(slotInsertKeyframeColumnRight()));
- connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsLeftCustom()), SLOT(slotInsertColumnsLeftCustom()));
- connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsRightCustom()), SLOT(slotInsertColumnsRightCustom()));
+ connect(m_d->horizontalRuler, SIGNAL(sigInsertMultipleColumns()), SLOT(slotInsertMultipleKeyframeColumns()));
- connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumns()), SLOT(slotRemoveColumns()));
- connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumnsAndShift()), SLOT(slotRemoveColumnsAndShift()));
+ connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumns()), SLOT(slotRemoveSelectedColumns()));
+ connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumnsAndShift()), SLOT(slotRemoveSelectedColumnsAndShift()));
- connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumns()), SLOT(slotInsertHoldColumns()));
- connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumns()), SLOT(slotRemoveHoldColumns()));
+ connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumns()), SLOT(slotInsertHoldFrameColumn()));
+ connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumns()), SLOT(slotRemoveHoldFrameColumn()));
- connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumnsCustom()), SLOT(slotInsertHoldColumnsCustom()));
- connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumnsCustom()), SLOT(slotRemoveHoldColumnsCustom()));
+ connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumnsCustom()), SLOT(slotInsertMultipleHoldFrameColumns()));
+ connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumnsCustom()), SLOT(slotRemoveMultipleHoldFrameColumns()));
connect(m_d->horizontalRuler, SIGNAL(sigMirrorColumns()), SLOT(slotMirrorColumns()));
connect(m_d->horizontalRuler, SIGNAL(sigCopyColumns()), SLOT(slotCopyColumns()));
connect(m_d->horizontalRuler, SIGNAL(sigCutColumns()), SLOT(slotCutColumns()));
connect(m_d->horizontalRuler, SIGNAL(sigPasteColumns()), SLOT(slotPasteColumns()));
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->setIconSize(QSize(20, 20));
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->setIconSize(QSize(20, 20)); // very small on windows if not explicity set
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->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->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);
/********** Insert Keyframes Dialog **************************************************/
m_d->insertKeyframeDialog = new TimelineInsertKeyframeDialog(this);
/********** Zoom Button **************************************************************/
m_d->zoomDragButton = new KisZoomButton(this);
m_d->zoomDragButton->setAutoRaise(true);
m_d->zoomDragButton->setIcon(KisIconUtils::loadIcon("zoom-horizontal"));
m_d->zoomDragButton->setIconSize(QSize(20, 20)); // this icon is very small on windows if no explicity set
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()));
connect(&m_d->selectionChangedCompressor, SIGNAL(timeout()),
SLOT(slotUpdateFrameActions()));
{
QClipboard *cb = QApplication::clipboard();
connect(cb, SIGNAL(dataChanged()), SLOT(slotUpdateFrameActions()));
}
}
TimelineFramesView::~TimelineFramesView()
{
}
-void TimelineFramesView::setShowInTimeline(KisAction* action)
+void TimelineFramesView::setShowInTimeline(KisAction *action)
{
m_d->showHideLayerAction = action;
m_d->layerEditingMenu->addAction(m_d->showHideLayerAction);
}
-void TimelineFramesView::setActionManager( KisActionManager * actionManager)
+void TimelineFramesView::setActionManager(KisActionManager *actionManager)
{
m_d->actionMan = actionManager;
m_d->horizontalRuler->setActionManager(actionManager);
if (actionManager) {
KisAction *action = 0;
action = m_d->actionMan->createAction("add_blank_frame");
- connect(action, SIGNAL(triggered()), SLOT(slotNewFrame()));
+ connect(action, SIGNAL(triggered()), SLOT(slotAddBlankFrame()));
action = m_d->actionMan->createAction("add_duplicate_frame");
- connect(action, SIGNAL(triggered()), SLOT(slotCopyFrame()));
-
- action = m_d->actionMan->createAction("insert_keyframes_right");
- connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesRight()));
+ connect(action, SIGNAL(triggered()), SLOT(slotAddDuplicateFrame()));
- action = m_d->actionMan->createAction("insert_n_keyframes_right");
- connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesRightCustom()));
+ action = m_d->actionMan->createAction("insert_keyframe_left");
+ connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframeLeft()));
- action = m_d->actionMan->createAction("insert_keyframes_left");
- connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesLeft()));
+ action = m_d->actionMan->createAction("insert_keyframe_right");
+ connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframeRight()));
- action = m_d->actionMan->createAction("insert_n_keyframes_left");
- connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesLeftCustom()));
+ action = m_d->actionMan->createAction("insert_multiple_keyframes");
+ connect(action, SIGNAL(triggered()), SLOT(slotInsertMultipleKeyframes()));
action = m_d->actionMan->createAction("remove_frames_and_pull");
- connect(action, SIGNAL(triggered()), SLOT(slotRemoveFramesAndShift()));
+ connect(action, SIGNAL(triggered()), SLOT(slotRemoveSelectedFramesAndShift()));
action = m_d->actionMan->createAction("remove_frames");
- connect(action, SIGNAL(triggered()), SLOT(slotRemoveFrame()));
+ connect(action, SIGNAL(triggered()), SLOT(slotRemoveSelectedFrames()));
action = m_d->actionMan->createAction("insert_hold_frame");
- connect(action, SIGNAL(triggered()), SLOT(slotInsertHoldFrames()));
+ connect(action, SIGNAL(triggered()), SLOT(slotInsertHoldFrame()));
- action = m_d->actionMan->createAction("insert_n_hold_frames");
- connect(action, SIGNAL(triggered()), SLOT(slotInsertHoldFramesCustom()));
+ action = m_d->actionMan->createAction("insert_multiple_hold_frames");
+ connect(action, SIGNAL(triggered()), SLOT(slotInsertMultipleHoldFrames()));
action = m_d->actionMan->createAction("remove_hold_frame");
- connect(action, SIGNAL(triggered()), SLOT(slotRemoveHoldFrames()));
+ connect(action, SIGNAL(triggered()), SLOT(slotRemoveHoldFrame()));
- action = m_d->actionMan->createAction("remove_n_hold_frames");
- connect(action, SIGNAL(triggered()), SLOT(slotRemoveHoldFramesCustom()));
+ action = m_d->actionMan->createAction("remove_multiple_hold_frames");
+ connect(action, SIGNAL(triggered()), SLOT(slotRemoveMultipleHoldFrames()));
action = m_d->actionMan->createAction("mirror_frames");
connect(action, SIGNAL(triggered()), SLOT(slotMirrorFrames()));
action = m_d->actionMan->createAction("copy_frames_to_clipboard");
connect(action, SIGNAL(triggered()), SLOT(slotCopyFrames()));
action = m_d->actionMan->createAction("cut_frames_to_clipboard");
connect(action, SIGNAL(triggered()), SLOT(slotCutFrames()));
action = m_d->actionMan->createAction("paste_frames_from_clipboard");
connect(action, SIGNAL(triggered()), SLOT(slotPasteFrames()));
action = m_d->actionMan->createAction("set_start_time");
connect(action, SIGNAL(triggered()), SLOT(slotSetStartTimeToCurrentPosition()));
action = m_d->actionMan->createAction("set_end_time");
connect(action, SIGNAL(triggered()), SLOT(slotSetEndTimeToCurrentPosition()));
action = m_d->actionMan->createAction("update_playback_range");
connect(action, SIGNAL(triggered()), SLOT(slotUpdatePlackbackRange()));
}
}
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;
selectionModel()->setCurrentIndex(m_d->model->index(row, selectedColumn), QItemSelectionModel::ClearAndSelect);
}
}
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::createFrameEditingMenuActions(QMenu *menu, bool addFrameCreationActions)
{
slotUpdateFrameActions();
// calculate if selection range is set. This will determine if the update playback range is available
QSet rows;
int minColumn = 0;
int maxColumn = 0;
calculateSelectionMetrics(minColumn, maxColumn, rows);
bool selectionExists = minColumn != maxColumn;
if (selectionExists) {
- KisActionManager::safePopulateMenu(menu, "update_playback_range", m_d->actionMan);
+ KisActionManager::safePopulateMenu(menu, "update_playback_range", m_d->actionMan);
} else {
KisActionManager::safePopulateMenu(menu, "set_start_time", m_d->actionMan);
KisActionManager::safePopulateMenu(menu, "set_end_time", m_d->actionMan);
}
- menu->addSeparator();
+ menu->addSeparator();
KisActionManager::safePopulateMenu(menu, "cut_frames_to_clipboard", m_d->actionMan);
KisActionManager::safePopulateMenu(menu, "copy_frames_to_clipboard", m_d->actionMan);
KisActionManager::safePopulateMenu(menu, "paste_frames_from_clipboard", m_d->actionMan);
menu->addSeparator();
- QMenu *frames = menu->addMenu(i18nc("@item:inmenu", "Keyframes"));
- KisActionManager::safePopulateMenu(frames, "insert_keyframes_right", m_d->actionMan);
- KisActionManager::safePopulateMenu(frames, "insert_keyframes_left", m_d->actionMan);
- frames->addSeparator();
- KisActionManager::safePopulateMenu(frames, "insert_n_keyframes_right", m_d->actionMan);
- KisActionManager::safePopulateMenu(frames, "insert_n_keyframes_left", m_d->actionMan);
-
- QMenu *hold = menu->addMenu(i18nc("@item:inmenu", "Hold Frames"));
- KisActionManager::safePopulateMenu(hold, "insert_hold_frame", m_d->actionMan);
- KisActionManager::safePopulateMenu(hold, "remove_hold_frame", m_d->actionMan);
+ { //Frames submenu.
+ QMenu *frames = menu->addMenu(i18nc("@item:inmenu", "Keyframes"));
+ KisActionManager::safePopulateMenu(frames, "insert_keyframe_left", m_d->actionMan);
+ KisActionManager::safePopulateMenu(frames, "insert_keyframe_right", m_d->actionMan);
+ frames->addSeparator();
+ KisActionManager::safePopulateMenu(frames, "insert_multiple_keyframes", m_d->actionMan);
+ }
- hold->addSeparator();
- KisActionManager::safePopulateMenu(hold, "insert_n_hold_frames", m_d->actionMan);
- KisActionManager::safePopulateMenu(hold, "remove_n_hold_frames", m_d->actionMan);
+ { //Holds submenu.
+ QMenu *hold = menu->addMenu(i18nc("@item:inmenu", "Hold Frames"));
+ KisActionManager::safePopulateMenu(hold, "insert_hold_frame", m_d->actionMan);
+ KisActionManager::safePopulateMenu(hold, "remove_hold_frame", m_d->actionMan);
+ hold->addSeparator();
+ KisActionManager::safePopulateMenu(hold, "insert_multiple_hold_frames", m_d->actionMan);
+ KisActionManager::safePopulateMenu(hold, "remove_multiple_hold_frames", m_d->actionMan);
+ }
menu->addSeparator();
+
KisActionManager::safePopulateMenu(menu, "remove_frames", m_d->actionMan);
KisActionManager::safePopulateMenu(menu, "remove_frames_and_pull", m_d->actionMan);
menu->addSeparator();
+
if (addFrameCreationActions) {
KisActionManager::safePopulateMenu(menu, "add_blank_frame", m_d->actionMan);
KisActionManager::safePopulateMenu(menu, "add_duplicate_frame", m_d->actionMan);
menu->addSeparator();
}
}
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);
}
QMenu menu;
createFrameEditingMenuActions(&menu, false);
menu.addSeparator();
menu.addAction(m_d->colorSelectorAction);
menu.exec(event->globalPos());
} else {
{
KisSignalsBlocker b(m_d->colorSelector);
KisImageConfig cfg;
const int labelIndex = cfg.defaultFrameColorLabel();
m_d->colorSelector->setCurrentIndex(labelIndex);
}
QMenu menu;
createFrameEditingMenuActions(&menu, true);
menu.addSeparator();
menu.addAction(m_d->colorSelectorAction);
menu.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) {
KisSignalsBlocker b(m_d->multiframeColorSelector);
m_d->multiframeColorSelector->setCurrentIndex(labelIndex);
}
QMenu menu;
createFrameEditingMenuActions(&menu, false);
menu.addSeparator();
KisActionManager::safePopulateMenu(&menu, "mirror_frames", m_d->actionMan);
menu.addSeparator();
menu.addAction(m_d->multiframeColorSelectorAction);
menu.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::slotUpdateFrameActions()
{
if (!m_d->actionMan) return;
const QModelIndexList editableIndexes = calculateSelectionSpan(false, true);
const bool hasEditableFrames = !editableIndexes.isEmpty();
bool hasExistingFrames = false;
Q_FOREACH (const QModelIndex &index, editableIndexes) {
if (model()->data(index, TimelineFramesModel::FrameExistsRole).toBool()) {
hasExistingFrames = true;
break;
}
}
auto enableAction = [this] (const QString &id, bool value) {
KisAction *action = m_d->actionMan->actionByName(id);
KIS_SAFE_ASSERT_RECOVER_RETURN(action);
action->setEnabled(value);
};
enableAction("add_blank_frame", hasEditableFrames);
enableAction("add_duplicate_frame", hasEditableFrames);
- enableAction("insert_keyframes_right", hasEditableFrames);
- enableAction("insert_n_keyframes_right", hasEditableFrames);
-
- enableAction("insert_keyframes_left", hasEditableFrames);
- enableAction("insert_n_keyframes_left", hasEditableFrames);
+ enableAction("insert_keyframe_left", hasEditableFrames);
+ enableAction("insert_keyframe_right", hasEditableFrames);
+ enableAction("insert_multiple_keyframes", hasEditableFrames);
enableAction("remove_frames", hasEditableFrames && hasExistingFrames);
enableAction("remove_frames_and_pull", hasEditableFrames);
enableAction("insert_hold_frame", hasEditableFrames);
- enableAction("insert_n_hold_frames", hasEditableFrames);
+ enableAction("insert_multiple_hold_frames", hasEditableFrames);
enableAction("remove_hold_frame", hasEditableFrames);
- enableAction("remove_n_hold_frames", hasEditableFrames);
+ enableAction("remove_multiple_hold_frames", hasEditableFrames);
enableAction("mirror_frames", hasEditableFrames && editableIndexes.size() > 1);
enableAction("copy_frames_to_clipboard", true);
enableAction("cut_frames_to_clipboard", hasEditableFrames);
QClipboard *cp = QApplication::clipboard();
const QMimeData *data = cp->mimeData();
enableAction("paste_frames_from_clipboard", data && data->hasFormat("application/x-krita-frame"));
//TODO: update column actions!
}
void TimelineFramesView::slotSetStartTimeToCurrentPosition()
{
m_d->model->setFullClipRangeStart(this->currentIndex().column());
}
void TimelineFramesView::slotSetEndTimeToCurrentPosition()
{
m_d->model->setFullClipRangeEnd(this->currentIndex().column());
}
void TimelineFramesView::slotUpdatePlackbackRange()
{
QSet rows;
int minColumn = 0;
int maxColumn = 0;
calculateSelectionMetrics(minColumn, maxColumn, rows);
m_d->model->setFullClipRangeStart(minColumn);
m_d->model->setFullClipRangeEnd(maxColumn);
}
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()
+void TimelineFramesView::slotAddBlankFrame()
{
QModelIndex index = currentIndex();
if (!index.isValid() ||
!m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
return;
}
m_d->model->createFrame(index);
}
-void TimelineFramesView::slotCopyFrame()
+void TimelineFramesView::slotAddDuplicateFrame()
{
QModelIndex index = currentIndex();
if (!index.isValid() ||
!m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
return;
}
m_d->model->copyFrame(index);
}
void TimelineFramesView::calculateSelectionMetrics(int &minColumn, int &maxColumn, QSet &rows) const
{
minColumn = std::numeric_limits::max();
maxColumn = std::numeric_limits::min();
Q_FOREACH (const QModelIndex &index, selectionModel()->selectedIndexes()) {
if (!m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) continue;
rows.insert(index.row());
minColumn = qMin(minColumn, index.column());
maxColumn = qMax(maxColumn, index.column());
}
}
-void TimelineFramesView::insertFramesImpl(int insertAtColumn, int count, int timing, QSet rows, bool forceEntireColumn)
-{
- if (forceEntireColumn) {
- rows.clear();
- for (int i = 0; i < m_d->model->rowCount(); i++) {
- if (!m_d->model->data(m_d->model->index(i, insertAtColumn), TimelineFramesModel::FrameEditableRole).toBool()) continue;
- rows.insert(i);
- }
- }
-
- if (!rows.isEmpty()) {
- m_d->model->insertFrames(insertAtColumn, rows.toList(), count, timing);
- }
-}
-
-void TimelineFramesView::slotInsertKeyframesLeft(int count, int timing, bool forceEntireColumn)
-{
- QSet rows;
- int minColumn = 0;
- int maxColumn = 0;
-
- calculateSelectionMetrics(minColumn, maxColumn, rows);
-
- if (count <= 0) {
- count = qMax(1, maxColumn - minColumn + 1);
- }
-
- insertFramesImpl(minColumn, count, timing, rows, forceEntireColumn);
-}
-
-void TimelineFramesView::slotInsertKeyframesRight(int count, int timing, bool forceEntireColumn)
+void TimelineFramesView::insertKeyframes(int count, int timing, TimelineDirection direction, bool entireColumn)
{
QSet rows;
- int minColumn = 0;
- int maxColumn = 0;
+ int minColumn = 0, maxColumn = 0;
calculateSelectionMetrics(minColumn, maxColumn, rows);
- if (count <= 0) {
+ if (count <= 0) { //Negative count? Use number of selected frames.
count = qMax(1, maxColumn - minColumn + 1);
}
- insertFramesImpl(maxColumn + 1, count, timing, rows, forceEntireColumn);
-}
-
-void TimelineFramesView::slotInsertColumnsLeft(int count, int timing)
-{
- slotInsertKeyframesLeft(count, timing, true);
-}
-
-void TimelineFramesView::slotInsertColumnsRight(int count, int timing)
-{
- slotInsertKeyframesRight(count, timing, true);
-}
-
-void TimelineFramesView::slotInsertKeyframesLeftCustom()
-{
- int count, timing;
+ const int insertionColumn =
+ direction == TimelineDirection::RIGHT ?
+ maxColumn + 1 : minColumn;
- if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
- slotInsertKeyframesLeft(count, timing, false);
- }
-}
-
-void TimelineFramesView::slotInsertKeyframesRightCustom()
-{
- int count, timing;
-
- if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
- slotInsertKeyframesRight(count, timing, false);
+ if (entireColumn) {
+ rows.clear();
+ for (int i = 0; i < m_d->model->rowCount(); i++) {
+ if (!m_d->model->data(m_d->model->index(i, insertionColumn), TimelineFramesModel::FrameEditableRole).toBool()) continue;
+ rows.insert(i);
+ }
}
-}
-
-void TimelineFramesView::slotInsertColumnsLeftCustom()
-{
- int count, timing;
- if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
- slotInsertColumnsLeft(count, timing);
+ if (!rows.isEmpty()) {
+ m_d->model->insertFrames(insertionColumn, rows.toList(), count, timing);
}
}
-void TimelineFramesView::slotInsertColumnsRightCustom()
+void TimelineFramesView::insertMultipleKeyframes(bool entireColumn)
{
int count, timing;
+ TimelineDirection direction;
- if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
- slotInsertColumnsRight(count, timing);
+ if (m_d->insertKeyframeDialog->promptUserSettings(count, timing, direction)) {
+ insertKeyframes(count, timing, direction, entireColumn);
}
}
-QModelIndexList TimelineFramesView::calculateSelectionSpan(bool forceEntireColumn, bool editableOnly) const
+QModelIndexList TimelineFramesView::calculateSelectionSpan(bool entireColumn, bool editableOnly) const
{
QModelIndexList indexes;
- if (forceEntireColumn) {
+ if (entireColumn) {
QSet rows;
int minColumn = 0;
int maxColumn = 0;
calculateSelectionMetrics(minColumn, maxColumn, rows);
rows.clear();
for (int i = 0; i < m_d->model->rowCount(); i++) {
if (editableOnly &&
!m_d->model->data(m_d->model->index(i, minColumn), TimelineFramesModel::FrameEditableRole).toBool()) continue;
for (int column = minColumn; column <= maxColumn; column++) {
indexes << m_d->model->index(i, column);
}
}
} else {
Q_FOREACH (const QModelIndex &index, selectionModel()->selectedIndexes()) {
if (!editableOnly || m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
indexes << index;
}
}
}
return indexes;
}
-void TimelineFramesView::slotRemoveFrame(bool forceEntireColumn, bool needsOffset)
+void TimelineFramesView::slotRemoveSelectedFrames(bool entireColumn, bool needsOffset)
{
- const QModelIndexList indexes = calculateSelectionSpan(forceEntireColumn);
+ const QModelIndexList indexes = calculateSelectionSpan(entireColumn);
if (!indexes.isEmpty()) {
if (needsOffset) {
m_d->model->removeFramesAndOffset(indexes);
} else {
m_d->model->removeFrames(indexes);
}
}
}
-void TimelineFramesView::slotRemoveColumns()
-{
- slotRemoveFrame(true);
-}
-
-void TimelineFramesView::slotRemoveFramesAndShift(bool forceEntireColumn)
-{
- slotRemoveFrame(forceEntireColumn, true);
-}
-
-void TimelineFramesView::slotRemoveColumnsAndShift()
-{
- slotRemoveFramesAndShift(true);
-}
-
-void TimelineFramesView::slotInsertHoldFrames(int count, bool forceEntireColumn)
+void TimelineFramesView::insertOrRemoveHoldFrames(int count, bool entireColumn)
{
QModelIndexList indexes;
- if (!forceEntireColumn) {
+ if (!entireColumn) {
Q_FOREACH (const QModelIndex &index, selectionModel()->selectedIndexes()) {
if (m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
indexes << index;
}
}
} else {
const int column = selectionModel()->currentIndex().column();
for (int i = 0; i < m_d->model->rowCount(); i++) {
const QModelIndex index = m_d->model->index(i, column);
if (m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
indexes << index;
}
}
}
if (!indexes.isEmpty()) {
m_d->model->insertHoldFrames(indexes, count);
}
}
-void TimelineFramesView::slotRemoveHoldFrames(int count, bool forceEntireColumn)
-{
- slotInsertHoldFrames(-count, forceEntireColumn);
-}
-
-void TimelineFramesView::slotInsertHoldFramesCustom()
+void TimelineFramesView::insertOrRemoveMultipleHoldFrames(bool insertion, bool entireColumn)
{
bool ok = false;
const int count = QInputDialog::getInt(this,
- i18nc("@title:window", "Insert hold frames"),
+ i18nc("@title:window", "Insert or Remove Hold Frames"),
i18nc("@label:spinbox", "Enter number of frames"),
defaultNumberOfFramesToAdd(),
1, 10000, 1, &ok);
if (ok) {
- setDefaultNumberOfFramesToAdd(count);
- slotInsertHoldFrames(count);
- }
-}
-
-void TimelineFramesView::slotRemoveHoldFramesCustom()
-{
- bool ok = false;
- const int count = QInputDialog::getInt(this,
- i18nc("@title:window", "Remove hold frames"),
- i18nc("@label:spinbox", "Enter number of frames"),
- defaultNumberOfFramesToRemove(),
- 1, 10000, 1, &ok);
-
- if (ok) {
- setDefaultNumberOfFramesToRemove(count);
- slotRemoveHoldFrames(count);
- }
-}
-
-void TimelineFramesView::slotInsertHoldColumns(int count)
-{
- slotInsertHoldFrames(count, true);
-}
-
-void TimelineFramesView::slotRemoveHoldColumns(int count)
-{
- slotRemoveHoldFrames(count, true);
-}
-
-void TimelineFramesView::slotInsertHoldColumnsCustom()
-{
- bool ok = false;
- const int count = QInputDialog::getInt(this,
- i18nc("@title:window", "Insert hold columns"),
- i18nc("@label:spinbox", "Enter number of columns"),
- defaultNumberOfColumnsToAdd(),
- 1, 10000, 1, &ok);
-
- if (ok) {
- setDefaultNumberOfColumnsToAdd(count);
- slotInsertHoldColumns(count);
- }
-}
-
-void TimelineFramesView::slotRemoveHoldColumnsCustom()
-{
- bool ok = false;
- const int count = QInputDialog::getInt(this,
- i18nc("@title:window", "Remove hold columns"),
- i18nc("@label:spinbox", "Enter number of columns"),
- defaultNumberOfColumnsToRemove(),
- 1, 10000, 1, &ok);
-
- if (ok) {
- setDefaultNumberOfColumnsToRemove(count);
- slotRemoveHoldColumns(count);
+ if (insertion) {
+ setDefaultNumberOfFramesToAdd(count);
+ insertOrRemoveHoldFrames(count, entireColumn);
+ } else {
+ setDefaultNumberOfFramesToRemove(count);
+ insertOrRemoveHoldFrames(-count, entireColumn);
+ }
}
}
-void TimelineFramesView::slotMirrorFrames(bool forceEntireColumn)
+void TimelineFramesView::slotMirrorFrames(bool entireColumn)
{
- const QModelIndexList indexes = calculateSelectionSpan(forceEntireColumn);
+ const QModelIndexList indexes = calculateSelectionSpan(entireColumn);
if (!indexes.isEmpty()) {
m_d->model->mirrorFrames(indexes);
}
}
-void TimelineFramesView::slotMirrorColumns()
+void TimelineFramesView::cutCopyImpl(bool entireColumn, bool copy)
{
- slotMirrorFrames(true);
-}
-
-void TimelineFramesView::cutCopyImpl(bool forceEntireColumn, bool copy)
-{
- const QModelIndexList indexes = calculateSelectionSpan(forceEntireColumn, !copy);
+ const QModelIndexList indexes = calculateSelectionSpan(entireColumn, !copy);
if (indexes.isEmpty()) return;
int minColumn = std::numeric_limits::max();
int minRow = std::numeric_limits::max();
Q_FOREACH (const QModelIndex &index, indexes) {
minRow = qMin(minRow, index.row());
minColumn = qMin(minColumn, index.column());
}
const QModelIndex baseIndex = m_d->model->index(minRow, minColumn);
QMimeData *data = m_d->model->mimeDataExtended(indexes,
baseIndex,
copy ?
TimelineFramesModel::CopyFramesPolicy :
TimelineFramesModel::MoveFramesPolicy);
if (data) {
QClipboard *cb = QApplication::clipboard();
cb->setMimeData(data);
}
}
-void TimelineFramesView::slotCopyFrames(bool forceEntireColumn)
-{
- cutCopyImpl(forceEntireColumn, true);
-}
-
-void TimelineFramesView::slotCutFrames(bool forceEntireColumn)
-{
- cutCopyImpl(forceEntireColumn, false);
-}
-
-void TimelineFramesView::slotPasteFrames(bool forceEntireColumn)
+void TimelineFramesView::slotPasteFrames(bool entireColumn)
{
const QModelIndex currentIndex =
- !forceEntireColumn ? this->currentIndex() : m_d->model->index(0, this->currentIndex().column());
+ !entireColumn ? this->currentIndex() : m_d->model->index(0, this->currentIndex().column());
if (!currentIndex.isValid()) return;
QClipboard *cb = QApplication::clipboard();
const QMimeData *data = cb->mimeData();
if (data && data->hasFormat("application/x-krita-frame")) {
bool dataMoved = false;
bool result = m_d->model->dropMimeDataExtended(data, Qt::MoveAction, currentIndex, &dataMoved);
if (result && dataMoved) {
cb->clear();
}
}
}
-void TimelineFramesView::slotCutColumns()
-{
- slotCutFrames(true);
-}
-
-void TimelineFramesView::slotPasteColumns()
-{
- slotPasteFrames(true);
-}
-
-void TimelineFramesView::slotCopyColumns()
-{
- slotCopyFrames(true);
-}
-
int TimelineFramesView::defaultNumberOfFramesToAdd() const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
return cfg.readEntry("defaultNumberOfFramesToAdd", 1);
}
void TimelineFramesView::setDefaultNumberOfFramesToAdd(int value) const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
cfg.writeEntry("defaultNumberOfFramesToAdd", value);
}
int TimelineFramesView::defaultNumberOfColumnsToAdd() const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
return cfg.readEntry("defaultNumberOfColumnsToAdd", 1);
}
void TimelineFramesView::setDefaultNumberOfColumnsToAdd(int value) const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
cfg.writeEntry("defaultNumberOfColumnsToAdd", value);
}
int TimelineFramesView::defaultNumberOfFramesToRemove() const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
return cfg.readEntry("defaultNumberOfFramesToRemove", 1);
}
void TimelineFramesView::setDefaultNumberOfFramesToRemove(int value) const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
cfg.writeEntry("defaultNumberOfFramesToRemove", value);
}
int TimelineFramesView::defaultNumberOfColumnsToRemove() const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
return cfg.readEntry("defaultNumberOfColumnsToRemove", 1);
}
void TimelineFramesView::setDefaultNumberOfColumnsToRemove(int value) const
{
KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
cfg.writeEntry("defaultNumberOfColumnsToRemove", value);
}
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 c3aa6ef132..9acfe3be03 100644
--- a/plugins/dockers/animation/timeline_frames_view.h
+++ b/plugins/dockers/animation/timeline_frames_view.h
@@ -1,174 +1,198 @@
/*
* 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;
+enum TimelineDirection : short
+{
+ LEFT = -1,
+ BEFORE = -1,
+
+ RIGHT = 1,
+ AFTER = 1
+};
+
+
class KRITAANIMATIONDOCKER_EXPORT TimelineFramesView : public QTableView
{
Q_OBJECT
+
public:
TimelineFramesView(QWidget *parent);
~TimelineFramesView() override;
void setModel(QAbstractItemModel *model) override;
void updateGeometries() override;
void setShowInTimeline(KisAction *action);
- void setActionManager( KisActionManager * actionManager);
+ void setActionManager(KisActionManager *actionManager);
public Q_SLOTS:
void slotSelectionChanged();
void slotUpdateIcons();
private Q_SLOTS:
void slotUpdateLayersMenu();
void slotUpdateFrameActions();
void slotSetStartTimeToCurrentPosition();
void slotSetEndTimeToCurrentPosition();
void slotUpdatePlackbackRange();
// Layer
void slotAddNewLayer();
void slotAddExistingLayer(QAction *action);
void slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
void slotRemoveLayer();
void slotLayerContextMenuRequested(const QPoint &globalPos);
- // New, Copy, Insert and Remove Frames
- void slotNewFrame();
- void slotCopyFrame();
-
- void slotInsertKeyframesLeft(int count = 1, int timing = 1, bool forceEntireColumn = false);
- void slotInsertKeyframesRight(int count = 1, int timing = 1, bool forceEntireColumn = false);
+ // New, Insert and Remove Frames
+ void slotAddBlankFrame();
+ void slotAddDuplicateFrame();
- void slotInsertKeyframesLeftCustom();
- void slotInsertKeyframesRightCustom();
+ void slotInsertKeyframeLeft() {insertKeyframes(-1, 1, TimelineDirection::LEFT, false);}
+ void slotInsertKeyframeRight() {insertKeyframes(-1, 1, TimelineDirection::RIGHT, false);}
- void slotRemoveFrame(bool forceEntireColumn = false, bool needsOffset = false);
- void slotRemoveFramesAndShift(bool forceEntireColumn = false);
+ void slotInsertKeyframeColumnLeft() {insertKeyframes(-1, 1, TimelineDirection::LEFT, true);}
+ void slotInsertKeyframeColumnRight() {insertKeyframes(-1, 1, TimelineDirection::RIGHT, true);}
- void slotInsertColumnsLeft(int count = 1, int timing = 1);
- void slotInsertColumnsLeftCustom();
+ void slotInsertMultipleKeyframes() {insertMultipleKeyframes(false);}
+ void slotInsertMultipleKeyframeColumns() {insertMultipleKeyframes(true);}
- void slotInsertColumnsRight(int count = 1, int timing = 1);
- void slotInsertColumnsRightCustom();
+ void slotRemoveSelectedFrames(bool entireColumn = false, bool needsOffset = false);
+ void slotRemoveSelectedFramesAndShift() {slotRemoveSelectedFrames(false, true);}
- void slotRemoveColumns();
- void slotRemoveColumnsAndShift();
+ void slotRemoveSelectedColumns() {slotRemoveSelectedFrames(true);}
+ void slotRemoveSelectedColumnsAndShift() {slotRemoveSelectedFrames(true, true);}
- void slotInsertHoldFrames(int count = 1, bool forceEntireColumn = false);
- void slotRemoveHoldFrames(int count = 1, bool forceEntireColumn = false);
+ void slotInsertHoldFrame() {insertOrRemoveHoldFrames(1);}
+ void slotRemoveHoldFrame() {insertOrRemoveHoldFrames(-1);}
- void slotInsertHoldFramesCustom();
- void slotRemoveHoldFramesCustom();
+ void slotInsertHoldFrameColumn() {insertOrRemoveHoldFrames(1,true);}
+ void slotRemoveHoldFrameColumn() {insertOrRemoveHoldFrames(-1,true);}
- void slotInsertHoldColumns(int count = 1);
- void slotRemoveHoldColumns(int count = 1);
+ void slotInsertMultipleHoldFrames() {insertOrRemoveMultipleHoldFrames(true);}
+ void slotRemoveMultipleHoldFrames() {insertOrRemoveMultipleHoldFrames(false);}
- void slotInsertHoldColumnsCustom();
- void slotRemoveHoldColumnsCustom();
+ void slotInsertMultipleHoldFrameColumns() {insertOrRemoveMultipleHoldFrames(true, true);}
+ void slotRemoveMultipleHoldFrameColumns() {insertOrRemoveMultipleHoldFrames(false, true);}
- void slotMirrorFrames(bool forceEntireColumn = false);
- void slotMirrorColumns();
+ void slotMirrorFrames(bool entireColumn = false);
+ void slotMirrorColumns() {slotMirrorFrames(true);}
// Copy-paste
- void slotCopyFrames(bool forceEntireColumn = false);
- void slotCutFrames(bool forceEntireColumn = false);
- void slotPasteFrames(bool forceEntireColumn = false);
+ void slotCopyFrames() {cutCopyImpl(false, true);}
+ void slotCutFrames() {cutCopyImpl(false, false);}
+
+ void slotCopyColumns() {cutCopyImpl(true, true);}
+ void slotCutColumns() {cutCopyImpl(true, false);}
- void slotCopyColumns();
- void slotCutColumns();
- void slotPasteColumns();
+ void slotPasteFrames(bool entireColumn = false);
+ void slotPasteColumns() {slotPasteFrames(true);}
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);
// Audio
void slotSelectAudioChannelFile();
void slotAudioChannelMute(bool value);
void slotAudioChannelRemove();
void slotUpdateAudioActions();
void slotAudioVolumeChanged(int value);
private:
void setFramesPerSecond(int fps);
+
void calculateSelectionMetrics(int &minColumn, int &maxColumn, QSet &rows) const;
- void insertFramesImpl(int insertAtColumn, int count, int timing, QSet rows, bool forceEntireColumn);
+ /* Insert new keyframes/columns.
+ *
+ * count - Number of frames to add. If <0, use number of currently SELECTED frames.
+ * timing - Animation timing of frames to be added (on 1s, 2s, 3s, etc.)
+ * direction - Insert frames before (left) or after (right) selection scrubber.
+ * entireColumn - Create frames on all layers (rows) instead of just the active layer?
+ */
+ void insertKeyframes(int count = 1, int timing = 1,
+ TimelineDirection direction = TimelineDirection::LEFT, bool entireColumn = false);
+ void insertMultipleKeyframes(bool entireColumn = false);
+
+ void insertOrRemoveHoldFrames(int count, bool entireColumn = false);
+ void insertOrRemoveMultipleHoldFrames(bool insertion, bool entireColumn = false);
+
+ void cutCopyImpl(bool entireColumn, bool copy);
void createFrameEditingMenuActions(QMenu *menu, bool addFrameCreationActions);
- QModelIndexList calculateSelectionSpan(bool forceEntireColumn, bool editableOnly = true) const;
- void cutCopyImpl(bool forceEntireColumn, bool copy);
+ QModelIndexList calculateSelectionSpan(bool entireColumn, bool editableOnly = true) const;
int defaultNumberOfFramesToAdd() const;
void setDefaultNumberOfFramesToAdd(int value) const;
int defaultNumberOfColumnsToAdd() const;
void setDefaultNumberOfColumnsToAdd(int value) const;
int defaultNumberOfFramesToRemove() const;
void setDefaultNumberOfFramesToRemove(int value) const;
int defaultNumberOfColumnsToRemove() const;
void setDefaultNumberOfColumnsToRemove(int value) const;
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;
+ 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_insert_keyframe_dialog.cpp b/plugins/dockers/animation/timeline_insert_keyframe_dialog.cpp
index a9cd66f4e4..cb66d5b68b 100644
--- a/plugins/dockers/animation/timeline_insert_keyframe_dialog.cpp
+++ b/plugins/dockers/animation/timeline_insert_keyframe_dialog.cpp
@@ -1,45 +1,94 @@
+/*
+ * Copyright (c) 2018 Emmet O'Neill
+ * Copyright (c) 2018 Eoin O'Neill
+ *
+ * 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_insert_keyframe_dialog.h"
+#include "timeline_frames_view.h"
#include
+#include
#include
+#include
#include
#include
#include
#include
TimelineInsertKeyframeDialog::TimelineInsertKeyframeDialog(QWidget *parent) :
QDialog(parent)
{
setWindowTitle(i18nc("@title:window","Insert Keyframes"));
setModal(true);
setLayout(new QVBoxLayout(this));
- frameCountSpinbox.setMinimum(1);
- frameCountSpinbox.setValue(1);
+ { // Count and Spacing Forms.
+ QWidget *forms = new QWidget(this);
+ layout()->addWidget(forms);
+
+ frameCountSpinbox.setMinimum(1);
+ frameCountSpinbox.setValue(1);
+
+ frameTimingSpinbox.setMinimum(1);
+ frameTimingSpinbox.setValue(1);
+
+ QFormLayout *LO = new QFormLayout(this);
+ forms->setLayout(LO);
+
+ LO->addRow(QString(i18nc("@label:spinbox", "Number of frames:")), &frameCountSpinbox);
+ LO->addRow(QString(i18nc("@label:spinbox", "Frame timing:")), &frameTimingSpinbox);
+ }
+
+ { // Side Buttons.
+ QGroupBox *sideRadioButtons = new QGroupBox(i18nc("@label:group","Side:"), this);
+ layout()->addWidget(sideRadioButtons);
- frameTimingSpinbox.setMinimum(1);
- frameTimingSpinbox.setValue(1);
+ leftBefore = new QRadioButton(i18nc("@label:radio", "Left / Before"), sideRadioButtons);
+ rightAfter = new QRadioButton(i18nc("@label:radio", "Right / After"), sideRadioButtons);
+ leftBefore->setChecked(true);
- QWidget *formsWidget = new QWidget();
- QFormLayout *formLayout = new QFormLayout();
- formsWidget->setLayout( formLayout );
- layout()->addWidget(formsWidget);
+ QVBoxLayout *LO = new QVBoxLayout(this);
+ sideRadioButtons->setLayout(LO);
- QDialogButtonBox *buttonbox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
- layout()->addWidget(buttonbox);
+ LO->addWidget(leftBefore);
+ LO->addWidget(rightAfter);
+ }
- formLayout->addRow(QString(i18nc("@label:spinbox", "Number of frames:")), &frameCountSpinbox);
- formLayout->addRow(QString(i18nc("@label:spinbox", "Frame timing:")), &frameTimingSpinbox);
+ { // Cancel / OK Buttons.
+ QDialogButtonBox *buttonbox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+ layout()->addWidget(buttonbox);
- connect(buttonbox, SIGNAL(accepted()), this, SLOT(accept()));
- connect(buttonbox, SIGNAL(rejected()), this, SLOT(reject()));
+ connect(buttonbox, SIGNAL(accepted()), this, SLOT(accept()));
+ connect(buttonbox, SIGNAL(rejected()), this, SLOT(reject()));
+ }
}
-bool TimelineInsertKeyframeDialog::promptUserSettings(int &out_count, int &out_timing){
- if(exec() == QDialog::Accepted){
+bool TimelineInsertKeyframeDialog::promptUserSettings(int &out_count, int &out_timing, TimelineDirection &out_direction)
+{
+ if (exec() == QDialog::Accepted) {
out_count = frameCountSpinbox.value();
out_timing = frameTimingSpinbox.value();
+
+ out_direction = TimelineDirection::LEFT; // Default
+ if (rightAfter && rightAfter->isChecked()) {
+ out_direction = TimelineDirection::RIGHT;
+ }
+
return true;
}
return false;
}
diff --git a/plugins/dockers/animation/timeline_insert_keyframe_dialog.h b/plugins/dockers/animation/timeline_insert_keyframe_dialog.h
index c2ae5ee206..b6392ce54f 100644
--- a/plugins/dockers/animation/timeline_insert_keyframe_dialog.h
+++ b/plugins/dockers/animation/timeline_insert_keyframe_dialog.h
@@ -1,20 +1,45 @@
+/*
+ * Copyright (c) 2018 Emmet O'Neill
+ * Copyright (c) 2018 Eoin O'Neill
+ *
+ * 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_INSERT_KEYFRAME_DIALOG_H
#define __TIMELINE_INSERT_KEYFRAME_DIALOG_H
#include "kritaanimationdocker_export.h"
#include
#include
+#include
+
+enum TimelineDirection : short;
class KRITAANIMATIONDOCKER_EXPORT TimelineInsertKeyframeDialog : QDialog {
Q_OBJECT
private:
QSpinBox frameCountSpinbox;
QSpinBox frameTimingSpinbox;
+ QRadioButton *leftBefore;
+ QRadioButton *rightAfter;
+
public:
TimelineInsertKeyframeDialog(QWidget *parent = 0);
- bool promptUserSettings(int &count, int &timing);
+ bool promptUserSettings(int &count, int &timing, TimelineDirection &out_direction);
};
#endif // __TIMELINE_INSERT_KEYFRAME_DIALOG_H
diff --git a/plugins/dockers/animation/timeline_ruler_header.cpp b/plugins/dockers/animation/timeline_ruler_header.cpp
index a7978bf835..0203debbcd 100644
--- a/plugins/dockers/animation/timeline_ruler_header.cpp
+++ b/plugins/dockers/animation/timeline_ruler_header.cpp
@@ -1,534 +1,531 @@
/*
* 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;
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);
-
-
-
-
}
TimelineRulerHeader::~TimelineRulerHeader()
{
}
-void TimelineRulerHeader::setActionManager( KisActionManager * actionManager)
+void TimelineRulerHeader::setActionManager(KisActionManager *actionManager)
{
m_d->actionMan = actionManager;
if (actionManager) {
KisAction *action;
- action = actionManager->createAction("insert_columns_right");
- connect(action, SIGNAL(triggered()), SIGNAL(sigInsertColumnsRight()));
-
- action = actionManager->createAction("insert_n_columns_right");
- connect(action, SIGNAL(triggered()), SIGNAL(sigInsertColumnsRightCustom()));
+ action = actionManager->createAction("insert_column_left");
+ connect(action, SIGNAL(triggered()), SIGNAL(sigInsertColumnLeft()));
- action = actionManager->createAction("insert_columns_left");
- connect(action, SIGNAL(triggered()), SIGNAL(sigInsertColumnsLeft()));
+ action = actionManager->createAction("insert_column_right");
+ connect(action, SIGNAL(triggered()), SIGNAL(sigInsertColumnRight()));
- action = actionManager->createAction("insert_n_columns_left");
- connect(action, SIGNAL(triggered()), SIGNAL(sigInsertColumnsLeftCustom()));
+ action = actionManager->createAction("insert_multiple_columns");
+ connect(action, SIGNAL(triggered()), SIGNAL(sigInsertMultipleColumns()));
action = actionManager->createAction("remove_columns_and_pull");
connect(action, SIGNAL(triggered()), SIGNAL(sigRemoveColumnsAndShift()));
action = actionManager->createAction("remove_columns");
connect(action, SIGNAL(triggered()), SIGNAL(sigRemoveColumns()));
action = actionManager->createAction("insert_hold_column");
connect(action, SIGNAL(triggered()), SIGNAL(sigInsertHoldColumns()));
- action = actionManager->createAction("insert_n_hold_columns");
+ action = actionManager->createAction("insert_multiple_hold_columns");
connect(action, SIGNAL(triggered()), SIGNAL(sigInsertHoldColumnsCustom()));
action = actionManager->createAction("remove_hold_column");
connect(action, SIGNAL(triggered()), SIGNAL(sigRemoveHoldColumns()));
- action = actionManager->createAction("remove_n_hold_columns");
+ action = actionManager->createAction("remove_multiple_hold_columns");
connect(action, SIGNAL(triggered()), SIGNAL(sigRemoveHoldColumnsCustom()));
action = actionManager->createAction("mirror_columns");
connect(action, SIGNAL(triggered()), SIGNAL(sigMirrorColumns()));
action = actionManager->createAction("copy_columns_to_clipboard");
connect(action, SIGNAL(triggered()), SIGNAL(sigCopyColumns()));
action = actionManager->createAction("cut_columns_to_clipboard");
connect(action, SIGNAL(triggered()), SIGNAL(sigCutColumns()));
action = actionManager->createAction("paste_columns_from_clipboard");
connect(action, SIGNAL(triggered()), SIGNAL(sigPasteColumns()));
}
}
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);
}
QMenu menu;
KisActionManager::safePopulateMenu(&menu, "cut_columns_to_clipboard", m_d->actionMan);
KisActionManager::safePopulateMenu(&menu, "copy_columns_to_clipboard", m_d->actionMan);
KisActionManager::safePopulateMenu(&menu, "paste_columns_from_clipboard", m_d->actionMan);
- menu.addSeparator();
- QMenu *frames = menu.addMenu(i18nc("@item:inmenu", "Keyframe Columns"));
- KisActionManager::safePopulateMenu(frames, "insert_columns_right", m_d->actionMan);
- KisActionManager::safePopulateMenu(frames, "insert_columns_left", m_d->actionMan);
menu.addSeparator();
- KisActionManager::safePopulateMenu(frames, "insert_n_columns_right", m_d->actionMan);
- KisActionManager::safePopulateMenu(frames, "insert_n_columns_left", m_d->actionMan);
- QMenu *hold = menu.addMenu(i18nc("@item:inmenu", "Hold Frame Columns"));
- KisActionManager::safePopulateMenu(hold, "insert_hold_column", m_d->actionMan);
- KisActionManager::safePopulateMenu(hold, "remove_hold_column", m_d->actionMan);
- menu.addSeparator();
- KisActionManager::safePopulateMenu(hold, "insert_n_hold_columns", m_d->actionMan);
- KisActionManager::safePopulateMenu(hold, "remove_n_hold_columns", m_d->actionMan);
+ { //Frame Columns Submenu
+ QMenu *frames = menu.addMenu(i18nc("@item:inmenu", "Keyframe Columns"));
+ KisActionManager::safePopulateMenu(frames, "insert_column_left", m_d->actionMan);
+ KisActionManager::safePopulateMenu(frames, "insert_column_right", m_d->actionMan);
+ frames->addSeparator();
+ KisActionManager::safePopulateMenu(frames, "insert_multiple_columns", m_d->actionMan);
+ }
+
+ { //Hold Columns Submenu
+ QMenu *hold = menu.addMenu(i18nc("@item:inmenu", "Hold Frame Columns"));
+ KisActionManager::safePopulateMenu(hold, "insert_hold_column", m_d->actionMan);
+ KisActionManager::safePopulateMenu(hold, "remove_hold_column", m_d->actionMan);
+ hold->addSeparator();
+ KisActionManager::safePopulateMenu(hold, "insert_multiple_hold_columns", m_d->actionMan);
+ KisActionManager::safePopulateMenu(hold, "remove_multiple_hold_columns", m_d->actionMan);
+ }
menu.addSeparator();
+
KisActionManager::safePopulateMenu(&menu, "remove_columns", m_d->actionMan);
KisActionManager::safePopulateMenu(&menu, "remove_columns_and_pull", m_d->actionMan);
-
if (numSelectedColumns > 1) {
menu.addSeparator();
KisActionManager::safePopulateMenu(&menu, "mirror_columns", m_d->actionMan);
}
menu.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;
}
diff --git a/plugins/dockers/animation/timeline_ruler_header.h b/plugins/dockers/animation/timeline_ruler_header.h
index 035e28ddfd..a99baf516b 100644
--- a/plugins/dockers/animation/timeline_ruler_header.h
+++ b/plugins/dockers/animation/timeline_ruler_header.h
@@ -1,87 +1,87 @@
/*
* 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);
+ 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;
Q_SIGNALS:
- void sigInsertColumnsLeft();
- void sigInsertColumnsRight();
- void sigInsertColumnsLeftCustom();
- void sigInsertColumnsRightCustom();
+ void sigInsertColumnLeft();
+ void sigInsertColumnRight();
+ void sigInsertMultipleColumns();
+
void sigRemoveColumns();
void sigRemoveColumnsAndShift();
void sigInsertHoldColumns();
void sigRemoveHoldColumns();
void sigInsertHoldColumnsCustom();
void sigRemoveHoldColumnsCustom();
void sigMirrorColumns();
void sigCutColumns();
void sigCopyColumns();
void sigPasteColumns();
private:
struct Private;
const QScopedPointer m_d;
};
#endif // TIMELINE_RULER_HEADER_H