Review Request: use the global iconloader for KoTemplate::loadPicture(), so calligra icons are found

[Friedrich W. H. Kossebau]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/105429/
-----------------------------------------------------------

Review request for Calligra and Cyrille Berger Skott.


Description
-------

As can be seen with the Design Templates in Krita, the KIconLoader based on the componentData of the part does not find icons in the calligra dir.
The reason is that it never learned about the calligra icons, only the global iconloader did (which is based on the main componentData which is set by KoApplication). 
Also creating a KIconLoader instance is quite expensive, as it scans all folders (from what I can tell), so better not do that on the fly.

Basing the used KIconLoader directly on the component data to make sure the document type/app specific icon dirs are used is not needed ATM, as KoDocuments are only used in KoApplications currently. I started a bigger patch which adds a KIconLoader instance to each document factory, but that got a bigger patch in making it complete. There are also quite some KIcon usages (which defaults to use the global KIconLoader), so the real fix would be even greater. So I stayed away from that and spared you the review :) I have already enough review request put in the pipe ;)


Diffs
-----

  libs/main/KoOpenPane.cpp 568ce88 
  libs/main/KoTemplate.h 2505126 
  libs/main/KoTemplate.cpp e74aaa4 
  libs/main/KoTemplateCreateDia.cpp c6b79f8 
  libs/main/KoTemplatesPane.cpp cc76c05 

Diff: http://git.reviewboard.kde.org/r/105429/diff/


Testing
-------

Used Template creation dialog and Templates pane in Words, Krita, and others.


Thanks,

Friedrich W. H. Kossebau

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20120703/4e80f902/attachment.htm>