Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-07 00:29:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-07 00:29:00 +0400
commit2cabb498dcd0664ad8940eefae9d012b175ad829 (patch)
tree1eccd68ff55ed7b4290983fcd6c0a98f645c773b /release/scripts
parentc02526bdf97e2972971266ff0cec48482f719352 (diff)
bugfix [#23988] The Maya preset as default
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/op/presets.py2
-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.py6
-rw-r--r--release/scripts/ui/space_userpref_keymap.py4
4 files changed, 9 insertions, 5 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