Diffusion Krita b0594ca69c53

Merge branch 'master' into rempt/T379-resource-management
b0594ca69c53
Actions

Authored by rempt on Feb 27 2019, 3:28 PM.

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

rempt

Feb 27 2019, 3:28 PM

Parents

R37:6da7d1dd8c6b: Clean up the defaultdockers plugin
R37:f7cce820ad4d: Use the refactored KisResourceItemChooser class

Branches

Unknown

Tags

Unknown

rempt committed R37:b0594ca69c53: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Feb 27 2019, 3:28 PM

Merged Changes

Commit	Author	Details	Committed
6da7d1dd8c6b	rempt	Clean up the defaultdockers plugin	Feb 27 2019
47cc24d8d172	rempt	Move the squeezedcombobox to widgetutils	Feb 27 2019
b047a4677a71	dkazakov	Restore error dialog when the resulting image size is not even	Feb 27 2019
9740249011e2	dkazakov	Make relative file fetching in animation renderer a bit more robust	Feb 27 2019
ce50e5ceeb4a	amedonosova	Check for view and document before setting mirror tool config	Feb 27 2019

Changes (59)

		Path
M		libs/global/CMakeLists.txt
A		libs/global/KisFileUtils.cpp
A		libs/global/KisFileUtils.h
M		libs/ui/CMakeLists.txt
V		{libs/ui/KisNodeDelegate.cpp → plugins/dockers/layerdocker/NodeDelegate.cpp}
V		{libs/ui/KisNodeDelegate.h → plugins/dockers/layerdocker/NodeDelegate.h}
V		{libs/ui/KisNodePropertyAction_p.h → plugins/dockers/layerdocker/NodePropertyAction_p.h}
V		{libs/ui/KisNodeToolTip.cpp → plugins/dockers/layerdocker/NodeToolTip.cpp}
V		{libs/ui/KisNodeToolTip.h → plugins/dockers/layerdocker/NodeToolTip.h}
V		{libs/ui/KisNodeView.cpp → plugins/dockers/layerdocker/NodeView.cpp}
V		{libs/ui/KisNodeView.h → plugins/dockers/layerdocker/NodeView.h}
M		libs/ui/canvas/KisMirrorAxisConfig.cpp
M		libs/ui/kis_mirror_manager.cpp
M		libs/ui/kis_mirror_manager.h
V		{libs/ui/kis_node_view_visibility_delegate.cpp → plugins/dockers/layerdocker/NodeViewVisibilityDelegate.cpp}
V		{libs/ui/kis_node_view_visibility_delegate.h → plugins/dockers/layerdocker/NodeViewVisibilityDelegate.h}
M		libs/ui/tests/CMakeLists.txt
V		{libs/ui/tests/kis_node_view_test.cpp → plugins/dockers/layerdocker/tests/TestNodeView.cpp}
V		{libs/ui/tests/kis_node_view_test.h → plugins/dockers/layerdocker/tests/TestNodeView.h}
M		libs/widgets/kis_file_name_requester.cpp
M		plugins/dockers/CMakeLists.txt
D		plugins/dockers/defaultdockers
D		plugins/dockers/defaultdockers/CMakeLists.txt
V		plugins/dockers/{defaultdockers/defaultdockers.cpp → layerdocker/LayerDocker.cpp}
V		plugins/dockers/{defaultdockers/defaultdockers.h → layerdocker/LayerDocker.h}
V		plugins/dockers/{defaultdockers/kis_layer_box.cpp → layerdocker/LayerBox.cpp}
V		plugins/dockers/{defaultdockers/kis_layer_box.h → layerdocker/LayerBox.h}
V		plugins/dockers/{defaultdockers/kritadefaultdockers.json → layerdocker/kritalayerdocker.json}
D		plugins/dockers/defaultdockers/sync_button_and_action.cpp
V		plugins/dockers/{defaultdockers/sync_button_and_action.h → layerdocker/SyncButtonAndAction.h}
D		plugins/dockers/defaultdockers/tests
D		plugins/dockers/defaultdockers/tests/CMakeLists.txt
V		plugins/dockers/{defaultdockers/wdglayerbox.ui → layerdocker/WdgLayerBox.ui}
A	(dir)	plugins/dockers/layerdocker/
A		plugins/dockers/layerdocker/CMakeLists.txt
V		plugins/dockers/{layerdocker/LayerBox.cpp ← defaultdockers/kis_layer_box.cpp}
V		plugins/dockers/{layerdocker/LayerBox.h ← defaultdockers/kis_layer_box.h}
V		plugins/dockers/{layerdocker/LayerDocker.cpp ← defaultdockers/defaultdockers.cpp}
V		plugins/dockers/{layerdocker/LayerDocker.h ← defaultdockers/defaultdockers.h}
V		{plugins/dockers/layerdocker/NodeDelegate.cpp ← libs/ui/KisNodeDelegate.cpp}
V		{plugins/dockers/layerdocker/NodeDelegate.h ← libs/ui/KisNodeDelegate.h}
V		{plugins/dockers/layerdocker/NodePropertyAction_p.h ← libs/ui/KisNodePropertyAction_p.h}
V		{plugins/dockers/layerdocker/NodeToolTip.cpp ← libs/ui/KisNodeToolTip.cpp}
V		{plugins/dockers/layerdocker/NodeToolTip.h ← libs/ui/KisNodeToolTip.h}
V		{plugins/dockers/layerdocker/NodeView.cpp ← libs/ui/KisNodeView.cpp}
V		{plugins/dockers/layerdocker/NodeView.h ← libs/ui/KisNodeView.h}
V		{plugins/dockers/layerdocker/NodeViewVisibilityDelegate.cpp ← libs/ui/kis_node_view_visibility_delegate.cpp}
V		{plugins/dockers/layerdocker/NodeViewVisibilityDelegate.h ← libs/ui/kis_node_view_visibility_delegate.h}
V		plugins/dockers/{layerdocker/SyncButtonAndAction.h ← defaultdockers/sync_button_and_action.h}
V		plugins/dockers/{layerdocker/WdgLayerBox.ui ← defaultdockers/wdglayerbox.ui}
V		plugins/dockers/{layerdocker/kritalayerdocker.json ← defaultdockers/kritadefaultdockers.json}
A	(dir)	plugins/dockers/layerdocker/tests/
A		plugins/dockers/layerdocker/tests/CMakeLists.txt
V		{plugins/dockers/layerdocker/tests/TestNodeView.cpp ← libs/ui/tests/kis_node_view_test.cpp}
V		{plugins/dockers/layerdocker/tests/TestNodeView.h ← libs/ui/tests/kis_node_view_test.h}
M		plugins/extensions/animationrenderer/AnimationRenderer.cpp
M		plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
M		plugins/extensions/animationrenderer/KisAnimationRenderingOptions.cpp
M		plugins/extensions/animationrenderer/KisAnimationRenderingOptions.h