Diffusion Krita ebbe17df76d3

T5411-modernise-calligraphy…
ebbe17df76d3
Actions

Authored by woltherav on Mar 15 2017, 6:43 PM.

Description

Merge branch 'kazakov/svg-loading' into wolthera/T5411-modernise-calligraphy-tool

Details

Committed

woltherav

Mar 15 2017, 6:43 PM

Parents

R37:4baebc1da6e5: Add smoothing in the tool instead of the shape.
R37:995d4d522ece: Don't activate Shape Editing tool on every requestStrokeEnd()

Branches

Unknown

Tags

Unknown

woltherav committed R37:ebbe17df76d3: Merge branch 'kazakov/svg-loading' into wolthera/T5411-modernise-calligraphy… (authored by woltherav).Mar 15 2017, 6:43 PM

Merged Changes

Commit	Author	Details	Committed
995d4d522ece	dkazakov	Don't activate Shape Editing tool on every requestStrokeEnd()	Mar 15 2017
54de079586a0	dkazakov	Fix colliding zIndex values when copy-pasting the shapes	Mar 15 2017
b3e59c917a2a	dkazakov	Save shape selections as SVG as well	Mar 14 2017
3d796ce43e42	dkazakov	Cleanup KoDrag::setOdf()	Mar 14 2017
23b1183875ab	dkazakov	Remove now unused methods of KoDocumentResourceManager	Mar 14 2017
7d8d29941b98	dkazakov	Remove KoShapePaste and all the related classes	Mar 14 2017
d57f22c09f67	dkazakov	Make pasting shapes be a priority when pasting	Mar 14 2017
f3394a1e406e	dkazakov	Use simplified version of KoShapeMoveCommand	Mar 14 2017
271bb5d83824	dkazakov	Reuse KoShape::boundingBox(listOfShapes) whenever possible	Mar 14 2017
1189dccb135a	dkazakov	Implement copy-pasting of shapes!	Mar 14 2017

Changes (85)

				Path	Packages
	M			krita/krita.action
	M			krita/krita.xmlgui
	M			krita/kritamenu.action
	M			libs/flake/CMakeLists.txt
	M			libs/flake/KoCanvasController.h
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoCanvasControllerWidget.h
	M			libs/flake/KoCanvasControllerWidgetViewport_p.cpp
	M			libs/flake/KoDocumentResourceManager.cpp
	M			libs/flake/KoDocumentResourceManager.h
	M			libs/flake/KoDrag.cpp
	M			libs/flake/KoDrag.h
	M			libs/flake/KoMarker.cpp
	M			libs/flake/KoSelection.cpp
	M			libs/flake/KoShape.cpp
	M			libs/flake/KoShape.h
	M			libs/flake/KoShapeBasedDocumentBase.cpp
	M			libs/flake/KoShapeBasedDocumentBase.h
	M			libs/flake/KoShapeController.cpp
	M			libs/flake/KoShapeController.h
	M			libs/flake/KoShapeGroup.cpp
	M			libs/flake/KoShapeLayer.cpp
	D			libs/flake/KoShapePaste.cpp
	D			libs/flake/KoShapePaste.h
	A			libs/flake/KoSvgPaste.cpp
	P			libs/flake/KoSvgPaste.h Copied from plugins/impex/libkra/tests/kis_kra_saver_test.h
	M			libs/flake/KoToolBase.cpp
	M			libs/flake/KoToolBase.h
	M			libs/flake/KoToolManager.cpp
	M			libs/flake/KoToolProxy.cpp
	M			libs/flake/KoToolProxy.h
	M			libs/flake/commands/KoShapeCreateCommand.cpp
	M			libs/flake/commands/KoShapeMoveCommand.cpp
	M			libs/flake/commands/KoShapeMoveCommand.h
	M			libs/flake/commands/KoShapeReorderCommand.cpp
	M			libs/flake/commands/KoShapeReorderCommand.h
	M			libs/flake/commands/KoShapeUnclipCommand.cpp
	M			libs/flake/svg/SvgParser.cpp
	M			libs/flake/tests/CMakeLists.txt
	M			libs/flake/tests/MockShapes.h
	A			libs/flake/tests/TestKoDrag.cpp
	P			libs/flake/tests/TestKoDrag.h Copied from plugins/impex/libkra/tests/kis_kra_saver_test.h
	M			libs/flake/tests/TestShapeReorderCommand.cpp
	M			libs/flake/tests/TestShapeReorderCommand.h
	A			libs/flake/tests/data/test_svg_file.svg
	M			libs/flake/tools/KoPathTool.cpp
	M			libs/flake/tools/KoPathTool.h
	M			libs/global/kis_algebra_2d.h
	M			libs/odf/CMakeLists.txt
	D			libs/odf/KoOdfPaste.cpp
	D			libs/odf/KoOdfPaste.h
	M			libs/ui/CMakeLists.txt
	A			libs/ui/actions/KisPasteActionFactory.cpp
	P			libs/ui/actions/KisPasteActionFactory.h Copied from plugins/impex/libkra/tests/kis_kra_saver_test.h
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/actions/kis_selection_action_factories.h
	M			libs/ui/canvas/kis_canvas_controller.cpp
	M			libs/ui/canvas/kis_canvas_controller.h
	M			libs/ui/flake/kis_shape_controller.cpp
	M			libs/ui/flake/kis_shape_controller.h
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/flake/kis_shape_layer.h
	D			libs/ui/flake/kis_shape_layer_paste.h
	M			libs/ui/flake/kis_shape_selection.cpp
	M			libs/ui/input/kis_tool_invocation_action.cpp
	M			libs/ui/kis_selection_manager.cc
	M			libs/ui/operations/kis_operation_registry.cpp
	M			plugins/dockers/shapedockers/CMakeLists.txt
	D			plugins/dockers/shapedockers/shapecollection/CollectionShapeFactory.cpp
	D			plugins/dockers/shapedockers/shapecollection/CollectionShapeFactory.h
	D			plugins/dockers/shapedockers/shapecollection/OdfCollectionLoader.cpp
	D			plugins/dockers/shapedockers/shapecollection/OdfCollectionLoader.h
	M			plugins/dockers/shapedockers/shapecollection/ShapeCollectionDocker.cpp
	M			plugins/dockers/shapedockers/shapecollection/ShapeCollectionDocker.h
	M			plugins/flake/textshape/TextTool.cpp
	M			plugins/flake/textshape/TextTool.h
	M			plugins/flake/textshape/kotext/CMakeLists.txt
	D			plugins/flake/textshape/kotext/KoTextPaste.cpp
	D			plugins/flake/textshape/kotext/KoTextPaste.h
	M			plugins/flake/textshape/kotext/commands/TextPasteCommand.cpp
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/libkra/tests/kis_kra_saver_test.cpp
	P			plugins/impex/libkra/tests/kis_kra_saver_test.h Copied to multiple locations: libs/flake/KoSvgPaste.h libs/flake/tests/TestKoDrag.h libs/ui/actions/KisPasteActionFactory.h
	M			plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
	M			plugins/tools/defaulttool/defaulttool/DefaultTool.h