From 472800eb4e6201eceebf3c6538807a2aa2cd74af Mon Sep 17 00:00:00 2001 From: jim man Date: Fri, 16 Jul 2021 14:20:25 +0200 Subject: Cleanup: node wrangler, use dict in `nice_hotkey_name()` Rewrite `nice_hotkey_name()` to use a `dict` instead of a loop over a list of tuples. Reviewed by: sybren Differential Revision: https://developer.blender.org/D11943 --- node_wrangler.py | 104 ++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 54 deletions(-) (limited to 'node_wrangler.py') diff --git a/node_wrangler.py b/node_wrangler.py index cf70308b..f9008fbb 100644 --- a/node_wrangler.py +++ b/node_wrangler.py @@ -617,60 +617,56 @@ def is_visible_socket(socket): def nice_hotkey_name(punc): # convert the ugly string name into the actual character - pairs = ( - ('LEFTMOUSE', "LMB"), - ('MIDDLEMOUSE', "MMB"), - ('RIGHTMOUSE', "RMB"), - ('WHEELUPMOUSE', "Wheel Up"), - ('WHEELDOWNMOUSE', "Wheel Down"), - ('WHEELINMOUSE', "Wheel In"), - ('WHEELOUTMOUSE', "Wheel Out"), - ('ZERO', "0"), - ('ONE', "1"), - ('TWO', "2"), - ('THREE', "3"), - ('FOUR', "4"), - ('FIVE', "5"), - ('SIX', "6"), - ('SEVEN', "7"), - ('EIGHT', "8"), - ('NINE', "9"), - ('OSKEY', "Super"), - ('RET', "Enter"), - ('LINE_FEED', "Enter"), - ('SEMI_COLON', ";"), - ('PERIOD', "."), - ('COMMA', ","), - ('QUOTE', '"'), - ('MINUS', "-"), - ('SLASH', "/"), - ('BACK_SLASH', "\\"), - ('EQUAL', "="), - ('NUMPAD_1', "Numpad 1"), - ('NUMPAD_2', "Numpad 2"), - ('NUMPAD_3', "Numpad 3"), - ('NUMPAD_4', "Numpad 4"), - ('NUMPAD_5', "Numpad 5"), - ('NUMPAD_6', "Numpad 6"), - ('NUMPAD_7', "Numpad 7"), - ('NUMPAD_8', "Numpad 8"), - ('NUMPAD_9', "Numpad 9"), - ('NUMPAD_0', "Numpad 0"), - ('NUMPAD_PERIOD', "Numpad ."), - ('NUMPAD_SLASH', "Numpad /"), - ('NUMPAD_ASTERIX', "Numpad *"), - ('NUMPAD_MINUS', "Numpad -"), - ('NUMPAD_ENTER', "Numpad Enter"), - ('NUMPAD_PLUS', "Numpad +"), - ) - nice_punc = False - for (ugly, nice) in pairs: - if punc == ugly: - nice_punc = nice - break - if not nice_punc: - nice_punc = punc.replace("_", " ").title() - return nice_punc + nice_name = { + 'LEFTMOUSE': "LMB", + 'MIDDLEMOUSE': "MMB", + 'RIGHTMOUSE': "RMB", + 'WHEELUPMOUSE': "Wheel Up", + 'WHEELDOWNMOUSE': "Wheel Down", + 'WHEELINMOUSE': "Wheel In", + 'WHEELOUTMOUSE': "Wheel Out", + 'ZERO': "0", + 'ONE': "1", + 'TWO': "2", + 'THREE': "3", + 'FOUR': "4", + 'FIVE': "5", + 'SIX': "6", + 'SEVEN': "7", + 'EIGHT': "8", + 'NINE': "9", + 'OSKEY': "Super", + 'RET': "Enter", + 'LINE_FEED': "Enter", + 'SEMI_COLON': ";", + 'PERIOD': ".", + 'COMMA': ",", + 'QUOTE': '"', + 'MINUS': "-", + 'SLASH': "/", + 'BACK_SLASH': "\\", + 'EQUAL': "=", + 'NUMPAD_1': "Numpad 1", + 'NUMPAD_2': "Numpad 2", + 'NUMPAD_3': "Numpad 3", + 'NUMPAD_4': "Numpad 4", + 'NUMPAD_5': "Numpad 5", + 'NUMPAD_6': "Numpad 6", + 'NUMPAD_7': "Numpad 7", + 'NUMPAD_8': "Numpad 8", + 'NUMPAD_9': "Numpad 9", + 'NUMPAD_0': "Numpad 0", + 'NUMPAD_PERIOD': "Numpad .", + 'NUMPAD_SLASH': "Numpad /", + 'NUMPAD_ASTERIX': "Numpad *", + 'NUMPAD_MINUS': "Numpad -", + 'NUMPAD_ENTER': "Numpad Enter", + 'NUMPAD_PLUS': "Numpad +", + } + try: + return nice_name[punc] + except KeyError: + return punc.replace("_", " ").title() def force_update(context): -- cgit v1.2.3