[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-15 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

Boudewijn Rempt  changed:

   What|Removed |Added

 Resolution|--- |FIXED
  Latest Commit||https://commits.kde.org/kri
   ||ta/97015cd2e48d30d746017879
   ||2f29c76d01d9cfca
 Status|CONFIRMED   |RESOLVED

--- Comment #5 from Boudewijn Rempt  ---
Git commit 97015cd2e48d30d7460178792f29c76d01d9cfca by Boudewijn Rempt.
Committed on 15/03/2018 at 14:50.
Pushed by rempt into branch 'master'.

Make sure the tag combobox only has unique tags

As far as I can tell, item 3 in bug 391576 was only cosmetical;
the tag store did not have actually duplicated tags, so make sure
we deduplicate the tags in the combobox before updating the
widget.

M  +8-9libs/widgets/KoTagChooserWidget.cpp

https://commits.kde.org/krita/97015cd2e48d30d7460178792f29c76d01d9cfca

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-15 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

Boudewijn Rempt  changed:

   What|Removed |Added

  Latest Commit|https://commits.kde.org/kri |https://commits.kde.org/kri
   |ta/97015cd2e48d30d746017879 |ta/51f5066165d7dc9edf7d207c
   |2f29c76d01d9cfca|9d63df063baf72bb

--- Comment #6 from Boudewijn Rempt  ---
Git commit 51f5066165d7dc9edf7d207c9d63df063baf72bb by Boudewijn Rempt.
Committed on 15/03/2018 at 14:52.
Pushed by rempt into branch 'krita/4.0'.

Make sure the tag combobox only has unique tags

As far as I can tell, item 3 in bug 391576 was only cosmetical;
the tag store did not have actually duplicated tags, so make sure
we deduplicate the tags in the combobox before updating the
widget.

M  +8-9libs/widgets/KoTagChooserWidget.cpp

https://commits.kde.org/krita/51f5066165d7dc9edf7d207c9d63df063baf72bb

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-15 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

--- Comment #4 from Boudewijn Rempt  ---
Git commit 4c540a27282eba8816e226a4e2f400ec701f2944 by Boudewijn Rempt.
Committed on 15/03/2018 at 14:27.
Pushed by rempt into branch 'krita/4.0'.

Load the tags in a separate step after loading all resources

This also refactors KoTagStore to remove two methods the use
of which has disappeared in the mists of time, and that
prevented some tags to be loaded for default resources.

Now all Deevad's tags are loaded; all system tags used for
custom resources in 3.3 are kept; all custom tags created
in 3.3 are kept.

The regression from the previous commit, where the krita 3
bundle was loaded even if disabled is also fixed...

Items 1, 2 and 4 of 391576 are resolved now, at least as
far as I can see. I haven't dared look at item 3 yet...

M  +194  -194  krita/data/paintoppresets/kis_paintoppresets_tags.xml
M  +1-1libs/image/brushengine/kis_paintop_registry.cc
M  +1-0libs/image/filter/kis_filter_registry.cc
M  +1-0libs/image/generator/kis_generator_registry.cpp
M  +42   -8libs/ui/KisApplication.cpp
M  +2-0libs/ui/KisApplication.h
M  +3-2libs/ui/KisResourceBundleServerProvider.cpp
M  +24   -18   libs/widgets/KoResourceServer.h
M  +9-0libs/widgets/KoResourceServerProvider.h
M  +36   -62   libs/widgets/KoResourceTagStore.cpp
M  +0-9libs/widgets/KoResourceTagStore.h
M  +3-0libs/widgetutils/kis_action_registry.cpp
M  +1-0plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
M  +0-2plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
M  +1-0   
plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.cpp

https://commits.kde.org/krita/4c540a27282eba8816e226a4e2f400ec701f2944

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-15 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

--- Comment #3 from Boudewijn Rempt  ---
Git commit 69d8a5e192698011ca600b66f0a774ac0b6d6d49 by Boudewijn Rempt.
Committed on 15/03/2018 at 14:24.
Pushed by rempt into branch 'master'.

Load the tags in a separate step after loading all resources

This also refactors KoTagStore to remove two methods the use
of which has disappeared in the mists of time, and that
prevented some tags to be loaded for default resources.

Now all Deevad's tags are loaded; all system tags used for
custom resources in 3.3 are kept; all custom tags created
in 3.3 are kept.

The regression from the previous commit, where the krita 3
bundle was loaded even if disabled is also fixed...

Items 1, 2 and 4 of 391576 are resolved now, at least as
far as I can see. I haven't dared look at item 3 yet...

M  +194  -194  krita/data/paintoppresets/kis_paintoppresets_tags.xml
M  +1-1libs/image/brushengine/kis_paintop_registry.cc
M  +1-0libs/image/filter/kis_filter_registry.cc
M  +1-0libs/image/generator/kis_generator_registry.cpp
M  +42   -8libs/ui/KisApplication.cpp
M  +2-0libs/ui/KisApplication.h
M  +3-2libs/ui/KisResourceBundleServerProvider.cpp
M  +24   -18   libs/widgets/KoResourceServer.h
M  +9-0libs/widgets/KoResourceServerProvider.h
M  +36   -62   libs/widgets/KoResourceTagStore.cpp
M  +0-9libs/widgets/KoResourceTagStore.h
M  +3-0libs/widgetutils/kis_action_registry.cpp
M  +1-0plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
M  +0-2plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
M  +1-0   
plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.cpp

https://commits.kde.org/krita/69d8a5e192698011ca600b66f0a774ac0b6d6d49

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-15 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

--- Comment #2 from Boudewijn Rempt  ---
Git commit 4f82ef7793d1341fb19b7dd60095f4096a868886 by Boudewijn Rempt.
Committed on 15/03/2018 at 10:52.
Pushed by rempt into branch 'krita/4.0'.

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

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

(cherry picked from commit 5d361cf0c028f08f78fdf06fcd784c909d85b1b1)

M  +3-11   libs/brush/kis_brush_server.cpp
M  +1-7libs/brush/kis_brush_server.h
M  +1-1libs/libkis/Krita.cpp
M  +1-1libs/libqml/Settings.cpp
M  +1-1libs/libqml/plugins/kritasketchplugin/models/PaletteModel.cpp
M  +1-1   
libs/libqml/plugins/kritasketchplugin/models/PresetImageProvider.cpp
M  +1-1libs/libqml/plugins/kritasketchplugin/models/PresetModel.cpp
M  +2-1libs/ui/CMakeLists.txt
M  +9-24   libs/ui/KisApplication.cpp
M  +4-4libs/ui/KisColorsetChooser.cpp
M  +1-1libs/ui/KisDocument.cpp
M  +3-3libs/ui/KisMainWindow.cpp
M  +1-1libs/ui/KisPart.cpp
M  +1-1libs/ui/KisResourceBundle.cpp
M  +1-1libs/ui/KisResourceBundleManifest.cpp
A  +69   -0libs/ui/KisResourceBundleServerProvider.cpp [License: GPL
(v2+)]
A  +53   -0libs/ui/KisResourceBundleServerProvider.h [License: GPL
(v2+)]
R  +7-65   libs/ui/KisResourceServerProvider.cpp [from:
libs/ui/kis_resource_server_provider.cpp - 057% similarity]
R  +4-14   libs/ui/KisResourceServerProvider.h [from:
libs/ui/kis_resource_server_provider.h - 081% similarity]
M  +1-1libs/ui/KisViewManager.cpp
M  +1-1libs/ui/dialogs/kis_dlg_blacklist_cleanup.cpp
M  +1-1libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
M  +1-1libs/ui/dialogs/kis_dlg_layer_style.cpp
M  +2-2libs/ui/kis_control_frame.cpp
M  +2-2libs/ui/kis_custom_pattern.cc
M  +4-4libs/ui/kis_favorite_resource_manager.cpp
M  +3-3libs/ui/kis_paintop_box.cc
M  +1-1libs/ui/kis_popup_palette.cpp
M  +1-1libs/ui/tests/ResourceBundleTest.cpp
M  +1-1libs/ui/tests/kis_resource_server_provider_test.cpp
M  +30   -1libs/ui/widgets/kis_categorized_list_view.cpp
M  +3-4libs/ui/widgets/kis_categorized_list_view.h
M  +1-0libs/ui/widgets/kis_cmb_composite.cc
M  +1-1libs/ui/widgets/kis_gradient_chooser.cc
M  +1-1libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp
M  +1-1libs/ui/widgets/kis_paintop_presets_popup.cpp
M  +1-1libs/ui/widgets/kis_paintop_presets_save.cpp
M  +2-2libs/ui/widgets/kis_pattern_chooser.cc
M  +2-2libs/ui/widgets/kis_preset_chooser.cpp
M  +2-2libs/ui/widgets/kis_workspace_chooser.cpp
M  +1-1libs/widgets/KoColorPopupAction.cpp
M  +4-1libs/widgets/KoResourceServer.h
M  +18   -94   libs/widgets/KoResourceServerProvider.cpp
M  +5-39   libs/widgets/KoResourceServerProvider.h
M  +5-0libs/widgets/KoResourceTagStore.cpp
M  +1-1plugins/dockers/palettedocker/palettedocker_dock.cpp
M  +1-1plugins/dockers/presethistory/presethistory_dock.cpp
M  +3-10   plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
M  +1-3plugins/dockers/tasksetdocker/tasksetdocker_dock.h
M  +1-1plugins/extensions/bigbrother/bigbrother.cc
M  +1-1plugins/extensions/layersplit/dlg_layersplit.cpp
M  +4-4plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
M  +1-1plugins/extensions/resourcemanager/dlg_create_bundle.cpp
M  +17   -17   plugins/extensions/resourcemanager/resourcemanager.cpp
M  +3-3plugins/filters/gradientmap/krita_filter_gradient_map.cpp
M  +1-1plugins/impex/libkra/kis_kra_loader.cpp
M  +1-1plugins/impex/psd/psd_loader.cpp
M  +1-1   
plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
M  +1-4   
plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.cpp
M  +0-2   
plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.h
M  +1-1sdk/tests/ui_manager_test.h

https://commits.kde.org/krita/4f82ef7793d1341fb19b7dd60095f4096a868886

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-15 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

--- Comment #1 from Boudewijn Rempt  ---
Git commit 5d361cf0c028f08f78fdf06fcd784c909d85b1b1 by Boudewijn Rempt.
Committed on 15/03/2018 at 10:45.
Pushed by rempt into branch 'master'.

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

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

M  +3-11   libs/brush/kis_brush_server.cpp
M  +1-7libs/brush/kis_brush_server.h
M  +1-1libs/libkis/Krita.cpp
M  +1-1libs/libqml/Settings.cpp
M  +1-1libs/libqml/plugins/kritasketchplugin/models/PaletteModel.cpp
M  +1-1   
libs/libqml/plugins/kritasketchplugin/models/PresetImageProvider.cpp
M  +1-1libs/libqml/plugins/kritasketchplugin/models/PresetModel.cpp
M  +2-1libs/ui/CMakeLists.txt
M  +9-24   libs/ui/KisApplication.cpp
M  +4-4libs/ui/KisColorsetChooser.cpp
M  +1-1libs/ui/KisDocument.cpp
M  +3-3libs/ui/KisMainWindow.cpp
M  +1-1libs/ui/KisPart.cpp
M  +1-1libs/ui/KisResourceBundle.cpp
M  +1-1libs/ui/KisResourceBundleManifest.cpp
A  +69   -0libs/ui/KisResourceBundleServerProvider.cpp [License: GPL
(v2+)]
A  +53   -0libs/ui/KisResourceBundleServerProvider.h [License: GPL
(v2+)]
R  +7-65   libs/ui/KisResourceServerProvider.cpp [from:
libs/ui/kis_resource_server_provider.cpp - 057% similarity]
R  +4-14   libs/ui/KisResourceServerProvider.h [from:
libs/ui/kis_resource_server_provider.h - 081% similarity]
M  +1-1libs/ui/KisViewManager.cpp
M  +1-1libs/ui/dialogs/kis_dlg_blacklist_cleanup.cpp
M  +1-1libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
M  +1-1libs/ui/dialogs/kis_dlg_layer_style.cpp
M  +2-2libs/ui/kis_control_frame.cpp
M  +2-2libs/ui/kis_custom_pattern.cc
M  +4-4libs/ui/kis_favorite_resource_manager.cpp
M  +3-3libs/ui/kis_paintop_box.cc
M  +1-1libs/ui/kis_popup_palette.cpp
M  +1-1libs/ui/tests/ResourceBundleTest.cpp
M  +1-1libs/ui/tests/kis_resource_server_provider_test.cpp
M  +30   -1libs/ui/widgets/kis_categorized_list_view.cpp
M  +3-4libs/ui/widgets/kis_categorized_list_view.h
M  +1-0libs/ui/widgets/kis_cmb_composite.cc
M  +1-1libs/ui/widgets/kis_gradient_chooser.cc
M  +1-1libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp
M  +1-1libs/ui/widgets/kis_paintop_presets_popup.cpp
M  +1-1libs/ui/widgets/kis_paintop_presets_save.cpp
M  +2-2libs/ui/widgets/kis_pattern_chooser.cc
M  +2-2libs/ui/widgets/kis_preset_chooser.cpp
M  +2-2libs/ui/widgets/kis_workspace_chooser.cpp
M  +1-1libs/widgets/KoColorPopupAction.cpp
M  +4-1libs/widgets/KoResourceServer.h
M  +18   -94   libs/widgets/KoResourceServerProvider.cpp
M  +5-39   libs/widgets/KoResourceServerProvider.h
M  +5-0libs/widgets/KoResourceTagStore.cpp
M  +1-1plugins/dockers/palettedocker/palettedocker_dock.cpp
M  +1-1plugins/dockers/presethistory/presethistory_dock.cpp
M  +3-10   plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
M  +1-3plugins/dockers/tasksetdocker/tasksetdocker_dock.h
M  +1-1plugins/extensions/bigbrother/bigbrother.cc
M  +1-1plugins/extensions/layersplit/dlg_layersplit.cpp
M  +4-4plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
M  +1-1plugins/extensions/resourcemanager/dlg_create_bundle.cpp
M  +17   -17   plugins/extensions/resourcemanager/resourcemanager.cpp
M  +3-3plugins/filters/gradientmap/krita_filter_gradient_map.cpp
M  +1-1plugins/impex/libkra/kis_kra_loader.cpp
M  +1-1plugins/impex/psd/psd_loader.cpp
M  +1-1   
plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
M  +1-4   
plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.cpp
M  +0-2   
plugins/tools/karbonplugins/tools/filterEffectTool/FilterResourceServerProvider.h
M  +1-1sdk/tests/ui_manager_test.h

https://commits.kde.org/krita/5d361cf0c028f08f78fdf06fcd784c909d85b1b1

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-12 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

Boudewijn Rempt  changed:

   What|Removed |Added

   Keywords||release_blocker
 Ever confirmed|0   |1
 Status|UNCONFIRMED |CONFIRMED

-- 
You are receiving this mail because:
You are watching all bug changes.

[krita] [Bug 391576] [tags] [paintoppresets] Tags blacklist issue, "★ My Favorites" empty, list expanding

2018-03-12 Thread Boudewijn Rempt 
https://bugs.kde.org/show_bug.cgi?id=391576

Boudewijn Rempt  changed:

   What|Removed |Added

   Assignee|krita-bugs-n...@kde.org |b...@valdyas.org
 CC||b...@valdyas.org

-- 
You are receiving this mail because:
You are watching all bug changes.