diff options
Diffstat (limited to 'release/scripts/modules')
| -rw-r--r-- | release/scripts/modules/bpy/utils/__init__.py | 2 | ||||
| -rw-r--r-- | release/scripts/modules/rna_keymap_ui.py | 27 |
2 files changed, 19 insertions, 10 deletions
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py index 5fbff2eb51b..b4c8c0899ac 100644 --- a/release/scripts/modules/bpy/utils/__init__.py +++ b/release/scripts/modules/bpy/utils/__init__.py @@ -572,7 +572,7 @@ def preset_find(name, preset_path, display_name=False, ext=".py"): def keyconfig_init(): # Key configuration initialization and refresh, called from the Blender # window manager on startup and refresh. - active_config = _preferences.inputs.active_keyconfig + active_config = _preferences.keymap.active_keyconfig # Load the default key configuration. default_filepath = preset_find("blender", "keyconfig") diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py index 3a44745e01b..268bcb6a7be 100644 --- a/release/scripts/modules/rna_keymap_ui.py +++ b/release/scripts/modules/rna_keymap_ui.py @@ -372,15 +372,24 @@ def draw_keymaps(context, layout): subcol = subsplit.column() col = subcol.column() - row = col.row(align=True) # row.prop_search(wm.keyconfigs, "active", wm, "keyconfigs", text="Key Config") text = bpy.path.display_name(kc_active.name) if not text: text = "Blender (default)" - row.menu("USERPREF_MT_keyconfigs", text=text) - row.operator("wm.keyconfig_preset_add", text="", icon='ADD') - row.operator("wm.keyconfig_preset_add", text="", icon='REMOVE').remove_active = True + + row = col.row() + + row.operator("wm.keyconfig_import", text="Import...", icon='IMPORT') + row.operator("wm.keyconfig_export", text="Export...", icon='EXPORT') + + row.separator() + + rowsub = row.row(align=True) + + rowsub.menu("USERPREF_MT_keyconfigs", text=text) + rowsub.operator("wm.keyconfig_preset_add", text="", icon='ADD') + rowsub.operator("wm.keyconfig_preset_add", text="", icon='REMOVE').remove_active = True # layout.context_pointer_set("keyconfig", wm.keyconfigs.active) # row.operator("wm.keyconfig_remove", text="", icon='X') @@ -413,14 +422,14 @@ def draw_keymaps(context, layout): box = col.box() row = box.row(align=True) - prefs = context.preferences - inputs = prefs.inputs - show_ui_keyconfig = inputs.show_ui_keyconfig + pref = context.preferences + keymappref = pref.keymap + show_ui_keyconfig = keymappref.show_ui_keyconfig row.prop( - inputs, + keymappref, "show_ui_keyconfig", text="", - icon='TRIA_DOWN' if show_ui_keyconfig else 'TRIA_RIGHT', + icon='DISCLOSURE_TRI_DOWN' if show_ui_keyconfig else 'DISCLOSURE_TRI_RIGHT', emboss=False, ) row.label(text="Preferences") |