diff options
author | Martin Poirier <theeth@yahoo.com> | 2011-03-28 01:45:37 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2011-03-28 01:45:37 +0400 |
commit | 47f9b496b130776220f53a33c2a7fad8ea7eb960 (patch) | |
tree | a94ce2a9cf5829c3704abf44f808044ac4fd59d8 /release/scripts/startup/bl_ui/space_userpref.py | |
parent | 3598882f0ef630aac8c4810f04b28ab1ae64bd0d (diff) |
[#24658] Switching to "maya" via interaction preset breaks when switching back
[#25045] User Preferences Input, not enough menu choices
[#26525] Saving the Maya preset and another key configs
Untangle keyconfig presets and interaction presets (maya keyconfig would set interaction setting, blender interaction would set keyconfig).
Preset menu on slash screen now displays a list of available keyconfigs (as before) but will also set the correspondant interaction presets, if it exists)
Diffstat (limited to 'release/scripts/startup/bl_ui/space_userpref.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 67174db1d3d..59d9aef12f2 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -119,6 +119,16 @@ class USERPREF_MT_interaction_presets(bpy.types.Menu): preset_operator = "script.execute_preset" draw = bpy.types.Menu.draw_preset +class USERPREF_MT_appconfigs(bpy.types.Menu): + bl_label = "AppPresets" + preset_subdir = "keyconfig" + preset_operator = "wm.appconfig_activate" + + def draw(self, context): + props = self.layout.operator("wm.appconfig_default", text="Blender (default)") + + # now draw the presets + bpy.types.Menu.draw_preset(self, context) class USERPREF_MT_splash(bpy.types.Menu): bl_label = "Splash" @@ -134,7 +144,7 @@ class USERPREF_MT_splash(bpy.types.Menu): # text = bpy.path.display_name(context.window_manager.keyconfigs.active.name) # if not text: # text = "Blender (default)" - row.menu("USERPREF_MT_keyconfigs", text="Preset") + row.menu("USERPREF_MT_appconfigs", text="Preset") class USERPREF_PT_interface(bpy.types.Panel): |