Update for keymap changes.

This commit is contained in:
Brecht Van Lommel 2018-11-23 14:53:01 +01:00
parent bd6178fa6f
commit 8959f1798c
4 changed files with 9 additions and 9 deletions

View File

@ -52,7 +52,9 @@ class Keymaps:
"""
# provide abstration between user and addon
# with different select mouse side
mouse_right = context.user_preferences.inputs.select_mouse
wm = context.window_manager
keyconfig = wm.keyconfigs.active
mouse_right = getattr(keyconfig.preferences, "select_mouse", "LEFT")
if mouse_right == 'LEFT':
mouse_left = 'RIGHT'
mouse_right_side = 'Left'

View File

@ -146,9 +146,9 @@ class MyChecker():
allkeys = [
"LEFTMOUSE", "MIDDLEMOUSE", "RIGHTMOUSE", "BUTTON4MOUSE", "BUTTON5MOUSE", "BUTTON6MOUSE",
"BUTTON7MOUSE",
"ACTIONMOUSE", "SELECTMOUSE", "MOUSEMOVE", "INBETWEEN_MOUSEMOVE", "TRACKPADPAN", "TRACKPADZOOM",
"MOUSEMOVE", "INBETWEEN_MOUSEMOVE", "TRACKPADPAN", "TRACKPADZOOM",
"MOUSEROTATE", "WHEELUPMOUSE", "WHEELDOWNMOUSE", "WHEELINMOUSE", "WHEELOUTMOUSE", "EVT_TWEAK_L",
"EVT_TWEAK_M", "EVT_TWEAK_R", "EVT_TWEAK_A", "EVT_TWEAK_S", "A", "B", "C", "D", "E", "F", "G", "H",
"EVT_TWEAK_M", "EVT_TWEAK_R", "A", "B", "C", "D", "E", "F", "G", "H",
"I", "J",
"K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "ZERO", "ONE", "TWO",
"THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "LEFT_CTRL", "LEFT_ALT", "LEFT_SHIFT",
@ -309,8 +309,6 @@ class IskeyFreeProperties(PropertyGroup):
("BUTTON5MOUSE", "BUTTON5MOUSE", ""),
("BUTTON6MOUSE", "BUTTON6MOUSE", ""),
("BUTTON7MOUSE", "BUTTON7MOUSE", ""),
("ACTIONMOUSE", "ACTIONMOUSE", ""),
("SELECTMOUSE", "SELECTMOUSE", ""),
("MOUSEMOVE", "MOUSEMOVE", ""),
("INBETWEEN_MOUSEMOVE", "INBETWEEN_MOUSEMOVE", ""),
("TRACKPADPAN", "TRACKPADPAN", ""),
@ -323,8 +321,6 @@ class IskeyFreeProperties(PropertyGroup):
("EVT_TWEAK_L", "EVT_TWEAK_L", ""),
("EVT_TWEAK_M", "EVT_TWEAK_M", ""),
("EVT_TWEAK_R", "EVT_TWEAK_R", ""),
("EVT_TWEAK_A", "EVT_TWEAK_A", ""),
("EVT_TWEAK_S", "EVT_TWEAK_S", ""),
("A", "A", ""),
("B", "B", ""),
("C", "C", ""),

View File

@ -557,7 +557,6 @@ def nice_hotkey_name(punc):
('LEFTMOUSE', "LMB"),
('MIDDLEMOUSE', "MMB"),
('RIGHTMOUSE', "RMB"),
('SELECTMOUSE', "Select"),
('WHEELUPMOUSE', "Wheel Up"),
('WHEELDOWNMOUSE', "Wheel Down"),
('WHEELINMOUSE', "Wheel In"),

View File

@ -100,7 +100,10 @@ class MUV_MVUV(bpy.types.Operator):
bmesh.update_edit_mesh(obj.data)
# check mouse preference
if context.user_preferences.inputs.select_mouse == 'RIGHT':
wm = context.window_manager
keyconfig = wm.keyconfigs.active
select_mouse = getattr(keyconfig.preferences, "select_mouse", "LEFT")
if select_mouse == 'RIGHT':
confirm_btn = 'LEFTMOUSE'
cancel_btn = 'RIGHTMOUSE'
else: