[Bf-blender-cvs] [33254875300] blender2.8: Keymap: 2.7x macos-only additions

Campbell Barton noreply at git.blender.org
Fri Jun 29 09:20:26 CEST 2018


Commit: 332548753008f941d920c8a9ee1079dbf1895d37
Author: Campbell Barton
Date:   Fri Jun 29 09:17:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB332548753008f941d920c8a9ee1079dbf1895d37

Keymap: 2.7x macos-only additions

===================================================================

M	release/scripts/presets/keyconfig/blender_27x.py

===================================================================

diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py
index e7d9752c93f..cc55f98675f 100644
--- a/release/scripts/presets/keyconfig/blender_27x.py
+++ b/release/scripts/presets/keyconfig/blender_27x.py
@@ -1,5 +1,5 @@
 import bpy
-import os
+from sys import platform
 
 def kmi_props_setattr(kmi_props, attr, value):
     try:
@@ -10,8 +10,10 @@ def kmi_props_setattr(kmi_props, attr, value):
     except Exception as e:
         print("Warning: %r" % e)
 
+import os
 wm = bpy.context.window_manager
 kc = wm.keyconfigs.new(os.path.splitext(os.path.basename(__file__))[0])
+del os
 
 # Map Image Editor Tool:  VIEW, Select Border
 km = kc.keymaps.new('Image Editor Tool:  VIEW, Select Border', space_type='IMAGE_EDITOR', region_type='WINDOW', modal=False)
@@ -290,6 +292,14 @@ kmi = km.keymap_items.new('paint.weight_gradient', 'EVT_TWEAK_A', 'ANY')
 km = kc.keymaps.new('Window', space_type='EMPTY', region_type='WINDOW', modal=False)
 
 kmi = km.keymap_items.new('wm.window_new', 'W', 'PRESS', ctrl=True, alt=True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('wm.read_homefile', 'N', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, oskey=True)
+	kmi_props_setattr(kmi.properties, 'name', 'INFO_MT_file_open_recent')
+	kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('wm.save_mainfile', 'S', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('wm.save_as_mainfile', 'S', 'PRESS', shift=True, oskey=True)
+	kmi = km.keymap_items.new('wm.quit_blender', 'Q', 'PRESS', oskey=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)
@@ -383,6 +393,10 @@ 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')
+if platform == "darwin":
+	kmi = km.keymap_items.new('ed.undo', 'Z', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('ed.redo', 'Z', 'PRESS', shift=True, oskey=True)
+	kmi = km.keymap_items.new('ed.undo_history', 'Z', 'PRESS', alt=True, oskey=True)
 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)
@@ -394,6 +408,8 @@ kmi_props_setattr(kmi.properties, 'use_viewport', 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)
+if platform == "darwin":
+	kmi = km.keymap_items.new('screen.userpref_show', 'COMMA', 'PRESS', oskey=True)
 kmi = km.keymap_items.new('screen.userpref_show', 'U', 'PRESS', ctrl=True, alt=True)
 
 # Map Screen Editing
@@ -643,6 +659,11 @@ kmi = km.keymap_items.new('action.copy', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('action.paste', 'V', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('action.paste', 'V', 'PRESS', shift=True, ctrl=True)
 kmi_props_setattr(kmi.properties, 'flipped', True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('action.copy', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('action.paste', 'V', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('action.paste', 'V', 'PRESS', shift=True, oskey=True)
+	kmi_props_setattr(kmi.properties, 'flipped', True)
 kmi = km.keymap_items.new('action.previewrange_set', 'P', 'PRESS', ctrl=True, alt=True)
 kmi = km.keymap_items.new('action.view_all', 'HOME', 'PRESS')
 kmi = km.keymap_items.new('action.view_all', 'NDOF_BUTTON_FIT', 'PRESS')
@@ -808,6 +829,9 @@ kmi = km.keymap_items.new('gpencil.stroke_join', 'J', 'PRESS', shift=True, ctrl=
 kmi_props_setattr(kmi.properties, 'type', 'JOINCOPY')
 kmi = km.keymap_items.new('gpencil.copy', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('gpencil.paste', 'V', 'PRESS', ctrl=True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('gpencil.copy', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('gpencil.paste', 'V', 'PRESS', oskey=True)
 kmi = km.keymap_items.new('wm.call_menu', 'S', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'name', 'GPENCIL_MT_snap')
 kmi = km.keymap_items.new('gpencil.convert', 'C', 'PRESS', alt=True)
@@ -915,6 +939,12 @@ kmi = km.keymap_items.new('pose.copy', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('pose.paste', 'V', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'flipped', False)
 kmi = km.keymap_items.new('pose.paste', 'V', 'PRESS', shift=True, ctrl=True)
+if platform == "darwin":
+	kmi_props_setattr(kmi.properties, 'flipped', True)
+	kmi = km.keymap_items.new('pose.copy', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('pose.paste', 'V', 'PRESS', oskey=True)
+	kmi_props_setattr(kmi.properties, 'flipped', False)
+	kmi = km.keymap_items.new('pose.paste', 'V', 'PRESS', shift=True, oskey=True)
 kmi_props_setattr(kmi.properties, 'flipped', True)
 kmi = km.keymap_items.new('pose.select_all', 'A', 'PRESS')
 kmi_props_setattr(kmi.properties, 'action', 'TOGGLE')
@@ -2118,6 +2148,11 @@ kmi = km.keymap_items.new('font.select_all', 'A', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('font.text_copy', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('font.text_cut', 'X', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('font.text_paste', 'V', 'PRESS', ctrl=True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('font.select_all', 'A', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('font.text_copy', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('font.text_cut', 'X', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('font.text_paste', 'V', 'PRESS', oskey=True)
 kmi = km.keymap_items.new('font.line_break', 'RET', 'PRESS')
 kmi = km.keymap_items.new('font.text_insert', 'TEXTINPUT', 'ANY', any=True)
 kmi = km.keymap_items.new('font.text_insert', 'BACK_SPACE', 'PRESS', alt=True)
@@ -2403,6 +2438,9 @@ kmi = km.keymap_items.new('view3d.camera_to_view', 'NUMPAD_0', 'PRESS', ctrl=Tru
 kmi = km.keymap_items.new('view3d.object_as_camera', 'NUMPAD_0', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('wm.call_menu', 'S', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'name', 'VIEW3D_MT_snap')
+if platform == "darwin":
+	kmi = km.keymap_items.new('view3d.copybuffer', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('view3d.pastebuffer', 'V', 'PRESS', oskey=True)
 kmi = km.keymap_items.new('view3d.copybuffer', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('view3d.pastebuffer', 'V', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('wm.context_set_enum', 'COMMA', 'PRESS')
@@ -2862,6 +2900,11 @@ kmi = km.keymap_items.new('graph.copy', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('graph.paste', 'V', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('graph.paste', 'V', 'PRESS', shift=True, ctrl=True)
 kmi_props_setattr(kmi.properties, 'flipped', True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('graph.copy', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('graph.paste', 'V', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('graph.paste', 'V', 'PRESS', shift=True, oskey=True)
+	kmi_props_setattr(kmi.properties, 'flipped', True)
 kmi = km.keymap_items.new('graph.previewrange_set', 'P', 'PRESS', ctrl=True, alt=True)
 kmi = km.keymap_items.new('graph.view_all', 'HOME', 'PRESS')
 kmi = km.keymap_items.new('graph.view_all', 'NDOF_BUTTON_FIT', 'PRESS')
@@ -3102,6 +3145,9 @@ kmi = km.keymap_items.new('node.read_viewlayers', 'R', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('node.render_changed', 'Z', 'PRESS')
 kmi = km.keymap_items.new('node.clipboard_copy', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('node.clipboard_paste', 'V', 'PRESS', ctrl=True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('node.clipboard_copy', 'C', 'PRESS', oskey=True)
+	kmi = km.keymap_items.new('node.clipboard_paste', 'V', 'PRESS', oskey=True)
 kmi = km.keymap_items.new('node.viewer_border', 'B', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('node.clear_viewer_border', 'B', 'PRESS', ctrl=True, alt=True)
 kmi = km.keymap_items.new('node.translate_attach', 'G', 'PRESS')
@@ -3133,6 +3179,8 @@ kmi = km.keymap_items.new('info.report_replay', 'R', 'PRESS')
 kmi = km.keymap_items.new('info.report_delete', 'X', 'PRESS')
 kmi = km.keymap_items.new('info.report_delete', 'DEL', 'PRESS')
 kmi = km.keymap_items.new('info.report_copy', 'C', 'PRESS', ctrl=True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('info.report_copy', 'C', 'PRESS', oskey=True)
 
 # Map File Browser
 km = kc.keymaps.new('File Browser', space_type='FILE_BROWSER', region_type='WINDOW', modal=False)
@@ -3340,6 +3388,8 @@ kmi = km.keymap_items.new('marker.rename', 'M', 'PRESS', ctrl=True)
 km = kc.keymaps.new('Text Generic', space_type='TEXT_EDITOR', region_type='WINDOW', modal=False)
 
 kmi = km.keymap_items.new('text.start_find', 'F', 'PRESS', ctrl=True)
+if platform == "darwin":
+	kmi = km.keymap_items.new('text.start_find', 'F', 'PRESS', oskey=True)
 kmi = km.keymap_items.new('text.jump', 'J', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('text.find', 'G', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('text.replace', 'H', 'PRESS', ctrl=True)
@@ -3348,6 +3398,41 @@ kmi = km.keymap_items.new('text.properties', 'T', 'PRESS', ctrl=True)
 # Map Text
 km = kc.keymaps.new('Text', space_type='TEXT_EDITOR', region_type='WINDOW', modal=False)
 
+if platform == "darwin":
+	kmi = km.keymap_items.new('text.move', 'LEFT_ARROW', 'PRESS', oskey=True)
+	kmi_props_setattr(kmi.properties, 'type', 'LINE_BEGIN')
+	kmi = km.keymap_items.new('text.move', 'RIGHT_ARROW', 'PRESS', oskey=True)
+	kmi_props_setattr(kmi.properties, 'type', 'LINE_END')
+	kmi = km.keymap_items.new('text.move', 'LEFT_ARROW', 'PRESS', alt=True)
+	kmi_props_setattr(kmi.properties, 'type', 'PREVIOUS_WORD')
+	kmi = km.keymap_items.new('text.move', 'RIGHT_ARROW', 'PRESS', alt=True)
+	kmi_props_setattr(kmi.p

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list