re-arrange space_userpref_keymap, no need to use a subclass here, just import the module and call draw_keymaps().

- making this change now because some addons developers are interested in showing keymap UI in their addons prefs and using the class involved making a fake class instance which isnt needed.

3 files changed, 342 insertions, 335 deletions

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 594f724c6e3..b9f2e8406c6 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -72,7 +72,6 @@ _modules = [
     "space_sequencer",
     "space_text",
     "space_time",
-    "space_userpref_keymap",
     "space_userpref",
     "space_view3d",
     "space_view3d_toolbar",
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 54387f10a8d..a5e4b6e10bf 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -917,9 +917,6 @@ class USERPREF_PT_file(Panel):
         col.prop(system, "author", text="")
 
 
-from bl_ui.space_userpref_keymap import InputKeyMapPanel
-
-
 class USERPREF_MT_ndof_settings(Menu):
     # accessed from the window key-bindings in C (only)
     bl_label = "3D Mouse Settings"
@@ -960,9 +957,25 @@ class USERPREF_MT_ndof_settings(Menu):
             layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
 
 
-class USERPREF_PT_input(Panel, InputKeyMapPanel):
+class USERPREF_MT_keyconfigs(Menu):
+    bl_label = "KeyPresets"
+    preset_subdir = "keyconfig"
+    preset_operator = "wm.keyconfig_activate"
+
+    def draw(self, context):
+        props = self.layout.operator("wm.context_set_value", text="Blender (default)")
+        props.data_path = "window_manager.keyconfigs.active"
+        props.value = "context.window_manager.keyconfigs.default"
+
+        # now draw the presets
+        Menu.draw_preset(self, context)
+
+
+class USERPREF_PT_input(Panel):
     bl_space_type = 'USER_PREFERENCES'
     bl_label = "Input"
+    bl_region_type = 'WINDOW'
+    bl_options = {'HIDE_HEADER'}
 
     @classmethod
     def poll(cls, context):
@@ -1039,6 +1052,8 @@ class USERPREF_PT_input(Panel, InputKeyMapPanel):
         row.separator()
 
     def draw(self, context):
+        from bl_ui.space_userpref_keymap import draw_keymaps
+
         layout = self.layout
 
         #import time
@@ -1055,7 +1070,7 @@ class USERPREF_PT_input(Panel, InputKeyMapPanel):
         self.draw_input_prefs(inputs, split)
 
         # Keymap Settings
-        self.draw_keymaps(context, split)
+        draw_keymaps(context, split)
 
         #print("runtime", time.time() - start)
 
diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py
index 8d6eb2c623d..727e9935bcc 100644
--- a/release/scripts/startup/bl_ui/space_userpref_keymap.py
+++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py
@@ -17,375 +17,368 @@
 # ##### END GPL LICENSE BLOCK #####
 
 # <pep8 compliant>
+
+__all__ = (
+    "draw_entry",
+    "draw_km",
+    "draw_kmi",
+    "draw_filtered",
+    "draw_hierarchy",
+    "draw_keymaps",
+    )
+
+
 import bpy
-from bpy.types import Menu
 from bpy.app.translations import pgettext_iface as iface_
 from bpy.app.translations import contexts as i18n_contexts
 
 
-class USERPREF_MT_keyconfigs(Menu):
-    bl_label = "KeyPresets"
-    preset_subdir = "keyconfig"
-    preset_operator = "wm.keyconfig_activate"
-
-    def draw(self, context):
-        props = self.layout.operator("wm.context_set_value", text="Blender (default)")
-        props.data_path = "window_manager.keyconfigs.active"
-        props.value = "context.window_manager.keyconfigs.default"
+def _indented_layout(layout, level):
+    indentpx = 16
+    if level == 0:
+        level = 0.0001   # Tweak so that a percentage of 0 won't split by half
+    indent = level * indentpx / bpy.context.region.width
 
-        # now draw the presets
-        Menu.draw_preset(self, context)
+    split = layout.split(percentage=indent)
+    col = split.column()
+    col = split.column()
+    return col
 
 
-class InputKeyMapPanel:
-    bl_space_type = 'USER_PREFERENCES'
-    bl_label = "Input"
-    bl_region_type = 'WINDOW'
-    bl_options = {'HIDE_HEADER'}
+def draw_entry(display_keymaps, entry, col, level=0):
+    idname, spaceid, regionid, children = entry
 
-    def draw_entry(self, display_keymaps, entry, col, level=0):
-        idname, spaceid, regionid, children = entry
+    for km, kc in display_keymaps:
+        if km.name == idname and km.space_type == spaceid and km.region_type == regionid:
+            draw_km(display_keymaps, kc, km, children, col, level)
 
-        for km, kc in display_keymaps:
-            if km.name == idname and km.space_type == spaceid and km.region_type == regionid:
-                self.draw_km(display_keymaps, kc, km, children, col, level)
-
-        '''
+    '''
+    km = kc.keymaps.find(idname, space_type=spaceid, region_type=regionid)
+    if not km:
+        kc = defkc
         km = kc.keymaps.find(idname, space_type=spaceid, region_type=regionid)
-        if not km:
-            kc = defkc
-            km = kc.keymaps.find(idname, space_type=spaceid, region_type=regionid)
-
-        if km:
-            self.draw_km(kc, km, children, col, level)
-        '''
-
-    def indented_layout(self, layout, level):
-        indentpx = 16
-        if level == 0:
-            level = 0.0001   # Tweak so that a percentage of 0 won't split by half
-        indent = level * indentpx / bpy.context.region.width
-
-        split = layout.split(percentage=indent)
-        col = split.column()
-        col = split.column()
-        return col
-
-    def draw_km(self, display_keymaps, kc, km, children, layout, level):
-        km = km.active()
 
-        layout.context_pointer_set("keymap", km)
+    if km:
+        draw_km(kc, km, children, col, level)
+    '''
 
-        col = self.indented_layout(layout, level)
 
-        row = col.row()
-        row.prop(km, "show_expanded_children", text="", emboss=False)
-        row.label(text=km.name, text_ctxt=i18n_contexts.id_windowmanager)
+def draw_km(display_keymaps, kc, km, children, layout, level):
+    km = km.active()
 
-        row.label()
-        row.label()
-
-        if km.is_modal:
-            row.label(text="", icon='LINKED')
-        if km.is_user_modified:
-            row.operator("wm.keymap_restore", text="Restore")
-        else:
-            row.label()
+    layout.context_pointer_set("keymap", km)
 
-        if km.show_expanded_children:
-            if children:
-                # Put the Parent key map's entries in a 'global' sub-category
-                # equal in hierarchy to the other children categories
-                subcol = self.indented_layout(col, level + 1)
-                subrow = subcol.row()
-                subrow.prop(km, "show_expanded_items", text="", emboss=False)
-                subrow.label(text=iface_("%s (Global)") % km.name, translate=False)
-            else:
-                km.show_expanded_items = True
+    col = _indented_layout(layout, level)
 
-            # Key Map items
-            if km.show_expanded_items:
-                for kmi in km.keymap_items:
-                    self.draw_kmi(display_keymaps, kc, km, kmi, col, level + 1)
+    row = col.row()
+    row.prop(km, "show_expanded_children", text="", emboss=False)
+    row.label(text=km.name, text_ctxt=i18n_contexts.id_windowmanager)
 
-                # "Add New" at end of keymap item list
-                col = self.indented_layout(col, level + 1)
-                subcol = col.split(percentage=0.2).column()
-                subcol.operator("wm.keyitem_add", text="Add New", text_ctxt=i18n_contexts.id_windowmanager,
-                                icon='ZOOMIN')
+    row.label()
+    row.label()
 
-            col.separator()
+    if km.is_modal:
+        row.label(text="", icon='LINKED')
+    if km.is_user_modified:
+        row.operator("wm.keymap_restore", text="Restore")
+    else:
+        row.label()
 
-            # Child key maps
-            if children:
-                subcol = col.column()
-                row = subcol.row()
+    if km.show_expanded_children:
+        if children:
+            # Put the Parent key map's entries in a 'global' sub-category
+            # equal in hierarchy to the other children categories
+            subcol = _indented_layout(col, level + 1)
+            subrow = subcol.row()
+            subrow.prop(km, "show_expanded_items", text="", emboss=False)
+            subrow.label(text=iface_("%s (Global)") % km.name, translate=False)
+        else:
+            km.show_expanded_items = True
 
-                for entry in children:
-                    self.draw_entry(display_keymaps, entry, col, level + 1)
+        # Key Map items
+        if km.show_expanded_items:
+            for kmi in km.keymap_items:
+                draw_kmi(display_keymaps, kc, km, kmi, col, level + 1)
 
-    def draw_kmi(self, display_keymaps, kc, km, kmi, layout, level):
-        map_type = kmi.map_type
+            # "Add New" at end of keymap item list
+            col = _indented_layout(col, level + 1)
+            subcol = col.split(percentage=0.2).column()
+            subcol.operator("wm.keyitem_add", text="Add New", text_ctxt=i18n_contexts.id_windowmanager,
+                            icon='ZOOMIN')
 
-        col = self.indented_layout(layout, level)
+        col.separator()
 
-        if kmi.show_expanded:
-            col = col.column(align=True)
-            box = col.box()
-        else:
-            box = col.column()
+        # Child key maps
+        if children:
+            subcol = col.column()
+            row = subcol.row()
+
+            for entry in children:
+                draw_entry(display_keymaps, entry, col, level + 1)
+
+
+def draw_kmi(display_keymaps, kc, km, kmi, layout, level):
+    map_type = kmi.map_type
+
+    col = _indented_layout(layout, level)
+
+    if kmi.show_expanded:
+        col = col.column(align=True)
+        box = col.box()
+    else:
+        box = col.column()
+
+    split = box.split(percentage=0.05)
+
+    # header bar
+    row = split.row()
+    row.prop(kmi, "show_expanded", text="", emboss=False)
+
+    row = split.row()
+    row.prop(kmi, "active", text="", emboss=False)
+
+    if km.is_modal:
+        row.prop(kmi, "propvalue", text="")
+    else:
+        row.label(text=kmi.name)
+
+    row = split.row()
+    row.prop(kmi, "map_type", text="")
+    if map_type == 'KEYBOARD':
+        row.prop(kmi, "type", text="", full_event=True)
+    elif map_type == 'MOUSE':
+        row.prop(kmi, "type", text="", full_event=True)
+    elif map_type == 'NDOF':
+        row.prop(kmi, "type", text="", full_event=True)
+    elif map_type == 'TWEAK':
+        subrow = row.row()
+        subrow.prop(kmi, "type", text="")
+        subrow.prop(kmi, "value", text="")
+    elif map_type == 'TIMER':
+        row.prop(kmi, "type", text="")
+    else:
+        row.label()
 
-        split = box.split(percentage=0.05)
+    if (not kmi.is_user_defined) and kmi.is_user_modified:
+        row.operator("wm.keyitem_restore", text="", icon='BACK').item_id = kmi.id
+    else:
+        row.operator("wm.keyitem_remove", text="", icon='X').item_id = kmi.id
 
-        # header bar
-        row = split.row()
-        row.prop(kmi, "show_expanded", text="", emboss=False)
+    # Expanded, additional event settings
+    if kmi.show_expanded:
+        box = col.box()
 
-        row = split.row()
-        row.prop(kmi, "active", text="", emboss=False)
+        split = box.split(percentage=0.4)
+        sub = split.row()
 
         if km.is_modal:
-            row.prop(kmi, "propvalue", text="")
-        else:
-            row.label(text=kmi.name)
-
-        row = split.row()
-        row.prop(kmi, "map_type", text="")
-        if map_type == 'KEYBOARD':
-            row.prop(kmi, "type", text="", full_event=True)
-        elif map_type == 'MOUSE':
-            row.prop(kmi, "type", text="", full_event=True)
-        elif map_type == 'NDOF':
-            row.prop(kmi, "type", text="", full_event=True)
-        elif map_type == 'TWEAK':
-            subrow = row.row()
-            subrow.prop(kmi, "type", text="")
-            subrow.prop(kmi, "value", text="")
-        elif map_type == 'TIMER':
-            row.prop(kmi, "type", text="")
+            sub.prop(kmi, "propvalue", text="")
         else:
-            row.label()
-
-        if (not kmi.is_user_defined) and kmi.is_user_modified:
-            row.operator("wm.keyitem_restore", text="", icon='BACK').item_id = kmi.id
-        else:
-            row.operator("wm.keyitem_remove", text="", icon='X').item_id = kmi.id
+            # One day...
+            #~ sub.prop_search(kmi, "idname", bpy.context.window_manager, "operators_all", text="")
+            sub.prop(kmi, "idname", text="")
+
+        if map_type not in {'TEXTINPUT', 'TIMER'}:
+            sub = split.column()
+            subrow = sub.row(align=True)
+
+            if map_type == 'KEYBOARD':
+                subrow.prop(kmi, "type", text="", event=True)
+                subrow.prop(kmi, "value", text="")
+            elif map_type in {'MOUSE', 'NDOF'}:
+                subrow.prop(kmi, "type", text="")
+                subrow.prop(kmi, "value", text="")
+
+            subrow = sub.row()
+            subrow.scale_x = 0.75
+            subrow.prop(kmi, "any")
+            subrow.prop(kmi, "shift")
+            subrow.prop(kmi, "ctrl")
+            subrow.prop(kmi, "alt")
+            subrow.prop(kmi, "oskey", text="Cmd")
+            subrow.prop(kmi, "key_modifier", text="", event=True)
+
+        # Operator properties
+        box.template_keymap_item_properties(kmi)
+
+        # Modal key maps attached to this operator
+        if not km.is_modal:
+            kmm = kc.keymaps.find_modal(kmi.idname)
+            if kmm:
+                draw_km(display_keymaps, kc, kmm, None, layout, level + 1)
+                layout.context_pointer_set("keymap", km)
+
+_EVENT_TYPES = set()
+_EVENT_TYPE_MAP = {}
+
+
+def draw_filtered(display_keymaps, filter_type, filter_text, layout):
+
+    if filter_type == 'NAME':
+        def filter_func(kmi):
+            return (filter_text in kmi.idname.lower() or
+                    filter_text in kmi.name.lower())
+    else:
+        if not _EVENT_TYPES:
+            enum = bpy.types.Event.bl_rna.properties["type"].enum_items
+            _EVENT_TYPES.update(enum.keys())
+            _EVENT_TYPE_MAP.update({item.name.replace(" ", "_").upper(): key
+                                    for key, item in enum.items()})
+
+            del enum
+            _EVENT_TYPE_MAP.update({
+                "`": 'ACCENT_GRAVE',
+                "*": 'NUMPAD_ASTERIX',
+                "/": 'NUMPAD_SLASH',
+                "RMB": 'RIGHTMOUSE',
+                "LMB": 'LEFTMOUSE',
+                "MMB": 'MIDDLEMOUSE',
+                })
+            _EVENT_TYPE_MAP.update({
+                "%d" % i: "NUMPAD_%d" % i for i in range(9)
+                })
+        # done with once off init
+
+        filter_text_split = filter_text.strip()
+        filter_text_split = filter_text.split()
+
+        # Modifier {kmi.attribute: name} mapping
+        key_mod = {
+            "ctrl": "ctrl",
+            "alt": "alt",
+            "shift": "shift",
+            "cmd": "oskey",
+            "oskey": "oskey",
+            "any": "any",
+            }
+        # KeyMapItem like dict, use for comparing against
+        # attr: state
+        kmi_test_dict = {}
+
+        # initialize? - so if a if a kmi has a MOD assigned it wont show up.
+        #~ for kv in key_mod.values():
+        #~    kmi_test_dict[kv] = False
+
+        # altname: attr
+        for kk, kv in key_mod.items():
+            if kk in filter_text_split:
+                filter_text_split.remove(kk)
+                kmi_test_dict[kv] = True
+        # whats left should be the event type
+        if len(filter_text_split) > 1:
+            return False
+        elif filter_text_split:
+            kmi_type = filter_text_split[0].upper()
+
+            if kmi_type not in _EVENT_TYPES:
+                # replacement table
+                kmi_type_test = _EVENT_TYPE_MAP.get(kmi_type)
+                if kmi_type_test is None:
+                    # print("Unknown Type:", kmi_type)
+
+                    # Partial match
+                    for k, v in _EVENT_TYPE_MAP.items():
+                        if kmi_type in k:
+                            kmi_type_test = v
+                            break
+                        if kmi_type in v:
+                            kmi_type_test = v
+                            break
 
-        # Expanded, additional event settings
-        if kmi.show_expanded:
-            box = col.box()
-
-            split = box.split(percentage=0.4)
-            sub = split.row()
-
-            if km.is_modal:
-                sub.prop(kmi, "propvalue", text="")
-            else:
-                # One day...
-                #~ sub.prop_search(kmi, "idname", bpy.context.window_manager, "operators_all", text="")
-                sub.prop(kmi, "idname", text="")
-
-            if map_type not in {'TEXTINPUT', 'TIMER'}:
-                sub = split.column()
-                subrow = sub.row(align=True)
-
-                if map_type == 'KEYBOARD':
-                    subrow.prop(kmi, "type", text="", event=True)
-                    subrow.prop(kmi, "value", text="")
-                elif map_type in {'MOUSE', 'NDOF'}:
-                    subrow.prop(kmi, "type", text="")
-                    subrow.prop(kmi, "value", text="")
-
-                subrow = sub.row()
-                subrow.scale_x = 0.75
-                subrow.prop(kmi, "any")
-                subrow.prop(kmi, "shift")
-                subrow.prop(kmi, "ctrl")
-                subrow.prop(kmi, "alt")
-                subrow.prop(kmi, "oskey", text="Cmd")
-                subrow.prop(kmi, "key_modifier", text="", event=True)
-
-            # Operator properties
-            box.template_keymap_item_properties(kmi)
-
-            # Modal key maps attached to this operator
-            if not km.is_modal:
-                kmm = kc.keymaps.find_modal(kmi.idname)
-                if kmm:
-                    self.draw_km(display_keymaps, kc, kmm, None, layout, level + 1)
-                    layout.context_pointer_set("keymap", km)
-
-    _EVENT_TYPES = set()
-    _EVENT_TYPE_MAP = {}
-
-    def draw_filtered(self, display_keymaps, filter_type, filter_text, layout):
-
-        if filter_type == 'NAME':
-            def filter_func(kmi):
-                return (filter_text in kmi.idname.lower() or
-                        filter_text in kmi.name.lower())
-        else:
-            if not self._EVENT_TYPES:
-                enum = bpy.types.Event.bl_rna.properties["type"].enum_items
-                self._EVENT_TYPES.update(enum.keys())
-                self._EVENT_TYPE_MAP.update({item.name.replace(" ", "_").upper(): key for key, item in enum.items()})
-
-                del enum
-                self._EVENT_TYPE_MAP.update({
-                    "`": 'ACCENT_GRAVE',
-                    "*": 'NUMPAD_ASTERIX',
-                    "/": 'NUMPAD_SLASH',
-                    "RMB": 'RIGHTMOUSE',
-                    "LMB": 'LEFTMOUSE',
-                    "MMB": 'MIDDLEMOUSE',
-                    })
-                self._EVENT_TYPE_MAP.update({
-                    "%d" % i: "NUMPAD_%d" % i for i in range(9)
-                    })
-            # done with once off init
-
-            filter_text_split = filter_text.strip()
-            filter_text_split = filter_text.split()
-
-            # Modifier {kmi.attribute: name} mapping
-            key_mod = {
-                "ctrl": "ctrl",
-                "alt": "alt",
-                "shift": "shift",
-                "cmd": "oskey",
-                "oskey": "oskey",
-                "any": "any",
-                }
-            # KeyMapItem like dict, use for comparing against
-            # attr: state
-            kmi_test_dict = {}
-
-            # initialize? - so if a if a kmi has a MOD assigned it wont show up.
-            #~ for kv in key_mod.values():
-            #~    kmi_test_dict[kv] = False
-
-            # altname: attr
-            for kk, kv in key_mod.items():
-                if kk in filter_text_split:
-                    filter_text_split.remove(kk)
-                    kmi_test_dict[kv] = True
-            # whats left should be the event type
-            if len(filter_text_split) > 1:
-                return False
-            elif filter_text_split:
-                kmi_type = filter_text_split[0].upper()
-
-                if kmi_type not in self._EVENT_TYPES:
-                    # replacement table
-                    kmi_type_test = self._EVENT_TYPE_MAP.get(kmi_type)
                     if kmi_type_test is None:
-                        # print("Unknown Type:", kmi_type)
-
-                        # Partial match
-                        for k, v in self._EVENT_TYPE_MAP.items():
-                            if kmi_type in k:
-                                kmi_type_test = v
-                                break
-                            if kmi_type in v:
-                                kmi_type_test = v
-                                break
-
-                        if kmi_type_test is None:
-                            return False
-
-                    kmi_type = kmi_type_test
-                    del kmi_type_test
-
-                kmi_test_dict["type"] = kmi_type
-
-            # main filter func, runs many times
-            def filter_func(kmi):
-                for kk, ki in kmi_test_dict.items():
-                    if getattr(kmi, kk) != ki:
                         return False
-                return True
-
-        for km, kc in display_keymaps:
-            km = km.active()
-            layout.context_pointer_set("keymap", km)
-
-            filtered_items = [kmi for kmi in km.keymap_items if filter_func(kmi)]
-
-            if filtered_items:
-                col = layout.column()
-
-                row = col.row()
-                row.label(text=km.name, icon='DOT')
-
-                row.label()
-                row.label()
 
-                if km.is_user_modified:
-                    row.operator("wm.keymap_restore", text="Restore")
-                else:
-                    row.label()
+                kmi_type = kmi_type_test
+                del kmi_type_test
 
-                for kmi in filtered_items:
-                    self.draw_kmi(display_keymaps, kc, km, kmi, col, 1)
+            kmi_test_dict["type"] = kmi_type
 
-                # "Add New" at end of keymap item list
-                col = self.indented_layout(layout, 1)
-                subcol = col.split(percentage=0.2).column()
-                subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
-        return True
+        # main filter func, runs many times
+        def filter_func(kmi):
+            for kk, ki in kmi_test_dict.items():
+                if getattr(kmi, kk) != ki:
+                    return False
+            return True
 
-    def draw_hierarchy(self, display_keymaps, layout):
-        from bpy_extras import keyconfig_utils
-        for entry in keyconfig_utils.KM_HIERARCHY:
-            self.draw_entry(display_keymaps, entry, layout)
-
-    def draw_keymaps(self, context, layout):
-        from bpy_extras import keyconfig_utils
-
-        wm = context.window_manager
-        kc = wm.keyconfigs.user
-        spref = context.space_data
-
-        col = layout.column()
-        sub = col.column()
-
-        subsplit = sub.split()
-        subcol = subsplit.column()
+    for km, kc in display_keymaps:
+        km = km.active()
+        layout.context_pointer_set("keymap", km)
 
-        row = subcol.row(align=True)
+        filtered_items = [kmi for kmi in km.keymap_items if filter_func(kmi)]
 
-        #~ row.prop_search(wm.keyconfigs, "active", wm, "keyconfigs", text="Key Config:")
-        text = bpy.path.display_name(wm.keyconfigs.active.name)
-        if not text:
-            text = "Blender (default)"
-        row.menu("USERPREF_MT_keyconfigs", text=text)
-        row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMIN')
-        row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMOUT').remove_active = True
+        if filtered_items:
+            col = layout.column()
 
-        #~ layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
-        #~ row.operator("wm.keyconfig_remove", text="", icon='X')
-        row.separator()
-        rowsub = row.split(align=True, percentage=0.33)
-        # postpone drawing into rowsub, so we can set alert!
+            row = col.row()
+            row.label(text=km.name, icon='DOT')
 
-        col.separator()
-        display_keymaps = keyconfig_utils.keyconfig_merge(kc, kc)
-        filter_type = spref.filter_type
-        filter_text = spref.filter_text.strip()
-        if filter_text:
-            filter_text = filter_text.lower()
-            ok = self.draw_filtered(display_keymaps, filter_type, filter_text, col)
-        else:
-            self.draw_hierarchy(display_keymaps, col)
-            ok = True
-
-        # go back and fill in rowsub
-        rowsub.prop(spref, "filter_type", text="")
-        rowsubsub = rowsub.row(align=True)
-        if not ok:
-            rowsubsub.alert = True
-        rowsubsub.prop(spref, "filter_text", text="", icon='VIEWZOOM')
+            row.label()
+            row.label()
 
+            if km.is_user_modified:
+                row.operator("wm.keymap_restore", text="Restore")
+            else:
+                row.label()
 
-if __name__ == "__main__":  # only for live edit.
-    bpy.utils.register_module(__name__)
+            for kmi in filtered_items:
+                draw_kmi(display_keymaps, kc, km, kmi, col, 1)
+
+            # "Add New" at end of keymap item list
+            col = _indented_layout(layout, 1)
+            subcol = col.split(percentage=0.2).column()
+            subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+    return True
+
+
+def draw_hierarchy(display_keymaps, layout):
+    from bpy_extras import keyconfig_utils
+    for entry in keyconfig_utils.KM_HIERARCHY:
+        draw_entry(display_keymaps, entry, layout)
+
+
+def draw_keymaps(context, layout):
+    from bpy_extras import keyconfig_utils
+
+    wm = context.window_manager
+    kc = wm.keyconfigs.user
+    spref = context.space_data
+
+    col = layout.column()
+    sub = col.column()
+
+    subsplit = sub.split()
+    subcol = subsplit.column()
+
+    row = subcol.row(align=True)
+
+    #~ row.prop_search(wm.keyconfigs, "active", wm, "keyconfigs", text="Key Config:")
+    text = bpy.path.display_name(wm.keyconfigs.active.name)
+    if not text:
+        text = "Blender (default)"
+    row.menu("USERPREF_MT_keyconfigs", text=text)
+    row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMIN')
+    row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMOUT').remove_active = True
+
+    #~ layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
+    #~ row.operator("wm.keyconfig_remove", text="", icon='X')
+    row.separator()
+    rowsub = row.split(align=True, percentage=0.33)
+    # postpone drawing into rowsub, so we can set alert!
+
+    col.separator()
+    display_keymaps = keyconfig_utils.keyconfig_merge(kc, kc)
+    filter_type = spref.filter_type
+    filter_text = spref.filter_text.strip()
+    if filter_text:
+        filter_text = filter_text.lower()
+        ok = draw_filtered(display_keymaps, filter_type, filter_text, col)
+    else:
+        draw_hierarchy(display_keymaps, col)
+        ok = True
+
+    # go back and fill in rowsub
+    rowsub.prop(spref, "filter_type", text="")
+    rowsubsub = rowsub.row(align=True)
+    if not ok:
+        rowsubsub.alert = True
+    rowsubsub.prop(spref, "filter_text", text="", icon='VIEWZOOM')