Diffusion Krita 13135c6b9e08

Merge branch 'master' into eliakinalmeida/T4551-interactive-python-scripting
13135c6b9e08
Actions

Authored by rempt on Feb 27 2017, 12:11 PM.

Description

Merge branch 'master' into eliakinalmeida/T4551-interactive-python-scripting

Details

Committed

rempt

Feb 27 2017, 12:11 PM

Parents

R37:6f614b5ff291: Delete KisView on closing a view.
R37:ac8cf7eba51b: It was removed unnecessary imports and Wildcard imports

Branches

Unknown

Tags

Unknown

rempt committed R37:13135c6b9e08: Merge branch 'master' into eliakinalmeida/T4551-interactive-python-scripting (authored by rempt).Feb 27 2017, 12:11 PM

Merged Changes

Commit		Author	Details	Committed
6f614b5ff291		rempt	Delete KisView on closing a view.	Feb 27 2017
4763f5e524c0	D4328	dimitard/aacid	Proper change of color space and profile for image through "Image properties"…	Feb 26 2017
d5fb2c85dd6d	D3629	lsegovia/aacid	Fix CMYK colorspace palette loading	Feb 26 2017
c933a0a77ffb		scottpetrovic	make the color as mask enabled by default for the stamp and clipboard. this is…	Feb 26 2017
94fec8c9f29a		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Feb 25 2017
a9acf35ab0a0		rempt	Properly implement the hidpi switch	Feb 24 2017
3e9799262c7e		rempt	Add spaces between words	Feb 24 2017
6b9630657cb4		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Feb 23 2017
bf019051fca2		dkazakov	Also convert the pasted clip color space when the option is set	Feb 22 2017
5e7a1f5208c3		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Feb 21 2017

Changes (86)

				Path	Packages
	M			krita/data/templates/animation/.directory
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.desktop
	M			krita/main.cc
	M			libs/flake/CMakeLists.txt
	M			libs/flake/KoCanvasBase.cpp
	M			libs/flake/KoCanvasBase.h
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoCanvasControllerWidget_p.h
	M			libs/flake/KoCanvasObserverBase.cpp
	M			libs/flake/KoCanvasResourceManager.cpp
	M			libs/flake/KoShapeBasedDocumentBase.cpp
	M			libs/flake/KoShapeController.cpp
	M			libs/flake/KoShapeController.h
	A			libs/flake/tests/MockShapes.cpp
	M			libs/flake/tests/MockShapes.h
	M			libs/image/commands/kis_image_set_projection_color_space_command.cpp
	M			libs/image/kis_image.cc
	M			libs/pigment/KoCmykColorSpaceTraits.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPaletteModel.h
	M			libs/ui/KisView.cpp
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_canvas2.h
	M			libs/ui/canvas/kis_infinity_manager.h
	M			libs/ui/canvas/kis_paintop_transformation_connector.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/flake/kis_shape_layer_canvas.cpp
	M			libs/ui/flake/kis_shape_layer_canvas.h
	M			libs/ui/flake/kis_shape_selection_canvas.h
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/input/kis_input_manager_p.h
	M			libs/ui/kis_action_manager.cpp
	M			libs/ui/kis_import_catcher.cc
	M			libs/ui/kis_import_catcher.h
	M			libs/ui/kis_node_model.cpp
	M			libs/ui/kis_zoom_manager.cc
	M			libs/ui/tool/kis_selection_tool_helper.h
	M			libs/ui/widgets/kis_image_from_clipboard_widget.cpp
	M			packaging/linux/snap/setup/gui/krita.desktop
	M			plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h
	M			plugins/dockers/animation/kis_animation_curve_channel_list_model.cpp
	M			plugins/dockers/animation/kis_animation_curve_channel_list_model.h
	M			plugins/dockers/animation/kis_animation_curve_docker.cpp
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/channeldocker/channeldocker_dock.h
	M			plugins/dockers/channeldocker/channelmodel.h
	M			plugins/dockers/colorslider/kis_color_slider_dock.cpp
	M			plugins/dockers/colorslider/kis_color_slider_dock.h
	M			plugins/dockers/colorslider/kis_color_slider_input.h
	M			plugins/dockers/colorslider/kis_color_slider_widget.h
	M			plugins/dockers/colorslider/kis_hsv_slider.h
	M			plugins/dockers/compositiondocker/compositiondocker_dock.h
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp
	M			plugins/dockers/defaultdockers/kis_layer_box.h
	M			plugins/dockers/digitalmixer/digitalmixer_dock.h
	M			plugins/dockers/histogram/histogramdocker_dock.h
	M			plugins/dockers/historydocker/HistoryDock.cpp
	M			plugins/dockers/historydocker/HistoryDock.h
	M			plugins/dockers/historydocker/KisUndoModel.h
	M			plugins/dockers/imagedocker/imagedocker_dock.h
	M			plugins/dockers/lut/lutdocker_dock.h
	M			plugins/dockers/overview/overviewdocker_dock.h
	M			plugins/dockers/overview/overviewwidget.h
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.h
	M			plugins/dockers/presetdocker/presetdocker_dock.cpp
	M			plugins/dockers/presetdocker/presetdocker_dock.h
	M			plugins/dockers/presethistory/presethistory_dock.h
	M			plugins/dockers/shapedockers/shapeproperties/ShapePropertiesDocker.cpp
	M			plugins/dockers/smallcolorselector/smallcolorselector_dock.h
	M			plugins/dockers/specificcolorselector/specificcolorselector_dock.h
	M			plugins/dockers/tasksetdocker/tasksetdocker_dock.h
	M			plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp
	M			plugins/filters/phongbumpmap/wdgphongbumpmap.ui
	M			plugins/flake/artistictextshape/ArtisticTextToolSelection.h
	M			plugins/flake/textshape/ReferencesTool.h
	M			plugins/flake/textshape/ReviewTool.h
	M			plugins/flake/textshape/commands/ShowChangesCommand.h
	M			plugins/flake/textshape/kotext/InsertInlineObjectActionBase_p.h
	M			plugins/flake/textshape/kotext/commands/TextPasteCommand.h
	M			plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
	M			plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
	M			plugins/tools/defaulttool/defaulttool/ShapeMoveStrategy.h
	M			plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectEditWidget.h
	M			plugins/tools/tool_transform2/kis_tool_transform.h