Diffusion Krita e9b410669646

T379-resource-management' into…
e9b410669646
Actions

Authored by dkazakov on Feb 21 2020, 12:41 PM.

Description

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

Conflicts:
libs/image/kis_psd_layer_style.cpp
libs/pigment/resources/KoColorSet.cpp
libs/resources/KisFolderStorage.cpp
libs/resources/KoResource.cpp
libs/ui/KisPaletteEditor.cpp
plugins/impex/libkra/kis_kra_loader.cpp

Details

Committed

dkazakov

Feb 21 2020, 12:41 PM

Parents

R37:ad46a9966407: Add a todo item
R37:4814602b4d14: Fix apidox for KoResourceServer

Branches

Unknown

Tags

Unknown

dkazakov committed R37:e9b410669646: Merge remote-tracking branch 'origin/rempt/T379-resource-management' into… (authored by dkazakov).Feb 21 2020, 12:41 PM

Merged Changes

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

Commit	Author	Details	Committed
4814602b4d14	rempt	Fix apidox for KoResourceServer	Feb 21 2020
6821ce3411e4	rempt	Add apidox	Feb 21 2020
da38bc96ab66	rempt	Start documenting the resources library	Feb 21 2020
458b84ebe9f3	rempt	Move KoResourceServer to the resources library	Feb 21 2020
7eb63232c863	rempt	Add a debug definition for the resources library	Feb 21 2020
496cd74b74de	woltherav	Remove the notion of editing the palette filename.	Feb 20 2020
368455c8a645	rempt	Only show folder and bundle storages in the bundle manager	Feb 20 2020
49c4e9815cd1	rempt	Fix loading palettes	Feb 20 2020
af586b81face	rempt	Fix saving palettes to .kra files	Feb 20 2020
b24f5655c12f	rempt	Simplify loading of palettes.	Feb 20 2020
39c2d9bba0b5	woltherav	Remove 'global' concept from colorset.	Feb 20 2020
3f97aec2e437	tymond	Remember the state of filterByTag checkbox	Feb 20 2020
4a2071f78447	rempt	Copy the storage if the other document has one	Feb 20 2020
11b04411b9dc	rempt	Don't crash when handing a null storage to qdebug	Feb 20 2020
d97f680c9f42	tymond	Fix TableDelegate in DbExplorer properly	Feb 20 2020
d1d2695eb637	tymond	Move calculation of a checkbox placement to separate function	Feb 20 2020
ec175691b4dd	tymond	Revert "Fix style delegate for checkboxes"	Feb 20 2020
8e6654145adb	rempt	Properly enter layerstyles in the resourcetypes table	Feb 20 2020
9e0de7cf6319	rempt	Fix updating resources in the folder storage	Feb 20 2020
74d897b03279	vanyossi	Add missing overrides	Feb 20 2020
9cccdb6afee7	rempt	debug--	Feb 20 2020
bb7572afb2de	tymond	Disable loading anything from invalid asl file	Feb 20 2020
29d00b29d83b	tymond	Add an assert in KisAslStorage	Feb 20 2020
f86caeae2d41	rempt	fix build	Feb 20 2020
ca2982b80068	rempt	Move creating the dummy layerstyle loader to KisApplication	Feb 19 2020
a11df697102a	rempt	Add KisPSDLayerStyle with a dummy loader to the loader plugin registry	Feb 19 2020
c41e868b6c61	tymond	Fix crash when loading asl with tdta OSType	Feb 19 2020
f7dbb65ab5a0	tymond	Use the model to rename sessions	Feb 19 2020
a6dbd6fb17a7	tymond	Implement 'filter by tag' and delete 'update tag'	Feb 19 2020
95251710ff0f	tymond	Clean up code in KisTagFilterResourceProxyModel	Feb 19 2020
a962907efca3	tymond	Remove obsolete code in KisActiveFilterTagProxyModel	Feb 19 2020
614bfa3494b9	rempt	Merge branch 'master' into rempt/T379-resource-management	Feb 19 2020
f42f2355b03d	rempt	Fix build error	Feb 19 2020
f2bd8795d8e6	rempt	Fix build error	Feb 19 2020
9694172b79d6	rempt	warning--	Feb 19 2020
dd8192f0caae	rempt	Fix style delegate for checkboxes	Feb 19 2020
ccd977785508	rempt	Add a filter proxy model to filter storages by filename or type	Feb 19 2020
1c283a903d3e	rempt	Rename KisPaletteListWidget to KisPaletteChooser	Feb 19 2020
78f6d4a1c2a1	rempt	Use metadata system for KoGamutMask::description	Feb 19 2020
1e35f334df7d	rempt	Separate the image from the thumbnail in KoResource	Feb 19 2020
f963fa696757	rempt	Add a createTemporaryDocument to KisPart	Feb 19 2020
38c6f99567ed	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Feb 19 2020
8edd4eb418eb	rempt	Add a separate thumbnail property to KisResource	Feb 18 2020
eef0b289c11b	rempt	Add apidox to KisAbstractResourceModel::renameResource	Feb 18 2020
e263bc7f1637	rempt	Implement metadata for Storages	Feb 18 2020
188b9729bd7a	woltherav	Fix renaming the palette name using the new renameresource.	Feb 18 2020
c76470d9a844	woltherav	Fix icon generation for palettes with groups.	Feb 18 2020
cb2284a9cc6e	rempt	Implement rename resource	Feb 18 2020
fd24e30b0bb9	woltherav	Remove resources() from colorpicker, replace with model directly.	Feb 18 2020
55abc2975c10	woltherav	Remove resources() call from palette docker dock.	Feb 18 2020

Changes (133)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/README.md
	M			libs/brush/kis_abr_brush_collection.cpp
	M			libs/flake/resources/KoGamutMask.cpp
	M			libs/flake/resources/KoSvgSymbolCollectionResource.cpp
	M			libs/image/KisAslStorage.cpp
	M			libs/image/kis_asl_layer_style_serializer.cpp
	M			libs/image/kis_asl_layer_style_serializer.h
	M			libs/image/kis_psd_layer_style.cpp
	M			libs/image/kis_psd_layer_style.h
	M			libs/libkis/Krita.cpp
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	M			libs/pigment/resources/KoColorSet_p.h
	M			libs/pigment/resources/KoPattern.h
	M			libs/psd/asl/kis_asl_reader.cpp
	M			libs/resources/CMakeLists.txt
	M			libs/resources/KisActiveFilterTagProxyModel.cpp
	P			libs/resources/KisActiveFilterTagProxyModel.h Copied to libs/resources/KisStorageFilterProxyModel.h
	M			libs/resources/KisBundleStorage.cpp
	M			libs/resources/KisBundleStorage.h
	M			libs/resources/KisFolderStorage.cpp
	M			libs/resources/KisFolderStorage.h
	M			libs/resources/KisMemoryStorage.cpp
	M			libs/resources/KisMemoryStorage.h
	M			libs/resources/KisResourceCacheDb.cpp
	M			libs/resources/KisResourceIterator.cpp
	M			libs/resources/KisResourceIterator.h
	M			libs/resources/KisResourceLoaderRegistry.h
	M			libs/resources/KisResourceLocator.cpp
	M			libs/resources/KisResourceLocator.h
	M			libs/resources/KisResourceModel.cpp
	M			libs/resources/KisResourceModel.h
	M			libs/resources/KisResourceModelProvider.h
	M			libs/resources/KisResourceSearchBoxFilter.cpp
	M			libs/resources/KisResourceSearchBoxFilter.h
	M			libs/resources/KisResourceStorage.cpp
	M			libs/resources/KisResourceStorage.h
	M			libs/resources/KisResourceTypeModel.h
	A			libs/resources/KisStorageFilterProxyModel.cpp
	P			libs/resources/KisStorageFilterProxyModel.h Copied from libs/resources/KisActiveFilterTagProxyModel.h
	M			libs/resources/KisStorageModel.cpp
	M			libs/resources/KisStorageModel.h
	M			libs/resources/KisStoragePlugin.h
	M			libs/resources/KisTagFilterResourceProxyModel.cpp
	M			libs/resources/KisTagFilterResourceProxyModel.h
	M			libs/resources/KisTagModel.cpp
	M			libs/resources/KisTagModel.h
	D			libs/resources/KoHashGenerator.h
	D			libs/resources/KoHashGeneratorProvider.cpp
	D			libs/resources/KoHashGeneratorProvider.h
	M			libs/resources/KoMD5Generator.cpp
	M			libs/resources/KoMD5Generator.h
	M			libs/resources/KoResource.cpp
	M			libs/resources/KoResource.h
	M			libs/resources/KoResourceBundle.cpp
	V			libs/{resources ← widgets}/KoResourceServer.h
	A			libs/resources/Mainpage.dox
	P			libs/resources/ResourceDebug.cpp Copied from libs/resources/tests/TestStorageModel.h
	P			libs/resources/ResourceDebug.h Copied from libs/resources/tests/TestStorageModel.h
	M			libs/resources/tests/DummyResource.h
	M			libs/resources/tests/TestBundleStorage.cpp
	M			libs/resources/tests/TestFolderStorage.cpp
	M			libs/resources/tests/TestResourceLocator.cpp
	M			libs/resources/tests/TestResourceLocator.h
	M			libs/resources/tests/TestResourceModel.cpp
	M			libs/resources/tests/TestResourceModel.h
	M			libs/resources/tests/TestStorageModel.cpp
	P			libs/resources/tests/TestStorageModel.h Copied to multiple locations: libs/resources/ResourceDebug.cpp libs/resources/ResourceDebug.h
	M			libs/resourcewidgets/KisIconToolTip.cpp
	M			libs/resourcewidgets/KisResourceItemChooser.cpp
	M			libs/resourcewidgets/KisResourceItemDelegate.cpp
	M			libs/resourcewidgets/KisResourceTaggingManager.cpp
	M			libs/resourcewidgets/KisResourceTaggingManager.h
	M			libs/resourcewidgets/KisTagFilterWidget.cpp
	M			libs/resourcewidgets/KisTagFilterWidget.h
	M			libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp
	M			libs/resourcewidgets/dbexplorer/TableModel.cpp
	M			libs/resourcewidgets/dbexplorer/TableModel.h
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPaletteEditor.cpp
	M			libs/ui/KisPaletteEditor.h
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisPart.h
	M			libs/ui/KisSessionResource.cpp
	M			libs/ui/KisSessionResource.h
	M			libs/ui/KisWelcomePageWidget.cpp
	M			libs/ui/dialogs/KisDlgPaletteEditor.cpp
	M			libs/ui/dialogs/KisDlgPaletteEditor.h
	M			libs/ui/dialogs/KisSessionManagerDialog.cpp
	M			libs/ui/dialogs/KisSessionManagerDialog.h
	M			libs/ui/forms/WdgDlgPaletteEditor.ui
	M			libs/ui/forms/wdgpaintopsettings.ui
	M			libs/ui/forms/wdgsessionmanager.ui
	M			libs/ui/kis_favorite_resource_manager.cpp
	D			libs/ui/kis_md5_generator.h
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_save.cpp
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/widgets/CMakeLists.txt
	D			libs/widgets/KisColorsetChooser.h
	M			libs/widgets/KisDlgInternalColorSelector.cpp
	V			libs/widgets/{KisPaletteChooser.cpp ← KisPaletteListWidget.cpp}
	V			libs/widgets/{KisPaletteChooser.h ← KisPaletteListWidget.h}
	V			libs/widgets/{KisPaletteChooser_p.h ← KisPaletteListWidget_p.h}
	V			libs/widgets/{KisPaletteListWidget.cpp → KisPaletteChooser.cpp}
	V			libs/widgets/{KisPaletteListWidget.h → KisPaletteChooser.h}
	V			libs/widgets/{KisPaletteListWidget_p.h → KisPaletteChooser_p.h}
	M			libs/widgets/KisPaletteModel.cpp
	M			libs/widgets/KisPaletteModel.h
	M			libs/widgets/KoColorSetWidget.cpp
	M			libs/widgets/KoColorSetWidget_p.h
	V			libs/{widgets → resources}/KoResourceServer.h
	M			libs/widgets/kis_palette_view.cpp
	M			libs/widgets/kis_palette_view.h
	M			plugins/dockers/gamutmask/KisGamutMaskChooser.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.h
	M			plugins/extensions/layersplit/dlg_layersplit.cpp
	M			plugins/extensions/layersplit/dlg_layersplit.h
	M			plugins/extensions/pykrita/kritarunner/main.cpp
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/resourcemanager/dlg_create_bundle.cpp
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_saver.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_docker.desktop
	M			plugins/tools/basictools/kis_tool_colorpicker.cc
	M			plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.cpp