Resources: Remove KoResourceLoaderThread
4f82ef7793d1
Actions

Authored by rempt on Mar 15 2018, 10:45 AM.

Description

Resources: Remove KoResourceLoaderThread

All resources were loaded synchronously by now, so KoResourceLoaderThread
was obsolete. This also moved the bundle server to it's own singleton,
since it needs a completely instantiated singleton of KisResourceServerProvider.

KisApplication now instantiates the singletons in the correct order, without
superfluously getting the actual resource providers. Since the order is now
properly known, we can clear the empty krita 3 system preset tags from the
tag database after loading the last bundles. However, the tag system seems
to be case-insensitive, but we used to have both ink and Ink; that still
needs fixing.

This fixes item 2 from

CCBUG:391576

Curiously enough, this also makes Krita start quite a bit faster for me...

(cherry picked from commit 5d361cf0c028f08f78fdf06fcd784c909d85b1b1)

Details

Committed

rempt

Mar 15 2018, 10:52 AM

Parents

R37:94d57ecaeb25: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

rempt committed R37:4f82ef7793d1: Resources: Remove KoResourceLoaderThread (authored by rempt).Mar 15 2018, 10:52 AM

Changes (63)

				Path	Packages
	M			libs/brush/kis_brush_server.cpp
	M			libs/brush/kis_brush_server.h
	M			libs/libkis/Krita.cpp
	M			libs/libqml/Settings.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/PaletteModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/PresetImageProvider.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/PresetModel.cpp
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisColorsetChooser.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisResourceBundle.cpp
	M			libs/ui/KisResourceBundleManifest.cpp
	A			libs/ui/KisResourceBundleServerProvider.cpp
	A			libs/ui/KisResourceBundleServerProvider.h
	V			libs/ui/{KisResourceServerProvider.cpp ← kis_resource_server_provider.cpp}
	V			libs/ui/{KisResourceServerProvider.h ← kis_resource_server_provider.h}
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/dialogs/kis_dlg_blacklist_cleanup.cpp
	M			libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
	M			libs/ui/dialogs/kis_dlg_layer_style.cpp
	M			libs/ui/kis_control_frame.cpp
	M			libs/ui/kis_custom_pattern.cc
	M			libs/ui/kis_favorite_resource_manager.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_popup_palette.cpp
	V			libs/ui/{kis_resource_server_provider.cpp → KisResourceServerProvider.cpp}
	V			libs/ui/{kis_resource_server_provider.h → KisResourceServerProvider.h}
	M			libs/ui/tests/ResourceBundleTest.cpp
	M			libs/ui/tests/kis_resource_server_provider_test.cpp
	M			libs/ui/widgets/kis_categorized_list_view.cpp
	M			libs/ui/widgets/kis_categorized_list_view.h
	M			libs/ui/widgets/kis_cmb_composite.cc
	M			libs/ui/widgets/kis_gradient_chooser.cc
	M			libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_save.cpp
	M			libs/ui/widgets/kis_pattern_chooser.cc
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/widgets/KoColorPopupAction.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoResourceServerProvider.cpp
	M			libs/widgets/KoResourceServerProvider.h
	M			libs/widgets/KoResourceTagStore.cpp
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/dockers/presethistory/presethistory_dock.cpp
	M			plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
	M			plugins/dockers/tasksetdocker/tasksetdocker_dock.h
	M			plugins/extensions/bigbrother/bigbrother.cc
	M			plugins/extensions/layersplit/dlg_layersplit.cpp
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/resourcemanager/dlg_create_bundle.cpp
	M			plugins/extensions/resourcemanager/resourcemanager.cpp
	M			plugins/filters/gradientmap/krita_filter_gradient_map.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/psd/psd_loader.cpp
	M			plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
	M			plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.cpp
	M			plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.h
	M			sdk/tests/ui_manager_test.h

Resources: Remove KoResourceLoaderThread4f82ef7793d1Actions

Description

Details

Changes (63)

R37:4f82ef7793d1

libs/brush/kis_brush_server.cpp

libs/brush/kis_brush_server.h

libs/libkis/Krita.cpp

libs/libqml/Settings.cpp

libs/libqml/plugins/kritasketchplugin/models/PaletteModel.cpp

libs/libqml/plugins/kritasketchplugin/models/PresetImageProvider.cpp

libs/libqml/plugins/kritasketchplugin/models/PresetModel.cpp

libs/ui/CMakeLists.txt

libs/ui/KisApplication.cpp

libs/ui/KisColorsetChooser.cpp

libs/ui/KisDocument.cpp

libs/ui/KisMainWindow.cpp

libs/ui/KisPart.cpp

libs/ui/KisResourceBundle.cpp

libs/ui/KisResourceBundleManifest.cpp

libs/ui/KisResourceBundleServerProvider.cpp

libs/ui/KisResourceBundleServerProvider.h

libs/ui/KisResourceServerProvider.cpp

libs/ui/KisResourceServerProvider.h

libs/ui/KisViewManager.cpp

libs/ui/dialogs/kis_dlg_blacklist_cleanup.cpp

libs/ui/dialogs/kis_dlg_internal_color_selector.cpp

libs/ui/dialogs/kis_dlg_layer_style.cpp

libs/ui/kis_control_frame.cpp

libs/ui/kis_custom_pattern.cc

libs/ui/kis_favorite_resource_manager.cpp

libs/ui/kis_paintop_box.cc

libs/ui/kis_popup_palette.cpp

libs/ui/kis_resource_server_provider.cpp

libs/ui/kis_resource_server_provider.h

libs/ui/tests/ResourceBundleTest.cpp

libs/ui/tests/kis_resource_server_provider_test.cpp

libs/ui/widgets/kis_categorized_list_view.cpp

libs/ui/widgets/kis_categorized_list_view.h

libs/ui/widgets/kis_cmb_composite.cc

libs/ui/widgets/kis_gradient_chooser.cc

libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp

libs/ui/widgets/kis_paintop_presets_popup.cpp

libs/ui/widgets/kis_paintop_presets_save.cpp

libs/ui/widgets/kis_pattern_chooser.cc

libs/ui/widgets/kis_preset_chooser.cpp

libs/ui/widgets/kis_workspace_chooser.cpp

libs/widgets/KoColorPopupAction.cpp

libs/widgets/KoResourceServer.h

libs/widgets/KoResourceServerProvider.cpp

libs/widgets/KoResourceServerProvider.h

libs/widgets/KoResourceTagStore.cpp

plugins/dockers/palettedocker/palettedocker_dock.cpp

plugins/dockers/presethistory/presethistory_dock.cpp

plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp

plugins/dockers/tasksetdocker/tasksetdocker_dock.h

plugins/extensions/bigbrother/bigbrother.cc

plugins/extensions/layersplit/dlg_layersplit.cpp

plugins/extensions/resourcemanager/dlg_bundle_manager.cpp

plugins/extensions/resourcemanager/dlg_create_bundle.cpp

plugins/extensions/resourcemanager/resourcemanager.cpp

plugins/filters/gradientmap/krita_filter_gradient_map.cpp

plugins/impex/libkra/kis_kra_loader.cpp

plugins/impex/psd/psd_loader.cpp

plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp

plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.cpp

plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.h

sdk/tests/ui_manager_test.h

Resources: Remove KoResourceLoaderThread
4f82ef7793d1
Actions