Diffusion Krita 42e131939922

T5805-reference-images' into…
42e131939922
Actions

Authored by rempt on Feb 1 2018, 3:49 PM.

Description

Merge remote-tracking branch 'origin/pentikainen/T5805-reference-images' into rempt/intel-3

Details

Committed

rempt

Feb 1 2018, 3:49 PM

Parents

R37:a39225133c5e: Merge remote-tracking branch 'origin/pentikainen-T7220-multi-window-sessions'…
R37:4527800dda6d: Save reference images into .kra files

Branches

Unknown

Tags

Unknown

rempt committed R37:42e131939922: Merge remote-tracking branch 'origin/pentikainen/T5805-reference-images' into… (authored by rempt).Feb 1 2018, 3:49 PM

Merged Changes

Commit	Author	Details	Committed
4527800dda6d	jounip	Save reference images into .kra files	Jan 26 2018
ac42ec3cbf8b	jounip	Allow color picking from reference images	Jan 23 2018
f841754acb49	jounip	Keep aspect ratio of reference images by default	Jan 22 2018
1a9f376f8988	jounip	Fix slider prefixes in shape and reference image tool options	Jan 22 2018
57ffa0a19a34	jounip	Render tools above decorations	Jan 22 2018
e2c32d1adfcc	jounip	Merge remote-tracking branch 'remotes/origin/master' into pentikainen/T5805…	Jan 21 2018
6236fe0522d8	jounip	Activate reference images tool when adding a reference image by dropping	Jan 20 2018
e7ccb6a97444	jounip	Add opacity and saturation to reference images tool options	Jan 20 2018
82a287c0bbae	jounip	Add generic slider for adjusting a common property of multiple objects	Jan 20 2018
196ab9dbe6e8	jounip	Implement reference image tool options to add and remove references	Jan 16 2018
d4551bc488f3	jounip	Do not switch away from reference images tool when doubleclicking	Jan 15 2018
bee3d3329cbf	jounip	Fix restoring painter state in KisRefereneImage	Jan 15 2018
4f2c3f425d0c	jounip	Hide reference images layer from layer stack	Jan 15 2018
c9f1dc0b6856	jounip	Merge remote-tracking branch 'origin/master' into pentikainen/T5805-reference…	Jan 15 2018
8e526eacf875	jounip	Render reference images through the decoration	Jan 10 2018
f15162ffa848	jounip	Refactor reference images into shapes	Jan 10 2018
20bb62c6a8ae	jounip	Refactor KisShapeLayerCanvas for extensibility	Jan 10 2018
1fde8c5e8514	jounip	Refactor interactions of DefaultTool to use tool provided selection	Dec 18 2017
b768ea90b0a6	jounip	Refactor reference images into a specialized shape layer	Dec 18 2017
07aa8c21bba1	jounip	Merge branch 'master' into pentikainen/T5805-reference-images	Dec 13 2017
d8b5d29f142c	rempt	Merge branch 'master' into rempt/T5805-reference-images	Sep 30 2017
361eab84429a	rempt	Start work on a reference images tool	Sep 30 2017
50db165f70f2	rempt	Merge remote-tracking branch 'origin' into rempt/T5805-reference-images	Jun 16 2017
f3d7c61640a3	rempt	Add a skeleton tool to handle reference images	Jun 15 2017
a035fe49eece	rempt	Make it possible to drop reference images	Jun 15 2017
048a470ca27b	rempt	Make conform to coding guidelines	Jun 15 2017
858d12a628d1	rempt	Add basic framework for a reference images canvas decoration	Jun 15 2017

Changes (79)

		Path
M		krita/krita4.xmlgui
M		krita/kritamenu.action
M		libs/flake/commands/KoShapeCreateCommand.cpp
M		libs/flake/commands/KoShapeCreateCommand.h
M		libs/flake/commands/KoShapeKeepAspectRatioCommand.cpp
M		libs/flake/commands/KoShapeKeepAspectRatioCommand.h
M		libs/flake/tools/KoShapeRubberSelectStrategy.cpp
M		libs/flake/tools/KoShapeRubberSelectStrategy.h
M		libs/image/kis_types.h
M		libs/libkis/Node.cpp
M		libs/ui/CMakeLists.txt
A		libs/ui/KisDecorationsManager.cpp
V		libs/ui/{KisDecorationsManager.h ← kis_painting_assistants_manager.h}
M		libs/ui/KisDocument.cpp
M		libs/ui/KisDocument.h
M		libs/ui/KisImportExportManager.cpp
A		libs/ui/KisReferenceImage.cpp
A		libs/ui/KisReferenceImage.h
A		libs/ui/KisReferenceImagesDecoration.cpp
A		libs/ui/KisReferenceImagesDecoration.h
M		libs/ui/KisView.cpp
M		libs/ui/KisViewManager.cpp
M		libs/ui/KisViewManager.h
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/canvas/kis_canvas2.h
M		libs/ui/canvas/kis_canvas_widget_base.cpp
A		libs/ui/flake/KisReferenceImagesLayer.cpp
A		libs/ui/flake/KisReferenceImagesLayer.h
M		libs/ui/flake/kis_dummies_facade_base.cpp
M		libs/ui/flake/kis_shape_layer.cc
M		libs/ui/flake/kis_shape_layer.h
M		libs/ui/flake/kis_shape_layer_canvas.cpp
M		libs/ui/flake/kis_shape_layer_canvas.h
M		libs/ui/kis_model_index_converter.cpp
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_node_manager.h
M		libs/ui/kis_painting_assistant.cc
M		libs/ui/kis_painting_assistants_decoration.cpp
M		libs/ui/kis_painting_assistants_decoration.h
D		libs/ui/kis_painting_assistants_manager.cpp
V		libs/ui/{kis_painting_assistants_manager.h → KisDecorationsManager.h}
M		libs/ui/tool/kis_tool_paint.cc
A		libs/ui/widgets/KisSelectionPropertySlider.cpp
A		libs/ui/widgets/KisSelectionPropertySlider.h
M		libs/ui/widgets/kis_slider_spin_box.cpp
M		libs/ui/widgets/kis_slider_spin_box.h
M		plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
M		plugins/assistants/Assistants/ConcentricEllipseAssistant.h
M		plugins/assistants/Assistants/kis_assistant_tool.cc
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/kis_kra_loader.cpp
M		plugins/impex/libkra/kis_kra_loader.h
M		plugins/impex/libkra/kis_kra_save_visitor.cpp
M		plugins/impex/libkra/kis_kra_savexml_visitor.cpp
M		plugins/impex/libkra/kis_kra_savexml_visitor.h
M		plugins/impex/libkra/kis_kra_tags.h
M		plugins/tools/basictools/kis_tool_colorpicker.cc
M		plugins/tools/defaulttool/CMakeLists.txt
M		plugins/tools/defaulttool/Plugin.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultTool.h
M		plugins/tools/defaulttool/defaulttool/DefaultToolGeometryWidget.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultToolGeometryWidget.h
M		plugins/tools/defaulttool/defaulttool/DefaultToolGeometryWidget.ui
M		plugins/tools/defaulttool/defaulttool/ShapeMoveStrategy.cpp
M		plugins/tools/defaulttool/defaulttool/ShapeMoveStrategy.h
M		plugins/tools/defaulttool/defaulttool/ShapeResizeStrategy.cpp
M		plugins/tools/defaulttool/defaulttool/ShapeResizeStrategy.h
M		plugins/tools/defaulttool/defaulttool/ShapeRotateStrategy.cpp
M		plugins/tools/defaulttool/defaulttool/ShapeRotateStrategy.h
M		plugins/tools/defaulttool/defaulttool/ShapeShearStrategy.cpp
M		plugins/tools/defaulttool/defaulttool/ShapeShearStrategy.h
A	(dir)	plugins/tools/defaulttool/referenceimagestool/
A		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
A		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.h
A		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImagesWidget.cpp
A		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImagesWidget.h
A		plugins/tools/defaulttool/referenceimagestool/WdgToolOptions.ui