https://bugs.kde.org/show_bug.cgi?id=352149
Boudewijn Rempt <b...@valdyas.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|CONFIRMED |RESOLVED Latest Commit| |http://commits.kde.org/krit | |a/42a7a211de6f271b0e8b1679d | |648ad684c6eae30 Resolution|--- |FIXED --- Comment #3 from Boudewijn Rempt <b...@valdyas.org> --- Git commit 42a7a211de6f271b0e8b1679d648ad684c6eae30 by Boudewijn Rempt. Committed on 22/01/2016 at 13:32. Pushed by rempt into branch 'master'. This now loads the bundles at the end of loading all resources. M +0 -4 krita/plugins/extensions/resourcemanager/CMakeLists.txt M +13 -12 krita/plugins/extensions/resourcemanager/dlg_bundle_manager.cpp M +5 -5 krita/plugins/extensions/resourcemanager/dlg_bundle_manager.h M +2 -2 krita/plugins/extensions/resourcemanager/dlg_create_bundle.cpp M +3 -3 krita/plugins/extensions/resourcemanager/dlg_create_bundle.h M +5 -57 krita/plugins/extensions/resourcemanager/resourcemanager.cpp M +3 -20 krita/plugins/extensions/resourcemanager/resourcemanager.h M +2 -0 krita/ui/CMakeLists.txt M +1 -0 krita/ui/KisApplication.cpp C +48 -54 krita/ui/KisResourceBundle.cpp [from: krita/plugins/extensions/resourcemanager/resourcebundle.cpp - 090% similarity] C +7 -5 krita/ui/KisResourceBundle.h [from: krita/plugins/extensions/resourcemanager/resourcebundle.h - 094% similarity] C +11 -11 krita/ui/KisResourceBundleManifest.cpp [from: krita/plugins/extensions/resourcemanager/resourcebundle_manifest.cpp - 090% similarity] C +5 -3 krita/ui/KisResourceBundleManifest.h [from: krita/plugins/extensions/resourcemanager/resourcebundle_manifest.h - 094% similarity] M +21 -0 krita/ui/kis_resource_server_provider.cpp M +6 -3 krita/ui/kis_resource_server_provider.h C +0 -0 krita/ui/resourcemanager/CMakeLists.txt [from: krita/plugins/extensions/resourcemanager/CMakeLists.txt - 100% similarity] A +1 -0 krita/ui/resourcemanager/NOTES C +0 -0 krita/ui/resourcemanager/dlg_bundle_manager.cpp [from: krita/plugins/extensions/resourcemanager/dlg_bundle_manager.cpp - 100% similarity] C +0 -0 krita/ui/resourcemanager/dlg_bundle_manager.h [from: krita/plugins/extensions/resourcemanager/dlg_bundle_manager.h - 100% similarity] C +0 -0 krita/ui/resourcemanager/dlg_create_bundle.cpp [from: krita/plugins/extensions/resourcemanager/dlg_create_bundle.cpp - 100% similarity] C +0 -0 krita/ui/resourcemanager/dlg_create_bundle.h [from: krita/plugins/extensions/resourcemanager/dlg_create_bundle.h - 100% similarity] A +9 -0 krita/ui/resourcemanager/kritaresourcemanager.json R +0 -0 krita/ui/resourcemanager/resourcebundle.cpp [from: krita/plugins/extensions/resourcemanager/resourcebundle.cpp - 100% similarity] R +0 -0 krita/ui/resourcemanager/resourcebundle.h [from: krita/plugins/extensions/resourcemanager/resourcebundle.h - 100% similarity] R +0 -0 krita/ui/resourcemanager/resourcebundle_manifest.cpp [from: krita/plugins/extensions/resourcemanager/resourcebundle_manifest.cpp - 100% similarity] R +0 -0 krita/ui/resourcemanager/resourcebundle_manifest.h [from: krita/plugins/extensions/resourcemanager/resourcebundle_manifest.h - 100% similarity] C +0 -0 krita/ui/resourcemanager/resourcemanager.cpp [from: krita/plugins/extensions/resourcemanager/resourcemanager.cpp - 100% similarity] C +0 -0 krita/ui/resourcemanager/resourcemanager.h [from: krita/plugins/extensions/resourcemanager/resourcemanager.h - 100% similarity] A +13 -0 krita/ui/resourcemanager/resourcemanager.rc R +0 -0 krita/ui/resourcemanager/tests/CMakeLists.txt [from: krita/plugins/extensions/resourcemanager/tests/CMakeLists.txt - 100% similarity] C +0 -0 krita/ui/resourcemanager/tests/ResourceBundleTest.cpp [from: krita/plugins/extensions/resourcemanager/tests/ResourceBundleTest.cpp - 100% similarity] C +0 -0 krita/ui/resourcemanager/tests/ResourceBundleTest.h [from: krita/plugins/extensions/resourcemanager/tests/ResourceBundleTest.h - 100% similarity] C +- -- krita/ui/resourcemanager/tests/data/thumb.png [from: krita/plugins/extensions/resourcemanager/tests/data/thumb.png - 100% similarity] A +539 -0 krita/ui/resourcemanager/wdgdlgbundlemanager.ui A +466 -0 krita/ui/resourcemanager/wdgdlgcreatebundle.ui M +7 -0 krita/ui/tests/CMakeLists.txt R +4 -4 krita/ui/tests/ResourceBundleTest.cpp [from: krita/plugins/extensions/resourcemanager/tests/ResourceBundleTest.cpp - 096% similarity] R +0 -0 krita/ui/tests/ResourceBundleTest.h [from: krita/plugins/extensions/resourcemanager/tests/ResourceBundleTest.h - 100% similarity] R +- -- krita/ui/tests/data/thumb.png [from: krita/plugins/extensions/resourcemanager/tests/data/thumb.png - 100% similarity] M +1 -0 libs/widgets/KoResourceServerProvider.cpp http://commits.kde.org/krita/42a7a211de6f271b0e8b1679d648ad684c6eae30 -- You are receiving this mail because: You are watching all bug changes.