Diffusion Krita 8f9097c99e87

Merge remote-tracking branch 'origin' into rempt/T9256-HDR-support
8f9097c99e87
Actions

Authored by rempt on Sep 5 2018, 6:44 AM.

Description

Merge remote-tracking branch 'origin' into rempt/T9256-HDR-support

Details

Committed

rempt

Sep 5 2018, 6:44 AM

Parents

R37:a063321b1c00: Revert "Temporary workaround for QTBUG-57299"
R37:77ecd7aaa777: Merge branch 'master' into rempt/T9256-HDR-support

Branches

Unknown

Tags

Unknown

rempt committed R37:8f9097c99e87: Merge remote-tracking branch 'origin' into rempt/T9256-HDR-support (authored by rempt).Sep 5 2018, 6:44 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
a063321b1c00		rempt	Revert "Temporary workaround for QTBUG-57299"	Sep 4 2018
bb79c0ee5303		rempt	warning--	Sep 4 2018
6d920bb13136		jounip	Fix backward compatibility of adjustment curves	Sep 4 2018
b418fc415176		dkazakov	Don't let move-selection action to start if there are any modifiers active	Sep 4 2018
cb54829942b8		dkazakov	Make creation of a vector selection a bit quicker	Sep 4 2018
0dbdd41a2068		dkazakov	FEATURE: Edit Seleciton action	Sep 4 2018
6018f2bb1234		dkazakov	FEATURE: Convert to Raster/Vector Selection menu actions	Sep 4 2018
b773c91abe42		dkazakov	Resolve conflicts between create and move selection actions	Sep 4 2018
31519cf0d868		dkazakov	FEATURE: move selection with any selection tool	Sep 3 2018
0f36057d79b0	D15184	rempt	Temporary workaround for QTBUG-57299	Sep 3 2018
c1ffff954c8c		rempt	Fix broken buddy	Sep 3 2018
e1ad479be8b0		dkazakov	Fix activation of a proper tool when vector selection is activated	Sep 3 2018
c4407b4f1660		dkazakov	Make shape selection mode be a default in the selection tools!	Sep 2 2018
59969979ef3f		dkazakov	Save state of selection tools options into the config file	Sep 2 2018
fc5a91d946c7		dkazakov	Implement boolean modes for vector selection tools	Sep 2 2018
d9c9d646ac70		scottpetrovic	tweak artistic color selector colors	Sep 2 2018
c31bc87f5f78		scottpetrovic	Replace MDI close button so it is easier to see on most OSs	Sep 2 2018
c42ce0564a74		dkazakov	Fix assert when undoing Convert Vector to Selection action	Sep 2 2018
41e4de24e89b		scottpetrovic	Add back docker close and float icons	Aug 31 2018
41970fef5a92		scottpetrovic	add proxy class for updating docker title icons	Aug 31 2018
44560a8c74cd		dkazakov	Fix resetting active tool when moving layers above vector layers	Aug 31 2018
692cc173adb2		dkazakov	Fix "stroke selection" to work with local selections	Aug 31 2018
6a08669705b6	D15144	amedonosova	Fixes assert when fg color changes with no shape selected	Aug 31 2018
3b7d0f2cbf66		rempt	Fix build with dcraw 0.19	Aug 31 2018
e2df7ceb11ab		scottpetrovic	Add tooltips for artistic color docker	Aug 29 2018
4b30e058eeec		dkazakov	Make vector shape selections draw their outlines when selected	Aug 29 2018
47a8fc476d2c		dkazakov	Make selection masks with shape selection automatically activate shape tool	Aug 29 2018
34b02f1950b3		dkazakov	Fix signal name in KisNodeDisplayModeAdapter	Aug 29 2018
42924705693b		woltherav	CPMT: Update docs	Aug 29 2018
0ebf6d928bc2		dkazakov	Fix select opaque shortcut when the layer is in a group	Aug 28 2018
fa65d03d27e7		dkazakov	Fix shift modifier in Curve Selection Tool	Aug 28 2018
7f4580efba79		dkazakov	Merge branch 'amedonosova/gamut-masking'	Aug 28 2018
6194d542ce76	D14249	amedonosova/dkazakov	Continuation of gamut masking effort.	Aug 28 2018
5a22cfaf2158		dkazakov	Don't let selection mask emit signals until it is a part of the graph	Aug 28 2018
fdbc79d9329c		rempt	Try to silence the kisdoc2 test completely	Aug 28 2018
52da41aac6dd		woltherav	CPMT: Ensure generated EPUBs pass EPUB check validation.	Aug 28 2018
a62729352f3d		woltherav	CPMT: Implement "epub_spread", the primary color ahl meta and more.	Aug 28 2018
b1744c79888f		dkazakov	Fix a crash when undo/redo a creation of a selection mask	Aug 28 2018
1e640d2738ef		vanyossi	Silence warnings for xfctools on clang	Aug 28 2018
8945c00b4eff		vanyossi	Remove unused variable	Aug 28 2018
58bf7521ca4d		vanyossi	Add missing override	Aug 28 2018
bd7e6f7b0121		vanyossi	Add missing override	Aug 28 2018
f84191eb178e		vanyossi	Remove unused variable	Aug 28 2018
8be07f5130f9		vanyossi	Remove unused private variable	Aug 28 2018
e5e0e8fc4b41		vanyossi	Remove unused private variable	Aug 28 2018
528d996ed907		vanyossi	Remove unused parameter, private variable	Aug 28 2018
86c925c76d87		vanyossi	Add missing override	Aug 28 2018
400162d8762e		vanyossi	Remove unused private variable	Aug 28 2018
db4a1bae4501		vanyossi	Add missing override	Aug 28 2018
dd95e4942a1f		vanyossi	Silence warning of misaligned increases	Aug 28 2018

Changes (220)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		krita/data/CMakeLists.txt
A	(dir)	krita/data/gamutmasks/
A		krita/data/gamutmasks/Atmosphere_With_Accent.kgm
A		krita/data/gamutmasks/Atmospheric_Triad.kgm
A		krita/data/gamutmasks/CMakeLists.txt
A		krita/data/gamutmasks/Complementary.kgm
A		krita/data/gamutmasks/Dominant_Hue_With_Accent.kgm
A		krita/data/gamutmasks/GamutMaskTemplate.kra
A		krita/data/gamutmasks/Shifted_Triad.kgm
A		krita/data/gamutmasks/Split_Complementary.kgm
A		krita/data/gamutmasks/empty_mask_preview.png
M		krita/data/kritarc
M		krita/data/templates/animation/Anim-Jp-EN.desktop
M		krita/data/templates/animation/Anim-Jp-JP.desktop
M		krita/data/templates/comics/Comics-USTemplate.desktop
M		krita/data/templates/comics/Manga-JpTemplate.desktop
M		krita/data/templates/design/.directory
M		krita/data/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
M		krita/data/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
M		krita/krita.action
M		krita/krita4.xmlgui
M		krita/kritamenu.action
M		krita/org.kde.krita.desktop
A		krita/pics/svg/dark_gamut-mask-off.svg
A		krita/pics/svg/dark_gamut-mask-on.svg
A		krita/pics/svg/dark_infinity.svg
A		krita/pics/svg/dark_wheel-light.svg
A		krita/pics/svg/dark_wheel-rings.svg
A		krita/pics/svg/dark_wheel-sectors.svg
A		krita/pics/svg/light_gamut-mask-off.svg
A		krita/pics/svg/light_gamut-mask-on.svg
A		krita/pics/svg/light_infinity.svg
A		krita/pics/svg/light_wheel-light.svg
A		krita/pics/svg/light_wheel-rings.svg
A		krita/pics/svg/light_wheel-sectors.svg
M		krita/pics/svg/svg-icons.qrc
M		libs/basicflakes/tools/KoCreatePathTool.cpp
M		libs/basicflakes/tools/KoCreatePathTool.h
M		libs/basicflakes/tools/KoCreatePathTool_p.h
M		libs/flake/CMakeLists.txt
A		libs/flake/KisGamutMaskViewConverter.cpp
A		libs/flake/KisGamutMaskViewConverter.h
M		libs/flake/KoShapeFillResourceConnector.cpp
M		libs/flake/commands/KoPathPointTypeCommand.cpp
M		libs/flake/commands/KoPathPointTypeCommand.h
A		libs/flake/resources/KoGamutMask.cpp
A		libs/flake/resources/KoGamutMask.h
M		libs/flake/svg/SvgWriter.cpp
M		libs/flake/svg/SvgWriter.h
M		libs/image/KisSelectionTags.h
M		libs/image/KisSelectionUpdateCompressor.cpp
P		libs/image/KisSelectionUpdateCompressor.h Copied to libs/ui/KisNodeDisplayModeAdapter.h
M		libs/image/kis_mask.cc
M		libs/image/kis_selection.cc
M		libs/image/kis_selection.h
M		libs/image/kis_selection_mask.cpp
M		libs/image/tests/scheduler_utils.h
M		libs/libqml/plugins/kritasketchplugin/models/LayerModel.cpp
M		libs/pigment/KoColorSpaceRegistry.h
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisNodeDelegate.cpp
A		libs/ui/KisNodeDisplayModeAdapter.cpp
P		libs/ui/KisNodeDisplayModeAdapter.h Copied from libs/image/KisSelectionUpdateCompressor.h
M		libs/ui/KisResourceBundle.cpp
M		libs/ui/KisResourceBundle.h
M		libs/ui/KisResourceBundleManifest.cpp
M		libs/ui/actions/kis_selection_action_factories.cpp
M		libs/ui/actions/kis_selection_action_factories.h
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/dialogs/kis_dlg_blacklist_cleanup.cpp
M		libs/ui/flake/kis_dummies_facade_base.cpp
M		libs/ui/flake/kis_shape_selection.cpp
M		libs/ui/flake/kis_shape_selection.h
M		libs/ui/forms/wdgdlgblacklistcleanup.ui
M		libs/ui/forms/wdgrectangleconstraints.ui
M		libs/ui/kis_action.h
M		libs/ui/kis_action_manager.cpp
M		libs/ui/kis_canvas_resource_provider.cpp
M		libs/ui/kis_canvas_resource_provider.h
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_node_filter_proxy_model.cpp
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_node_manager.h
M		libs/ui/kis_node_model.cpp
M		libs/ui/kis_node_model.h
M		libs/ui/kis_selection_manager.cc
M		libs/ui/kis_selection_manager.h
M		libs/ui/tests/FreehandStrokeBenchmark.cpp
M		libs/ui/tests/KisFrameCacheStoreTest.cpp
M		libs/ui/tests/KisPaintOnTransparencyMaskTest.cpp
M		libs/ui/tests/freehand_stroke_test.cpp
M		libs/ui/tests/kis_doc2_test.cpp
M		libs/ui/tests/kis_doc2_test.h
M		libs/ui/tests/kis_model_index_converter_test.cpp
M		libs/ui/tests/kis_node_model_test.cpp
M		libs/ui/tests/kis_node_view_test.cpp
M		libs/ui/tool/kis_rectangle_constraint_widget.cpp
M		libs/ui/tool/kis_rectangle_constraint_widget.h
M		libs/ui/tool/kis_selection_tool_config_widget_helper.cpp
M		libs/ui/tool/kis_selection_tool_config_widget_helper.h
M		libs/ui/tool/kis_selection_tool_helper.cpp
M		libs/ui/tool/kis_selection_tool_helper.h
M		libs/ui/tool/kis_shape_tool_helper.cpp
M		libs/ui/tool/kis_shape_tool_helper.h
M		libs/ui/tool/kis_tool.cc
M		libs/ui/tool/kis_tool.h
M		libs/ui/tool/kis_tool_ellipse_base.cpp
M		libs/ui/tool/kis_tool_ellipse_base.h
M		libs/ui/tool/kis_tool_polyline_base.cpp
M		libs/ui/tool/kis_tool_polyline_base.h
M		libs/ui/tool/kis_tool_rectangle_base.cpp
M		libs/ui/tool/kis_tool_rectangle_base.h
M		libs/ui/tool/kis_tool_select_base.h
V		{libs/ui/tool ← plugins/tools/basictools}/strokes/move_stroke_strategy.cpp
V		{libs/ui/tool ← plugins/tools/basictools}/strokes/move_stroke_strategy.h
M		libs/ui/widgets/kis_selection_options.cc
M		libs/vectorimage/libwmf/WmfParser.cpp
M		libs/widgets/KoResourceServerProvider.cpp
M		libs/widgets/KoResourceServerProvider.h
M		libs/widgets/kritawidgets.qrc
A		libs/widgets/pics/dark_docker_close.png
A		libs/widgets/pics/dark_docker_float.png
A		libs/widgets/pics/light_docker_close.png
A		libs/widgets/pics/light_docker_float.png
M		packaging/linux/snap/setup/gui/krita.desktop
M		plugins/dockers/CMakeLists.txt
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/artisticcolorselector/CMakeLists.txt
M		plugins/dockers/artisticcolorselector/artisticcolorselector_dock.cpp
M		plugins/dockers/artisticcolorselector/artisticcolorselector_dock.h
A		plugins/dockers/artisticcolorselector/forms/wdgARCSSettings.ui
M		plugins/dockers/artisticcolorselector/forms/wdgArtisticColorSelector.ui
V		plugins/dockers/artisticcolorselector/forms/{wdgColorPreferencesPopup.ui → wdgWheelPreferencesPopup.ui}
V		plugins/dockers/artisticcolorselector/forms/{wdgWheelPreferencesPopup.ui ← wdgColorPreferencesPopup.ui}
A		plugins/dockers/artisticcolorselector/kis_arcs_constants.h
M		plugins/dockers/artisticcolorselector/kis_color.cpp
M		plugins/dockers/artisticcolorselector/kis_color.h
M		plugins/dockers/artisticcolorselector/kis_color_selector.cpp
M		plugins/dockers/artisticcolorselector/kis_color_selector.h
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
A	(dir)	plugins/dockers/gamutmask/
A		plugins/dockers/gamutmask/CMakeLists.txt
A		plugins/dockers/gamutmask/KisGamutMaskChooser.cpp
A		plugins/dockers/gamutmask/KisGamutMaskChooser.h
A	(dir)	plugins/dockers/gamutmask/forms/
A		plugins/dockers/gamutmask/forms/wdgGamutMaskChooser.ui
A		plugins/dockers/gamutmask/gamutmask_dock.cpp
A		plugins/dockers/gamutmask/gamutmask_dock.h
A		plugins/dockers/gamutmask/gamutmask_plugin.cpp
A		plugins/dockers/gamutmask/gamutmask_plugin.h
A		plugins/dockers/gamutmask/krita_gamutmask.json
M		plugins/dockers/svgcollectiondocker/SvgSymbolCollectionDocker.h
M		plugins/extensions/imagesize/wdg_imagesize.ui
M		plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
M		plugins/extensions/resourcemanager/dlg_create_bundle.cpp
M		plugins/extensions/resourcemanager/dlg_create_bundle.h
M		plugins/extensions/resourcemanager/resourcemanager.cpp
M		plugins/filters/asccdl/kis_asccdl_filter.h
M		plugins/filters/colorsfilters/kis_cross_channel_filter.cpp
M		plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
M		plugins/filters/colorsfilters/kis_multichannel_filter_base.h
M		plugins/filters/colorsfilters/kis_perchannel_filter.cpp
M		plugins/flake/pathshapes/rectangle/RectangleShape.cpp
M		plugins/flake/pathshapes/rectangle/RectangleShapeFactory.cpp
M		plugins/flake/pathshapes/rectangle/RectangleShapeFactory.h
M		plugins/impex/exr/krita_exr.desktop
M		plugins/impex/heif/krita_heif.desktop
M		plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
M		plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.h
M		plugins/impex/tiff/kis_tiff_converter.cc
M		plugins/impex/tiff/kis_tiff_ycbcr_reader.cc
M		plugins/impex/tiff/kis_tiff_ycbcr_reader.h
M		plugins/impex/xcf/CMakeLists.txt
M		plugins/paintops/libpaintop/kis_auto_brush_widget.h
M		plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
M		plugins/python/colorspace/kritapykrita_colorspace.desktop
M		plugins/python/comics_project_management_tools/README.html
M		plugins/python/comics_project_management_tools/comics_export_dialog.py
M		plugins/python/comics_project_management_tools/comics_exporter.py
M		plugins/python/comics_project_management_tools/comics_metadata_dialog.py
M		plugins/python/comics_project_management_tools/comics_project_manager_docker.py
M		plugins/python/comics_project_management_tools/comics_project_setup_wizard.py
M		plugins/python/comics_project_management_tools/exporters/CPMT_Comic_Book_Info_Exporter.py
M		plugins/python/comics_project_management_tools/exporters/CPMT_Comic_Rack_XML_Exporter.py
M		plugins/python/comics_project_management_tools/exporters/CPMT_EPUB_exporter.py
M		plugins/python/documenttools/kritapykrita_documenttools.desktop
M		plugins/python/exportlayers/kritapykrita_exportlayers.desktop
M		plugins/python/hello/kritapykrita_hello.desktop
M		plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
M		plugins/tools/basictools/CMakeLists.txt
M		plugins/tools/basictools/kis_tool_ellipse.cc
M		plugins/tools/basictools/kis_tool_ellipse.h
M		plugins/tools/basictools/kis_tool_rectangle.cc
M		plugins/tools/basictools/kis_tool_rectangle.h
M		plugins/tools/basictools/strokes/move_selection_stroke_strategy.cpp
V		{plugins/tools/basictools → libs/ui/tool}/strokes/move_stroke_strategy.cpp
V		{plugins/tools/basictools → libs/ui/tool}/strokes/move_stroke_strategy.h
M		plugins/tools/basictools/tests/CMakeLists.txt
M		plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
M		plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
M		plugins/tools/defaulttool/defaulttool/SelectionDecorator.h
M		plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectSceneItems.h
M		plugins/tools/karbonplugins/tools/filterEffectTool/FilterStackSetCommand.h
M		plugins/tools/selectiontools/kis_tool_select_contiguous.cc
M		plugins/tools/selectiontools/kis_tool_select_contiguous.h
M		plugins/tools/selectiontools/kis_tool_select_elliptical.cc
M		plugins/tools/selectiontools/kis_tool_select_elliptical.h
M		plugins/tools/selectiontools/kis_tool_select_outline.cc
M		plugins/tools/selectiontools/kis_tool_select_path.cc
M		plugins/tools/selectiontools/kis_tool_select_path.h
M		plugins/tools/selectiontools/kis_tool_select_polygonal.cc
M		plugins/tools/selectiontools/kis_tool_select_rectangular.cc
M		plugins/tools/selectiontools/kis_tool_select_rectangular.h
M		plugins/tools/svgtexttool/SvgTextTool.h
M		plugins/tools/tool_transform2/kis_tool_transform.h
M		sdk/tests/testutil.h