diff options
-rw-r--r-- | release/scripts/op/presets.py | 2 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/maya.py (renamed from release/scripts/presets/interaction/maya.py) | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_userpref.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/space_userpref_keymap.py | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 5 |
5 files changed, 13 insertions, 6 deletions
diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index aa3c306ce06..2f6a5b69c20 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -256,7 +256,7 @@ class AddPresetKeyconfig(AddPresetBase, bpy.types.Operator): '''Add a Keyconfig Preset''' bl_idname = "wm.keyconfig_preset_add" bl_label = "Add Keyconfig Preset" - preset_menu = "PREFS_MT_keyconfigs" + preset_menu = "USERPREF_MT_keyconfigs" preset_subdir = "keyconfig" def add(self, context, filepath): diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/keyconfig/maya.py index 4a40326325e..8c67a4ed231 100644 --- a/release/scripts/presets/interaction/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -2,7 +2,7 @@ import bpy wm = bpy.context.window_manager -kc = wm.keyconfigs.new('Maya') +kc = wm.keyconfigs.new('maya') # Map 3D View km = kc.keymaps.new('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False) diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index f601b255510..40bb5bc4b55 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -127,7 +127,11 @@ class USERPREF_MT_splash(bpy.types.Menu): row.label("") row = split.row() row.label("Interaction:") - row.menu("USERPREF_MT_interaction_presets", text=bpy.types.USERPREF_MT_interaction_presets.bl_label) + # XXX, no redraws + # text = bpy.path.display_name(context.window_manager.keyconfigs.active.name) + # if not text: + # text = "Blender (default)" + row.menu("USERPREF_MT_keyconfigs", text="Preset") class USERPREF_PT_interface(bpy.types.Panel): diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index 0cdebd4734c..70fb2c57e9b 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -124,7 +124,7 @@ def _merge_keymaps(kc1, kc2): return merged_keymaps -class PREFS_MT_keyconfigs(bpy.types.Menu): +class USERPREF_MT_keyconfigs(bpy.types.Menu): bl_label = "KeyPresets" preset_subdir = "keyconfig" preset_operator = "wm.keyconfig_activate" @@ -384,7 +384,7 @@ class InputKeyMapPanel(bpy.types.Panel): text = bpy.path.display_name(context.window_manager.keyconfigs.active.name) if not text: text = "Blender (default)" - row.menu("PREFS_MT_keyconfigs", text=text) + 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 diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 5b7d952de77..f0962584801 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1153,7 +1153,6 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse uiStyle *style= U.uistyles.first; struct RecentFile *recent; int i; - Menu menu= {0}; MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE); char url[64]; @@ -1193,9 +1192,13 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse uiBlockSetEmboss(block, UI_EMBOSS); /* show the splash menu (containing interaction presets), using python */ if (mt) { + Menu menu= {0}; menu.layout= layout; menu.type= mt; mt->draw(C, &menu); + +// wmWindowManager *wm= CTX_wm_manager(C); +// uiItemM(layout, C, "USERPREF_MT_keyconfigs", U.keyconfigstr, 0); } uiBlockSetEmboss(block, UI_EMBOSSP); |