Diffusion Krita 415baf3c22a9

Merge branch 'rempt/resourcemodel_rewrite' into 'master'
415baf3c22a9
Actions

Authored by rempt on Jun 26 2020, 4:35 PM.

Description

Merge branch 'rempt/resourcemodel_rewrite' into 'master'

use begin|end|Insert|RemoveRows instead of resetting the model

See merge request graphics/krita!303

Details

Committed

rempt

Jun 26 2020, 4:35 PM

Parents

R37:331802121213: Merge branch 'master' into rempt/resourcemodel_rewrite
R37:689fe924c567: Add a unittest for cloning layer styles

Branches

Unknown

Tags

Unknown

References

refs/merge-requests/303/merge

rempt committed R37:415baf3c22a9: Merge branch 'rempt/resourcemodel_rewrite' into 'master' (authored by rempt).Jun 26 2020, 4:35 PM

Merged Changes

Commit	Author	Details	Committed
331802121213	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 24 2020
e2a92f26e948	rempt	Add some clarifying dox	Jun 24 2020
820246eba21f	rempt	Fix using the tagmodel's enums	Jun 24 2020
6412d2f60637	rempt	Refactor KisTagModel	Jun 24 2020
27e49757bac8	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 24 2020
8f68fc901d55	rempt	Remove resetModel method	Jun 19 2020
992da7308733	rempt	fix whitespace	Jun 19 2020
1881d3dcdb8f	rempt	Call invalidateFilter when changing the resource or storage filter	Jun 19 2020
47353e282d2c	rempt	Remove KisResourceModelProvider::resetModel	Jun 19 2020
a22a0499d1bf	rempt	Remove KisResourceModelProvider::resetAllModels	Jun 19 2020
9679c486d7b9	rempt	Make method private; it's only used inside KisTagModel	Jun 19 2020
df036799363d	rempt	remove the resetModel(s) methods for the tag model	Jun 19 2020
43412fa75a94	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 18 2020
91936f7f51b5	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 15 2020
518dc1c76eef	rempt	Fix logic for adding a new resource version	Jun 15 2020
226bf8eff67c	rempt	Fix call to beginInsertRows	Jun 15 2020
113f7517dd99	rempt	Return false if adding the resource failed	Jun 11 2020
ab367eb46b1e	rempt	KisResourceModel: add dataChanged signals	Jun 11 2020
10878b2d252c	rempt	setData must emit dataChanged if setting the data was succesful	Jun 11 2020
2b203a81dddc	rempt	make KisResourceCacheDb a friend of KoResource	Jun 11 2020
0710121dbe0d	rempt	Set the resourceid on the resource after inserting it in the database	Jun 11 2020
ca81477d7cd1	rempt	Be a bit more silent for now	Jun 11 2020
07c68da7056d	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 11 2020
ce6207f67b98	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 11 2020
cb588bdde0e1	rempt	debug--	Jun 11 2020
f402efa6f582	rempt	Make less noise	Jun 11 2020
e482192e9552	rempt	Fix signal name	Jun 11 2020
6b51b619865e	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 11 2020
bc99908bcdab	rempt	Add apidox	Jun 9 2020
de62a20a939b	rempt	Rename removeResource to setResourceInactive	Jun 9 2020
33f24d876fc7	rempt	Update the KisResourceModel hierarchy	Jun 9 2020
9d699508cd76	rempt	Remove storageByFile methods	Jun 9 2020
2f056fb17ba1	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	Jun 9 2020
ddc4f481eb6e	rempt	Add a model to filter resources for active status and status of their storage	Jun 9 2020
b744b77baf63	rempt	Order the query by id	May 28 2020
3910cac4aa63	rempt	Merge branch 'master' into rempt/resourcemodel_rewrite	May 28 2020
d212a4b25eed	rempt	Fix using the range constructor api of QSet	Apr 24 2020
7867b5e0dc3e	rempt	Remove KisStorageModel::resetQuery	Apr 16 2020
88412edd06be	rempt	Remove useless call to QAbstractItemModel::setData()	Apr 16 2020

Changes (68)

				Path	Packages
	M			libs/libkis/Krita.cpp
	M			libs/resources/CMakeLists.txt
	D			libs/resources/KisActiveFilterTagProxyModel.cpp
	D			libs/resources/KisActiveFilterTagProxyModel.h
	M			libs/resources/KisResourceCacheDb.cpp
	M			libs/resources/KisResourceCacheDb.h
	M			libs/resources/KisResourceIterator.cpp
	M			libs/resources/KisResourceLocator.cpp
	M			libs/resources/KisResourceLocator.h
	M			libs/resources/KisResourceModel.cpp
	M			libs/resources/KisResourceModel.h
	M			libs/resources/KisResourceModelProvider.cpp
	M			libs/resources/KisResourceModelProvider.h
	M			libs/resources/KisResourceStorage.cpp
	M			libs/resources/KisResourceStorage.h
	A			libs/resources/KisResourcesActiveFilterModel.cpp
	P			libs/resources/KisResourcesActiveFilterModel.h Copied from libs/resources/KisTagFilterResourceProxyModel.h
	M			libs/resources/KisStorageFilterProxyModel.cpp
	M			libs/resources/KisStorageFilterProxyModel.h
	M			libs/resources/KisStorageModel.cpp
	M			libs/resources/KisStorageModel.h
	M			libs/resources/KisTag.cpp
	M			libs/resources/KisTag.h
	M			libs/resources/KisTagFilterResourceProxyModel.cpp
	P			libs/resources/KisTagFilterResourceProxyModel.h Copied to libs/resources/KisResourcesActiveFilterModel.h
	M			libs/resources/KisTagModel.cpp
	M			libs/resources/KisTagModel.h
	M			libs/resources/KisTagModelProvider.cpp
	M			libs/resources/KisTagModelProvider.h
	M			libs/resources/KoResource.h
	M			libs/resources/KoResourceServer.h
	M			libs/resources/tests/CMakeLists.txt
	M			libs/resources/tests/TestResourceLocator.cpp
	M			libs/resources/tests/TestResourceLocator.h
	M			libs/resources/tests/TestResourceModel.cpp
	P			libs/resources/tests/TestStorageFilterProxyModel.cpp Copied from libs/resources/tests/TestTagModel.cpp
	P			libs/resources/tests/TestStorageFilterProxyModel.h Copied from libs/resources/tests/TestTagFilterResourceProxyModel.h
	M			libs/resources/tests/TestStorageModel.cpp
	M			libs/resources/tests/TestTagFilterResourceProxyModel.cpp
	P			libs/resources/tests/TestTagModel.cpp Copied to libs/resources/tests/TestStorageFilterProxyModel.cpp
	M			libs/resourcewidgets/KisIconToolTip.cpp
	M			libs/resourcewidgets/KisResourceItemChooser.cpp
	M			libs/resourcewidgets/KisResourceItemChooser.h
	M			libs/resourcewidgets/KisResourceItemChooserContextMenu.cpp
	M			libs/resourcewidgets/KisResourceItemDelegate.cpp
	M			libs/resourcewidgets/KisTagChooserWidget.cpp
	M			libs/resourcewidgets/KisTagChooserWidget.h
	M			libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp
	M			libs/resourcewidgets/dbexplorer/DlgDbExplorer.h
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/dialogs/KisSessionManagerDialog.cpp
	M			libs/ui/dialogs/kis_dlg_layer_style.cpp
	M			libs/ui/kis_favorite_resource_manager.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/widgets/KisPaletteChooser.cpp
	M			libs/widgets/KoResourcePopupAction.cpp
	M			libs/widgetutils/KoItemToolTip.h
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/gamutmask/KisGamutMaskChooser.cpp
	M			plugins/dockers/svgcollectiondocker/SvgSymbolCollectionDocker.cpp
	M			plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
	M			plugins/extensions/resourcemanager/dlg_create_bundle.cpp
	M			plugins/extensions/resourcemanager/dlg_embed_tags.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/tools/basictools/kis_tool_colorpicker.cc