[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53981] trunk/blender: correct addon tutorial section on keymap register/ unregister and add label next to image color-depth option.

[Campbell Barton]

Revision: 53981
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53981
Author:   campbellbarton
Date:     2013-01-22 06:41:12 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
correct addon tutorial section on keymap register/unregister and add label next to image color-depth option.
having buttons labelled [8, 16] on their own is not very meaningful.

Modified Paths:
--------------
    trunk/blender/doc/python_api/rst/info_tutorial_addon.rst
    trunk/blender/source/blender/editors/space_image/image_buttons.c

Modified: trunk/blender/doc/python_api/rst/info_tutorial_addon.rst
===================================================================
--- trunk/blender/doc/python_api/rst/info_tutorial_addon.rst	2013-01-22 06:16:49 UTC (rev 53980)
+++ trunk/blender/doc/python_api/rst/info_tutorial_addon.rst	2013-01-22 06:41:12 UTC (rev 53981)
@@ -486,16 +486,14 @@
        kmi = km.keymap_items.new(ObjectCursorArray.bl_idname, 'SPACE', 'PRESS', ctrl=True, shift=True)
        kmi.properties.total = 4
 
-       addon_keymaps.append(km)
+       addon_keymaps.append((km, kmi))
 
 
    def unregister():
 
        # handle the keymap
-       wm = bpy.context.window_manager
-       for km in addon_keymaps:
-           wm.keyconfigs.addon.keymaps.remove(km)
-       # clear the list
+       for km, kmi in addon_keymaps:
+           km.keymap_items.remove(kmi)
        addon_keymaps.clear()
 
 
@@ -568,18 +566,16 @@
        km = wm.keyconfigs.addon.keymaps.new(name='Object Mode', space_type='EMPTY')
        kmi = km.keymap_items.new(ObjectCursorArray.bl_idname, 'SPACE', 'PRESS', ctrl=True, shift=True)
        kmi.properties.total = 4
-       addon_keymaps.append(km)
+       addon_keymaps.append((km, kmi))
 
    def unregister():
        bpy.utils.unregister_class(ObjectCursorArray)
        bpy.types.VIEW3D_MT_object.remove(menu_func)
 
        # handle the keymap
-       wm = bpy.context.window_manager
-       for km in addon_keymaps:
-           wm.keyconfigs.addon.keymaps.remove(km)
-       # clear the list
-       del addon_keymaps[:]
+       for km, kmi in addon_keymaps:
+           km.keymap_items.remove(kmi)
+       addon_keymaps.clear()
 
 
    if __name__ == "__main__":

Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c	2013-01-22 06:16:49 UTC (rev 53980)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c	2013-01-22 06:41:12 UTC (rev 53981)
@@ -784,6 +784,8 @@
 	           R_IMF_CHAN_DEPTH_32)) == 0)
 	{
 		row = uiLayoutRow(col, FALSE);
+
+		uiItemL(row, IFACE_("Color Depth:"), ICON_NONE);
 		uiItemR(row, imfptr, "color_depth", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 	}