Diffusion Krita 9bcbbbb40ae1

T10784-android…
9bcbbbb40ae1
Actions

Authored by sh-zam on Sep 25 2019, 7:57 PM.

Description

Merge branch 'master' of invent.kde.org:kde/krita into sh-zam/T10784-android-port

Details

Committed

sh-zam

Sep 25 2019, 7:57 PM

Parents

R37:957e162270b9: Pass KisMainWindow* to KisAndroidFileManager's ctor
R37:db198ad4f133: Log the size and md5 of the saved file after saving

Branches

Unknown

Tags

Unknown

References

refs/merge-requests/143/head, refs/keep-around/9bcbbbb40ae1f6925a2e195581863597924b053a, sh-zam/T10784-android-port

sh-zam committed R37:9bcbbbb40ae1: Merge branch 'master' of invent.kde.org:kde/krita into sh-zam/T10784-android… (authored by sh-zam).Sep 25 2019, 7:57 PM

Merged Changes

Commit		Author	Details	Committed
db198ad4f133		rempt	Log the size and md5 of the saved file after saving	Sep 25 2019
7eaeaee38a84		rempt	warning--	Sep 25 2019
8bd6aac7cd25		rempt	Do not concatenate a debug message manually, but use <<	Sep 25 2019
eeedb1d30508		rempt	warning--	Sep 25 2019
6fefdb7b4810		vanyossi	Fix spread Mode not loading on svg parse	Sep 25 2019
9894a2026969		dkazakov	Fix crash in lockfree hash table garbage collection	Sep 24 2019
ddb3a870b7d5		rempt	warning--	Sep 24 2019
822a375c65be		rempt	Merge branch 'whales/krita-whales/misc-libkis-python-related-fixes-and-small…	Sep 24 2019
282f91ed3e8e		rempt	warning--	Sep 24 2019
a54d7c05f281		vanyossi	Fix Collapse state not updating after Python call	Sep 24 2019
75cc0becbf2f		Jimbo Whales	Correct pt/inch confusion in docs	Sep 23 2019
726522c22fed		Jimbo Whales	Add View::setDocument	Sep 23 2019
f867486c5e83		kiroma/dkazakov	Clean up compilation log from deprecations	Sep 23 2019
0d45094ff507		dkazakov	Fix crash in Feather Selection (also in Wavelets, Blur and Edge Detection)	Sep 23 2019
9fd34885fcc8		kiroma/rempt	Fix the palletize crash	Sep 23 2019
f5dd77bf83ae		Mathias Wein	Fix KoColor::setColor()	Sep 22 2019
a76f4c340649		Guo Yunhe	Merge branch 'hidpi-splash' of invent.kde.org:kde/krita into hidpi-splash	Sep 21 2019
2d593e5e461a		Guo Yunhe	Pixel perfect splash art rendering	Sep 21 2019
d0108d299654		kiroma/dkazakov	Fix the TestKistSwatchGroup test	Sep 21 2019
5f783c4035ad		dkazakov	Merge branch 'kazakov/vector-color-fix-381784'	Sep 20 2019
59d8e62207ac		dkazakov	Add a comment about merging adjustment layers	Sep 20 2019
a2a1b600423b		dkazakov	Add user explanation about why the mask/clone is disabled	Sep 20 2019
a0caf30f8205		dkazakov	Strikethrough (and disable) a clone, whose source is a pass-through group	Sep 20 2019
9939ba35d3b6		dkazakov	Raise FPS limit to 300 fps (from 100fps)	Sep 20 2019
8c1b215d1841		dkazakov	Fix preview of Shape Layers in Transform Tool and Move Tool	Sep 19 2019
0d962a00a5c2	D23949	Guo Yunhe	Pixel perfect splash art rendering	Sep 19 2019
b6d75fa13012		dkazakov	Fix outline of Group Layers in Move Tool and Transform Tool	Sep 18 2019
d619b7134b5e		dkazakov	FEATURE: Add backgroung color as an option for newly created shapes	Sep 18 2019
7254c8d19777		Mathias Wein/dkazakov	Fix assistants update	Sep 18 2019
6a05693e9509		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 18 2019
2d817ba7ed61		dkazakov	Restore old fg/bg color when shape selection tool gets deactivated	Sep 17 2019
510a813ce1aa		dkazakov	Add debugging capabilities to KisAcyclicSignalConnector	Sep 17 2019
c472f2aa0a76		dkazakov	Fix updating current shape color when undo/redo	Sep 17 2019
1fdb15d0dae7		dkazakov	Fix color of the shape being synched with the color selectors	Sep 17 2019
31a24f46d3a1		Jimbo Whales	Add Selection::duplicate()	Sep 12 2019
21b38bdafc7d		Jimbo Whales	Fix Node often not being properly subtyped	Sep 12 2019
1b0007d818a0		Jimbo Whales	Fix Document::nodeByName not returning null	Sep 12 2019
d1b63e1a3dc6		Jimbo Whales	Fix build on Ubuntu 18.04 / Qt 5.9	Sep 12 2019

Changes (120)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	M			krita/data/templates/design/.directory
	M			libs/flake/svg/SvgGradientHelper.cpp
	M			libs/flake/svg/SvgGradientHelper.h
	M			libs/flake/svg/SvgGraphicContext.h
	M			libs/flake/text/KoSvgText.h
	M			libs/global/kis_acyclic_signal_connector.cpp
	M			libs/global/kis_acyclic_signal_connector.h
	M			libs/image/3rdparty/lock_free_map/leapfrog.h
	M			libs/image/3rdparty/lock_free_map/qsbr.h
	M			libs/image/CMakeLists.txt
	P			libs/image/KisCroppedOriginalLayerInterface.cpp Copied from libs/image/kis_name_server.h
	P			libs/image/KisCroppedOriginalLayerInterface.h Copied from libs/image/kis_name_server.h
	M			libs/image/kis_adjustment_layer.cc
	M			libs/image/kis_base_node.cpp
	M			libs/image/kis_base_node.h
	M			libs/image/kis_convolution_painter.cc
	M			libs/image/kis_edge_detection_kernel.cpp
	M			libs/image/kis_gaussian_kernel.cpp
	M			libs/image/kis_histogram.h
	M			libs/image/kis_image.cc
	M			libs/image/kis_image.h
	M			libs/image/kis_layer_composition.cpp
	M			libs/image/kis_layer_utils.cpp
	M			libs/image/kis_layer_utils.h
	M			libs/image/kis_name_server.cpp
	P			libs/image/kis_name_server.h Copied to multiple locations: libs/image/KisCroppedOriginalLayerInterface.cpp libs/image/KisCroppedOriginalLayerInterface.h libs/ui/tool/KisToolShapeUtils.cpp libs/ui/tool/KisToolShapeUtils.h
	M			libs/image/kis_node.cpp
	M			libs/image/kis_node.h
	M			libs/image/kis_node_graph_listener.cpp
	M			libs/image/kis_node_graph_listener.h
	M			libs/image/kis_painter.cc
	M			libs/image/kis_painter.h
	M			libs/image/kis_projection_leaf.cpp
	M			libs/image/kis_projection_leaf.h
	M			libs/image/kis_selection_filters.cpp
	M			libs/image/tiles3/kis_tile_hash_table2.h
	M			libs/libkis/Document.cpp
	M			libs/libkis/Document.h
	M			libs/libkis/LibKisUtils.cpp
	M			libs/libkis/Node.cpp
	M			libs/libkis/Node.h
	M			libs/libkis/Selection.cpp
	M			libs/libkis/Selection.h
	M			libs/libkis/View.cpp
	M			libs/libkis/View.h
	M			libs/libkis/tests/TestChannel.cpp
	M			libs/libkis/tests/TestFilter.cpp
	M			libs/libkis/tests/TestNode.cpp
	M			libs/pigment/KoColor.cpp
	M			libs/pigment/resources/KisSwatch.cpp
	M			libs/pigment/resources/KisSwatch.h
	M			libs/pigment/resources/KisSwatchGroup.cpp
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/tests/TestKisSwatchGroup.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisMainWindow.h
	M			libs/ui/KisView.cpp
	M			libs/ui/KisView.h
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_stroke_selection_properties.cpp
	M			libs/ui/dialogs/kis_dlg_stroke_selection_properties.h
	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/forms/wdggeometryoptions.ui
	M			libs/ui/kis_node_model.cpp
	M			libs/ui/kis_node_model.h
	M			libs/ui/kis_paintop_options_model.h
	M			libs/ui/kis_selection_manager.cc
	M			libs/ui/kis_splash_screen.cpp
	M			libs/ui/kis_splash_screen.h
	M			libs/ui/opengl/kis_opengl.cpp
	M			libs/ui/opengl/kis_opengl_image_textures.cpp
	P			libs/ui/tool/KisToolShapeUtils.cpp Copied from libs/image/kis_name_server.h
	P			libs/ui/tool/KisToolShapeUtils.h Copied from libs/image/kis_name_server.h
	M			libs/ui/tool/kis_figure_painting_tool_helper.cpp
	M			libs/ui/tool/kis_figure_painting_tool_helper.h
	M			libs/ui/tool/kis_tool_freehand.cc
	M			libs/ui/tool/kis_tool_shape.cc
	M			libs/ui/tool/kis_tool_shape.h
	M			libs/ui/tool/strokes/move_stroke_strategy.cpp
	M			libs/ui/widgets/KisMemoryReportButton.cpp
	M			libs/ui/widgets/KoDualColorButton.cpp
	M			libs/ui/widgets/KoFillConfigWidget.cpp
	M			libs/ui/widgets/KoFillConfigWidget.h
	M			libs/ui/widgets/kis_iconwidget.cc
	M			libs/widgets/KisGradientSlider.cpp
	M			libs/widgets/KisGradientSliderWidget.cpp
	M			libs/widgets/KoDialog.cpp
	M			libs/widgets/KoItemToolTip.cpp
	M			libs/widgets/KoToolBox.cpp
	M			libs/widgets/kis_color_button.cpp
	M			libs/widgetutils/kis_icon_utils.cpp
	M			libs/widgetutils/tests/KisDialogStateSaverTest.cpp
	M			libs/widgetutils/xmlgui/kmainwindowiface.cpp
	M			libs/widgetutils/xmlgui/ktoolbar.cpp
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/layerdocker/NodeToolTip.cpp
	M			plugins/extensions/buginfo/dlg_buginfo.cpp
	M			plugins/extensions/pykrita/sip/krita/Selection.sip
	M			plugins/extensions/pykrita/sip/krita/View.sip
	M			plugins/extensions/waveletdecompose/kis_wavelet_kernel.cpp
	M			plugins/flake/textshape/kotext/KoVariable.cpp
	M			plugins/flake/textshape/textlayout/KoTextLayoutArea.cpp
	M			plugins/impex/kra/kra_converter.cpp
	M			plugins/paintops/tangentnormal/kis_tangent_tilt_option.cpp
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/tools/basictools/KisMoveBoundsCalculationJob.cpp
	M			plugins/tools/basictools/kis_tool_pencil.cc
	M			plugins/tools/basictools/kis_tool_rectangle.cc
	M			plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectSceneItems.cpp
	M			plugins/tools/svgtexttool/BasicXMLSyntaxHighlighter.cpp
	M			plugins/tools/svgtexttool/SvgTextEditor.cpp
	M			plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp