[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56209] trunk/blender: Fix #34350: Maya Keyboard map preset problems

Sergey Sharybin sergey.vfx at gmail.com
Mon Apr 22 16:56:46 CEST 2013


Revision: 56209
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56209
Author:   nazgul
Date:     2013-04-22 14:56:41 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
Fix #34350: Maya Keyboard map preset problems

Two main things:

- Made a python operator for selection in a viewport
  which will de-select everything if nothing is under
  the mouse.

  To do so needed to modify VIEW3D_OT_select, so invoke
  sets mouse location which is later used by exec
  function.

  This way it's possible to select stuff from python
  defined operator.

  Not best-ever solution since ideally exec() shall not
  do OpenGL stuff, but we've got this issue in some
  other operators. We'll solve this later.

- Used a keymap from Gianmichele Mariani as a reference,
  updated his keymap to latest changes in operators.

  We shall match Maya keymap much better now, thanks
  for the keymap dude!

Modified Paths:
--------------
    trunk/blender/release/scripts/presets/interaction/maya.py
    trunk/blender/release/scripts/presets/keyconfig/maya.py
    trunk/blender/release/scripts/startup/bl_operators/view3d.py
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c

Modified: trunk/blender/release/scripts/presets/interaction/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/maya.py	2013-04-22 14:27:12 UTC (rev 56208)
+++ trunk/blender/release/scripts/presets/interaction/maya.py	2013-04-22 14:56:41 UTC (rev 56209)
@@ -7,4 +7,4 @@
 bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
 bpy.context.user_preferences.inputs.view_zoom_axis = 'HORIZONTAL'
 bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_mouse_zoom = True
+bpy.context.user_preferences.inputs.invert_mouse_zoom = False

Modified: trunk/blender/release/scripts/presets/keyconfig/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/keyconfig/maya.py	2013-04-22 14:27:12 UTC (rev 56208)
+++ trunk/blender/release/scripts/presets/keyconfig/maya.py	2013-04-22 14:56:41 UTC (rev 56209)
@@ -1,19 +1,891 @@
 # Configuration Maya
 import bpy
+import os
 
 wm = bpy.context.window_manager
-kc = wm.keyconfigs.new('maya')
+kc = wm.keyconfigs.new(os.path.splitext(os.path.basename(__file__))[0])
 
+# Map Window
+km = kc.keymaps.new('Window', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('wm.window_duplicate', 'W', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.read_homefile', 'N', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.save_homefile', 'U', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, ctrl=True)
+kmi.properties.name = 'INFO_MT_file_open_recent'
+kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.open_mainfile', 'F1', 'PRESS')
+kmi = km.keymap_items.new('wm.link_append', 'O', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.link_append', 'F1', 'PRESS', shift=True)
+kmi.properties.link = False
+kmi.properties.instance_groups = False
+kmi = km.keymap_items.new('wm.save_mainfile', 'S', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.save_as_mainfile', 'S', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('wm.save_as_mainfile', 'F2', 'PRESS')
+kmi = km.keymap_items.new('wm.save_as_mainfile', 'S', 'PRESS', ctrl=True, alt=True)
+kmi.properties.copy = True
+kmi = km.keymap_items.new('wm.window_fullscreen_toggle', 'F11', 'PRESS', alt=True)
+kmi = km.keymap_items.new('wm.quit_blender', 'Q', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.redraw_timer', 'T', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.debug_menu', 'D', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.search_menu', 'SPACE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.call_menu', 'NDOF_BUTTON_MENU', 'PRESS')
+kmi.properties.name = 'USERPREF_MT_ndof_settings'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F2', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'LOGIC_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F3', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'NODE_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F4', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'CONSOLE'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F5', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'VIEW_3D'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F6', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'GRAPH_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F7', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'PROPERTIES'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F8', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'SEQUENCE_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F9', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'OUTLINER'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F10', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'IMAGE_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F11', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'TEXT_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F12', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'DOPESHEET_EDITOR'
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_PLUS', 'PRESS')
+kmi.properties.decrease = False
+kmi.properties.fast = False
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_MINUS', 'PRESS')
+kmi.properties.decrease = True
+kmi.properties.fast = False
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_PLUS', 'PRESS', shift=True)
+kmi.properties.decrease = False
+kmi.properties.fast = True
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_MINUS', 'PRESS', shift=True)
+kmi.properties.decrease = True
+kmi.properties.fast = True
+kmi = km.keymap_items.new('info.reports_display_update', 'TIMER', 'ANY', any=True)
+
+# Map Screen
+km = kc.keymaps.new('Screen', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('screen.animation_step', 'TIMER0', 'ANY', any=True)
+kmi = km.keymap_items.new('screen.screen_set', 'RIGHT_ARROW', 'PRESS', ctrl=True)
+kmi.properties.delta = 1
+kmi = km.keymap_items.new('screen.screen_set', 'LEFT_ARROW', 'PRESS', ctrl=True)
+kmi.properties.delta = -1
+kmi = km.keymap_items.new('screen.screen_full_area', 'SPACE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('screen.screenshot', 'F3', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('screen.screencast', 'F3', 'PRESS', alt=True)
+kmi = km.keymap_items.new('screen.region_quadview', 'SPACE', 'PRESS')
+kmi = km.keymap_items.new('screen.repeat_history', 'F3', 'PRESS')
+kmi = km.keymap_items.new('screen.repeat_last', 'G', 'PRESS')
+kmi = km.keymap_items.new('screen.region_flip', 'F5', 'PRESS')
+kmi = km.keymap_items.new('screen.redo_last', 'F6', 'PRESS')
+kmi = km.keymap_items.new('script.reload', 'F8', 'PRESS')
+kmi = km.keymap_items.new('file.execute', 'RET', 'PRESS')
+kmi = km.keymap_items.new('file.execute', 'NUMPAD_ENTER', 'PRESS')
+kmi = km.keymap_items.new('file.cancel', 'ESC', 'PRESS')
+kmi = km.keymap_items.new('ed.undo', 'Z', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('ed.redo', 'Z', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('ed.undo_history', 'Z', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('render.render', 'F12', 'PRESS')
+kmi = km.keymap_items.new('render.render', 'F12', 'PRESS', ctrl=True)
+kmi.properties.animation = True
+kmi = km.keymap_items.new('render.view_cancel', 'ESC', 'PRESS')
+kmi = km.keymap_items.new('render.view_show', 'F11', 'PRESS')
+kmi = km.keymap_items.new('render.play_rendered_anim', 'F11', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('screen.userpref_show', 'U', 'PRESS', ctrl=True, alt=True)
+
+# Map View2D
+km = kc.keymaps.new('View2D', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('view2d.scroller_activate', 'LEFTMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroller_activate', 'MIDDLEMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.pan', 'MIDDLEMOUSE', 'PRESS', alt=True)
+kmi = km.keymap_items.new('view2d.pan', 'MIDDLEMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view2d.pan', 'TRACKPADPAN', 'ANY')
+kmi = km.keymap_items.new('view2d.scroll_right', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view2d.scroll_left', 'WHEELUPMOUSE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view2d.scroll_down', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view2d.scroll_up', 'WHEELUPMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view2d.zoom_out', 'WHEELOUTMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_in', 'WHEELINMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_out', 'NUMPAD_MINUS', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_in', 'NUMPAD_PLUS', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_down', 'WHEELDOWNMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_up', 'WHEELUPMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_right', 'WHEELDOWNMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_left', 'WHEELUPMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom', 'RIGHTMOUSE', 'PRESS', alt=True)
+kmi = km.keymap_items.new('view2d.zoom', 'TRACKPADZOOM', 'ANY')
+kmi = km.keymap_items.new('view2d.zoom_border', 'B', 'PRESS', shift=True)
+
+# Map Frames
+km = kc.keymaps.new('Frames', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('screen.frame_offset', 'LEFT_ARROW', 'PRESS')
+kmi.properties.delta = -1
+kmi = km.keymap_items.new('screen.frame_offset', 'RIGHT_ARROW', 'PRESS')
+kmi.properties.delta = 1
+kmi = km.keymap_items.new('screen.frame_offset', 'WHEELDOWNMOUSE', 'PRESS', alt=True)
+kmi.properties.delta = 1
+kmi = km.keymap_items.new('screen.frame_offset', 'WHEELUPMOUSE', 'PRESS', alt=True)
+kmi.properties.delta = -1
+kmi = km.keymap_items.new('screen.frame_jump', 'V', 'PRESS', shift=True, alt=True)
+kmi.properties.end = False
+kmi = km.keymap_items.new('screen.keyframe_jump', 'UP_ARROW', 'PRESS')
+kmi.properties.next = True
+kmi = km.keymap_items.new('screen.keyframe_jump', 'COMMA', 'PRESS')
+kmi.properties.next = False
+kmi = km.keymap_items.new('screen.keyframe_jump', 'MEDIA_LAST', 'PRESS')
+kmi.properties.next = True
+kmi = km.keymap_items.new('screen.keyframe_jump', 'MEDIA_FIRST', 'PRESS')
+kmi.properties.next = False
+kmi = km.keymap_items.new('screen.animation_play', 'V', 'PRESS', alt=True)
+kmi = km.keymap_items.new('screen.animation_cancel', 'ESC', 'PRESS')
+kmi = km.keymap_items.new('screen.animation_play', 'MEDIA_PLAY', 'PRESS')
+kmi = km.keymap_items.new('screen.animation_cancel', 'MEDIA_STOP', 'PRESS')
+
+# Map View2D Buttons List
+km = kc.keymaps.new('View2D Buttons List', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('view2d.scroller_activate', 'LEFTMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroller_activate', 'MIDDLEMOUSE', 'PRESS')

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list