Skip to content
  • Halla Rempt's avatar
    Merge origin/calligra-resource_md5-rempt into master · d8ee0554
    Halla Rempt authored
    This makes it possible to id resources by an md5 sum.
    
    It also prepares for deferred resource loading by splitting
    the image() method of some resources into the image used
    for icons, and the actual resource data used as e.g. brush
    or pattern.
    
    Squashed commit of the following:
    
    commit aaf181254f8fe3800c589687566e6036ed100f5d
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu May 1 14:06:57 2014 +0200
    
        Make saving/loading tags work again
    
        Tags now work primarily with md5, then with the filename without the
        path. In some places, Krita was already adapted to work with just the
        file names, in others not yet.
    
        Also: reinstate the KoResourceTaggingTest and make it actually work
        without depending on a given user setting.
    
    commit 4cdc4e1e11a8ae550e1104108d929d4052ba3411
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu May 1 11:31:49 2014 +0200
    
        Add methods to get a resource by filename or md5
    
        The filename is stripped of the path; the tagstore stores the full
        path for compatibility with gimp, but we won't find any resource by
        using the full path since we use only the filename.
    
    commit ecfbdfe1ee4c65ac3254ca63f2097d905e690a47
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu May 1 10:29:01 2014 +0200
    
        Add some debug
    
    commit ea1738f1497f6e5252b860cc2ed4d31f8e5d03b0
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu May 1 10:10:41 2014 +0200
    
        Try to find the tagged resource using both md5 and filename
    
    commit 971b55530f60561b16b76dd741e9b2657efe1a96
    Merge: e760836 e0a2654
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu May 1 09:13:26 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
    commit e760836a20c25ff8d6be71d01e00b5179164db99
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Wed Apr 30 20:18:14 2014 +0200
    
        Use the actual resource in the tagging database
    
        (intermediate, needs fixing)
    
    commit 39a780fbba3c5a736245ba8b34408a5a2927321d
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Wed Apr 30 11:47:25 2014 +0200
    
        Remove unused conversion method
    
        The tag store now keeps pointers to the resources
    
    commit c6b23d8eb01c18d9aa3a083345c03b89771c4259
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Wed Apr 30 10:41:38 2014 +0200
    
        Remove the resourcetagging test altogether
    
        It was broken by design because it depends on the tag store in the local
        user's .kde directory.
    
    commit 5ffd7c7f0bdb8f5c0e2a3ddc67445fddb0b2276d
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Wed Apr 30 10:31:43 2014 +0200
    
        Add hash function using the md5 sum for KoResource
    
    commit edceb9e3e59ff887333d37ac68b136ab1a53373b
    Merge: b502624 93475d4
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 29 11:49:31 2014 +0200
    
        Merge remote-tracking branch 'origin/master' into calligra-resource_md5-rempt
    
    commit b502624e453a64d880ed346977b67a3807128228
    Merge: fcc7adf 6871ea1
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 29 10:11:36 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
    commit fcc7adf61a26c570b86c1aad847dca8ebae83f61
    Merge: 7e892ab 6942088
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon Apr 28 09:12:39 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
    commit 7e892ab6ee5437253ad6d37a66563e767f5b05f8
    Merge: 931fc5e aeeef4b
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 25 09:07:59 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
        Conflicts:
        	libs/widgets/KoResourceFiltering.cpp
    
    commit 931fc5ee1bd82db5d64d9371e87e7adcd16fd9cf
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 18 20:10:53 2014 +0200
    
        Warnings--
    
    commit 9e0be15ca6fdcf5c54986cd4ed98a0a27d1eff2a
    Merge: 9044045 a51c97c
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Wed Apr 16 10:29:03 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
        Conflicts:
        	libs/widgets/KoFileDialog.cpp
    
    commit 9044045b5a606ef040c70af871e5bfc5ac7586a0
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Wed Apr 16 09:38:10 2014 +0200
    
        Move to using md5 in the tagstore
    
    commit 050007c30216534863a7b9d5a633d1291fb50ada
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 15:52:43 2014 +0200
    
        more tagObject -> tagStore renaming
    
    commit ffd1a0cc68d75d9b87948eef1dd846ac14b4f1a1
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 15:44:10 2014 +0200
    
        Also store the md5sum in the tag repository.
    
    commit 7a319b1234fe6d42abf5a4c625d6e0a25724ac87
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 15:13:07 2014 +0200
    
        skip resources without md5 sum
    
    commit 3dba36cd21e70f8e39a7f38d15fe33aee7ca8ae7
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 14:52:26 2014 +0200
    
        Calculate MD5 sum as soon as possible
    
    commit 13838d84e83f54ddac31954975d14dbf1b7b3891
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 14:26:38 2014 +0200
    
        initialize KoAbstractGradient properly
    
    commit 855d18073deb68ac816ced0d7b7c7a03de7f4299
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 12:52:35 2014 +0200
    
        index resources also by md5
    
    commit 0481ea8b6fbc2e88bf83ed428de7fdb5de2881a2
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 11:33:31 2014 +0200
    
        Add dummy implementation for md5 summing resource bundles
    
    commit 9870cdc3c30cbf072ddb2d91bfee36c7baba59b1
    Merge: f4bf3ac ff5e141
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 11:20:52 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
        Conflicts:
        	krita/plugins/paintops/resourcemanager/KoResourceBundle.cpp
        	krita/plugins/paintops/resourcemanager/KoResourceBundle.h
    
    commit f4bf3aca5155df5f83d72c4de0febc48aa7f8332
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 11:19:04 2014 +0200
    
        Rename tabObject to tagStore
    
    commit 32d353d1e695b4ca1edb569cc927599fea2137ec
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 11:18:41 2014 +0200
    
        Tagstore: Read md5 sum if present
    
    commit 8d1e900544671464054dc8c5df3e77e5fedc2642
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 11:01:53 2014 +0200
    
        Add md5 sum calculation for the various brush tip types
    
    commit 68461e8135d570982f072e7f22e7febf484cb34a
    Merge: 4faa11b 516b07d
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Tue Apr 15 10:08:21 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
    commit 4faa11bab8b6dcb7a56eae19ed8d26f4b0839d41
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon Apr 14 12:51:04 2014 +0200
    
        Remove protected m_image variable from KisBrush
    
    commit e2a4590fd15e5dcf493f5e5c78269579e74118c2
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon Apr 14 11:49:38 2014 +0200
    
        Cleanup KisBrush implementations
    
        The empty saveToDevice implementations aren't necessary at all, it's
        not part of the KisBrush api.
    
    commit 1c15374839c3b438a24736fee18ba0ce69f0c432
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon Apr 14 11:29:25 2014 +0200
    
        Fix setting the icon for png patterns
    
    commit 9b51e01492d4e6349b1b6412771fe1914ed9c23a
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon Apr 14 11:00:08 2014 +0200
    
        Show the gradient previews again.
    
    commit 8733300e85057506614346ee9bb7fadee13c1df2
    Merge: be373dc b7b85ae
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon Apr 14 10:13:53 2014 +0200
    
        Merge remote-tracking branch 'origin/master' into calligra-resource_md5-rempt
    
    commit be373dcd4ac8ca6896cf31f7e3d15b8717ec00c9
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 11 15:49:47 2014 +0200
    
        Start implementing the md5sum generators for all kinds of resources.
    
    commit d924d5ef13b2c790064606cb296ba9fafb370246
    Merge: 2e08dfe c93b2d5
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 11 11:46:07 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
    commit 2e08dfe57ccbfff797b42267c63d0a9f84d36d27
    Merge: 50a8ceb 1b3508d
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 11 11:33:00 2014 +0200
    
        Merge branch 'master' into calligra-resource_md5-rempt
    
    commit 50a8ceb8a2954cec91d15e5d3144d92592f2a493
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 11 11:21:54 2014 +0200
    
        Delete some more d-pointers
    
    commit 7e731d3dbcf7b81ccd5006f92a9daf19b47d936c
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 11 10:22:39 2014 +0200
    
        remove obsolete comment. save _is_ implemented.
    
    commit 72562746d80748c410d444b4242e5fa14efbc329
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Fri Apr 11 10:07:20 2014 +0200
    
        Move the KoCachedGradient into KisGradientPainter
    
        It's only used in one place, so let's not clutter up pigment with it.
    
        (Also, it hasn't got a d-pointer to leak anymore.)
    
    commit f2a68ee8cf5fc4a74aabf6013cfd6832430b80ac
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:38:27 2014 +0200
    
        remove unused include
    
    commit bfdd7d822b6493bb2f7e03e1e33c95d5762d7764
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:34:35 2014 +0200
    
        Remove image() overload from KoResourceBundle
    
    commit d35d3a54d0c42dd9a28ed0dd4a283c9c06dc6ed6
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:33:24 2014 +0200
    
        fix coding style: m_ prefix for class members
    
    commit 20cc841932b6a6edef3ba413e833fcbe0c862b70
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:31:31 2014 +0200
    
        Remove image() overload from the mypaint brush resource
    
    commit 7930fa780c9e3bfaa66138abbc5a1205dc761bf6
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:27:29 2014 +0200
    
        Remove useless image() override from the taskset resource
    
    commit 8967f4d072f2ab194bb154b8ca70be885bddd4ef
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:26:21 2014 +0200
    
        Move the md5sum functionality from KoPattern to KoResource
    
        So we can start implementing it in all resources
    
    commit f8ed4ac3777f7044592778cae96cd907adbb4942
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 16:17:34 2014 +0200
    
        Fix warning
    
    commit 02ede1c630cb59a37736e6981b29e87d40e5de6f
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 15:50:53 2014 +0200
    
        Coding style: remove superfluous semicolon
    
    commit 9dacc59e326184e673f3e924cf1661c4cbc10161
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 14:24:06 2014 +0200
    
        Add KisBrush::brushTipImage() to access the image to paint with
    
    commit b0ef67a458ce2f7b6698f244db6dd21b3673f0b3
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 13:52:31 2014 +0200
    
        rename KisBrush::setImage to KisBrush::setBrushTipImage
    
        Since that's what it does -- it sets the QImage that we'll use as a
        mask when painting.
    
    commit 7cefc667c5ed6bdbe4b66485bcb0d8147ea67ba3
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 12:37:12 2014 +0200
    
        Use KisPattern::pattern() where that is needed, and image() for icons
    
    commit 83a32df13463bc419a93e5bf609e8bde1b25e035
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Thu Apr 10 12:29:12 2014 +0200
    
        Add a pattern() method to KoPattern to return the actual pattern
    
        Because using image() for both the thumbnail as well as the pattern
        is something we need to change if we want to make all resources lazy
        loading.
    d8ee0554