T379-resource-management
8ded14cf398d
Actions

Authored by dkazakov on Feb 21 2020, 4:03 PM.

Description

Merge branch 'kazakov/embedded-resources' into rempt/T379-resource-management

Conflicts:
libs/resourcewidgets/KisStorageChooserWidget.cpp

Details

Committed

dkazakov

Feb 21 2020, 4:03 PM

Parents

R37:a4f457d6bfa9: Add more explanation to KoEphemeralResource
R37:833173a88a92: Fix removing the active palette when the associated document is closed.

Branches

Unknown

Tags

Unknown

References

refs/keep-around/8ded14cf398d606f642d5f5642565d80cdfd7780

dkazakov committed R37:8ded14cf398d: Merge branch 'kazakov/embedded-resources' into rempt/T379-resource-management (authored by dkazakov).Feb 21 2020, 4:03 PM

Merged Changes

Commit	Author	Details	Committed
a4f457d6bfa9	dkazakov	Add more explanation to KoEphemeralResource	Feb 21 2020
be838ff16267	dkazakov	Fix naming of resourceSourceAdapter	Feb 21 2020
3cbce01d241b	dkazakov	Completely remove lazy-initialization from KisBrush::brushTipImage()	Feb 21 2020
1fc63cc11abd	dkazakov	Fix building KoColorSet after the merge	Feb 21 2020
e9b410669646	dkazakov	Merge remote-tracking branch 'origin/rempt/T379-resource-management' into…	Feb 21 2020
ad46a9966407	dkazakov	Add a todo item	Feb 21 2020
3ccae6f9ef78	dkazakov	Fix warning	Feb 21 2020
9e0bfdc097a3	dkazakov	Remove KisPaintOpSettings::isLoadable()	Feb 21 2020
81aca2057021	dkazakov	Disable lazy-loading in KisBrush::brushTipImage() for now	Feb 21 2020
7b14098d8015	dkazakov	Fix unittests	Feb 21 2020
477012cd190c	dkazakov	Refactor out using global resources singletons in KisPaintOpSettings	Feb 21 2020
77f6ccc324e8	dkazakov	Add cpp-quirks for future C++ standards	Feb 21 2020
d8e47c448009	dkazakov	Implement KoEphemeralResource resource type	Feb 21 2020
cdc049fd9364	dkazakov	Implement general KisResourcesInterface	Feb 21 2020

Changes (168)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			benchmarks/kis_low_memory_benchmark.cpp
	M			benchmarks/kis_stroke_benchmark.cpp
	M			libs/brush/kis_abr_brush.cpp
	M			libs/brush/kis_abr_brush.h
	M			libs/brush/kis_auto_brush.cpp
	M			libs/brush/kis_auto_brush.h
	M			libs/brush/kis_auto_brush_factory.cpp
	M			libs/brush/kis_auto_brush_factory.h
	M			libs/brush/kis_brush.cpp
	M			libs/brush/kis_brush.h
	M			libs/brush/kis_brush_factory.h
	M			libs/brush/kis_brush_registry.cpp
	M			libs/brush/kis_brush_registry.h
	M			libs/brush/kis_gbr_brush.cpp
	M			libs/brush/kis_gbr_brush.h
	M			libs/brush/kis_imagepipe_brush.cpp
	M			libs/brush/kis_imagepipe_brush.h
	M			libs/brush/kis_png_brush.cpp
	M			libs/brush/kis_png_brush.h
	M			libs/brush/kis_predefined_brush_factory.cpp
	M			libs/brush/kis_predefined_brush_factory.h
	M			libs/brush/kis_svg_brush.cpp
	M			libs/brush/kis_svg_brush.h
	M			libs/brush/kis_text_brush.cpp
	M			libs/brush/kis_text_brush.h
	M			libs/brush/kis_text_brush_factory.cpp
	M			libs/brush/kis_text_brush_factory.h
	M			libs/brush/tests/kis_auto_brush_factory_test.cpp
	M			libs/brush/tests/kis_gbr_brush_test.cpp
	M			libs/brush/tests/kis_imagepipe_brush_test.cpp
	M			libs/flake/resources/KoGamutMask.cpp
	M			libs/flake/resources/KoGamutMask.h
	M			libs/flake/resources/KoSvgSymbolCollectionResource.cpp
	M			libs/flake/resources/KoSvgSymbolCollectionResource.h
	M			libs/flake/resources/tests/KoGamutMaskTest.cpp
	M			libs/flake/text/KoSvgTextShapeMarkupConverter.cpp
	M			libs/global/KisCppQuirks.h
	M			libs/image/brushengine/kis_no_size_paintop_settings.cpp
	P			libs/image/brushengine/kis_no_size_paintop_settings.h Copied to libs/resources/KisResourcesInterface_p.h
	M			libs/image/brushengine/kis_paintop_factory.h
	M			libs/image/brushengine/kis_paintop_preset.cpp
	M			libs/image/brushengine/kis_paintop_preset.h
	M			libs/image/brushengine/kis_paintop_registry.cc
	M			libs/image/brushengine/kis_paintop_registry.h
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/kis_gradient_painter.cc
	M			libs/image/kis_psd_layer_style.cpp
	M			libs/image/kis_psd_layer_style.h
	M			libs/image/tests/kis_layer_style_projection_plane_test.cpp
	M			libs/image/tests/kis_pattern_test.cpp
	M			libs/pigment/resources/KoAbstractGradient.h
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	M			libs/pigment/resources/KoPattern.cpp
	M			libs/pigment/resources/KoPattern.h
	M			libs/pigment/resources/KoSegmentGradient.cpp
	M			libs/pigment/resources/KoSegmentGradient.h
	M			libs/pigment/resources/KoStopGradient.cpp
	M			libs/pigment/resources/KoStopGradient.h
	M			libs/resources/CMakeLists.txt
	M			libs/resources/KisFolderStorage.cpp
	A			libs/resources/KisGlobalResourcesInterface.cpp
	P			libs/resources/KisGlobalResourcesInterface.h Copied from plugins/paintops/curvebrush/kis_curve_paintop_settings.h
	A			libs/resources/KisLocalStrokeResources.cpp
	A			libs/resources/KisLocalStrokeResources.h
	M			libs/resources/KisResourceLoader.h
	M			libs/resources/KisResourceLocator.cpp
	A			libs/resources/KisResourcesInterface.cpp
	A			libs/resources/KisResourcesInterface.h
	P			libs/resources/KisResourcesInterface_p.h Copied from libs/image/brushengine/kis_no_size_paintop_settings.h
	A			libs/resources/KoEphemeralResource.h
	M			libs/resources/KoResource.cpp
	M			libs/resources/KoResource.h
	M			libs/resources/KoResourceBundle.cpp
	M			libs/resources/tests/DummyResource.h
	M			libs/resources/tests/TestResourceLoaderRegistry.cpp
	M			libs/resourcewidgets/KisStorageChooserWidget.cpp
	M			libs/ui/KisPaintopPropertiesBase.cpp
	M			libs/ui/KisPaintopPropertiesBase.h
	M			libs/ui/KisPaletteEditor.cpp
	M			libs/ui/KisWindowLayoutResource.cpp
	M			libs/ui/KisWindowLayoutResource.h
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_workspace_resource.cpp
	M			libs/ui/kis_workspace_resource.h
	M			libs/ui/tests/fill_processing_visitor_test.cpp
	M			libs/ui/tests/kis_derived_resources_test.cpp
	M			libs/ui/tool/kis_figure_painting_tool_helper.h
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			libs/ui/widgets/kis_preset_live_preview_view.cpp
	M			plugins/dockers/tasksetdocker/taskset_resource.cpp
	M			plugins/dockers/tasksetdocker/taskset_resource.h
	M			plugins/impex/brush/kis_brush_import.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.cpp
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
	M			plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
	P			plugins/paintops/curvebrush/kis_curve_paintop_settings.h Copied to libs/resources/KisGlobalResourcesInterface.h
	M			plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp
	M			plugins/paintops/defaultpaintops/brush/KisBrushOpResources.cpp
	M			plugins/paintops/defaultpaintops/brush/KisBrushOpSettings.cpp
	M			plugins/paintops/defaultpaintops/brush/KisBrushOpSettings.h
	M			plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
	M			plugins/paintops/deform/kis_deform_paintop_settings.cpp
	M			plugins/paintops/deform/kis_deform_paintop_settings.h
	M			plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
	M			plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
	M			plugins/paintops/experiment/kis_experiment_paintop_settings.h
	M			plugins/paintops/experiment/kis_experiment_paintop_settings_widget.cpp
	M			plugins/paintops/filterop/kis_filterop_settings.cpp
	M			plugins/paintops/filterop/kis_filterop_settings.h
	M			plugins/paintops/filterop/kis_filterop_settings_widget.cpp
	M			plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
	M			plugins/paintops/gridbrush/kis_grid_paintop_settings.h
	M			plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop.h
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.h
	M			plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
	M			plugins/paintops/hatching/kis_hatching_paintop.cpp
	M			plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
	M			plugins/paintops/hatching/kis_hatching_paintop_settings.h
	M			plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
	M			plugins/paintops/libpaintop/KisMaskingBrushOption.cpp
	M			plugins/paintops/libpaintop/KisMaskingBrushOptionProperties.cpp
	M			plugins/paintops/libpaintop/KisMaskingBrushOptionProperties.h
	M			plugins/paintops/libpaintop/KisTextureMaskInfo.cpp
	M			plugins/paintops/libpaintop/KisTextureMaskInfo.h
	M			plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop.h
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_brush_option.cpp
	M			plugins/paintops/libpaintop/kis_brush_option.h
	M			plugins/paintops/libpaintop/kis_brush_option_widget.cpp
	M			plugins/paintops/libpaintop/kis_embedded_pattern_manager.cpp
	M			plugins/paintops/libpaintop/kis_embedded_pattern_manager.h
	M			plugins/paintops/libpaintop/kis_outline_generation_policy.h
	M			plugins/paintops/libpaintop/kis_simple_paintop_factory.h
	M			plugins/paintops/libpaintop/kis_texture_option.cpp
	M			plugins/paintops/libpaintop/kis_texture_option.h
	M			plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
	M			plugins/paintops/particle/kis_particle_paintop_settings.cpp
	M			plugins/paintops/particle/kis_particle_paintop_settings.h
	M			plugins/paintops/particle/kis_particle_paintop_settings_widget.cpp
	M			plugins/paintops/roundmarker/kis_roundmarkerop_settings.cpp
	M			plugins/paintops/roundmarker/kis_roundmarkerop_settings.h
	M			plugins/paintops/roundmarker/kis_roundmarkerop_settings_widget.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop.h
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.h
	M			plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
	M			plugins/paintops/spray/kis_spray_paintop.cpp
	M			plugins/paintops/spray/kis_spray_paintop.h
	M			plugins/paintops/spray/kis_spray_paintop_settings.cpp
	M			plugins/paintops/spray/kis_spray_paintop_settings.h
	M			plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
	M			plugins/paintops/tangentnormal/kis_tangent_normal_paintop_settings_widget.cpp
	M			sdk/tests/stroke_testing_utils.cpp
	M			sdk/tests/ui_manager_test.h