[kupfer: 39/41] Merge branch 'qsicons'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit abdb7803cf6653b6bb99aa2af410ea0ca6de4c2b
Merge: 471ddab 425b8ae
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Apr 26 18:54:39 2011 +0200

    Merge branch 'qsicons'
    
    * qsicons:
      Use 'development version' as undefined version string
      core: Fix check for icon-list file
      doc: Document format of icon-list and ``!override``
      qsicons, core: Add comments to icon-list
      icons: Catch and print errors for malformed icon-list data
      Remove art/icon-list and use only plugin-installed icons
      doc: Document the icon names that we use
      qsicons: Generic Icons from Quicksilver in a plugin
      icons: Keep track of custom runtime-installed icons
      Use kupfer-execute, kupfer-catalog, kupfer-launch by default

 Documentation/GTKTheming.rst                 |   13 ++++
 Documentation/PluginAPI.rst                  |   29 +++++++--
 data/art/icon-list                           |    5 --
 data/wscript_build                           |    1 -
 kupfer/core/plugins.py                       |   15 ++---
 kupfer/icons.py                              |   81 +++++++++++++++++++------
 kupfer/obj/base.py                           |    2 +-
 kupfer/obj/fileactions.py                    |    3 -
 kupfer/obj/objects.py                        |    4 +-
 kupfer/obj/sources.py                        |    4 +-
 {data/art => kupfer/plugin/core}/COPYING     |    0
 kupfer/plugin/core/icon-list                 |    5 ++
 {data/art => kupfer/plugin/core}/object.svg  |    0
 {data/art => kupfer/plugin/core}/objects.svg |    0
 kupfer/plugin/qsicons/Action.png             |  Bin 0 -> 14111 bytes
 kupfer/plugin/qsicons/Find.png               |  Bin 0 -> 17132 bytes
 kupfer/plugin/qsicons/Object.png             |  Bin 0 -> 11091 bytes
 kupfer/plugin/qsicons/Rocket.png             |  Bin 0 -> 9363 bytes
 kupfer/plugin/qsicons/__init__.py            |   31 ++++++++++
 kupfer/plugin/qsicons/icon-list              |    8 +++
 kupfer/ui/browser.py                         |    2 +-
 kupfer/version.py                            |    2 +-
 22 files changed, 151 insertions(+), 54 deletions(-)
---