diff --git a/__init__.py b/__init__.py index 08ed1f3..60685ad 100644 --- a/__init__.py +++ b/__init__.py @@ -33,7 +33,7 @@ ] -def register_keymaps(menumodes, panelmodes, keyconfig): +def register_keymaps(menumodes, panelmodes, keyconfig): # Deactivating menus for i in menumodes: for key in keyconfig.keymaps[i].keymap_items: @@ -47,7 +47,11 @@ def register_keymaps(menumodes, panelmodes, keyconfig): # Deactivating panels for i in panelmodes: for key in keyconfig.keymaps[i].keymap_items: - if key.idname == "wm.call_panel" and key.type == "RIGHTMOUSE" and key.active: + if ( + key.idname == "wm.call_panel" + and key.type == "RIGHTMOUSE" + and key.active + ): key.active = False # Changing the Walk Modal Map @@ -90,7 +94,7 @@ def rebind_rmb(scene): addon_prefs = bpy.context.preferences.addons[__package__].preferences addon_prefs.menumodes = menumodes addon_prefs.panelmodes = panelmodes - + wm = bpy.context.window_manager active_keyconfig = wm.keyconfigs.active addon_keyconfig = wm.keyconfigs.addon @@ -99,13 +103,19 @@ def rebind_rmb(scene): try: addon_prefs.rebind_3dview_keymap(active_keyconfig, addon_prefs.rmb_pan_rotate) - addon_prefs.rebind_switch_nav_rotate(active_keyconfig, addon_keyconfig, addon_prefs.rmb_rotate_switch) + addon_prefs.rebind_switch_nav_rotate( + active_keyconfig, addon_keyconfig, addon_prefs.rmb_rotate_switch + ) except KeyError: addon_prefs.rebind_3dview_keymap(blender_keyconfig, addon_prefs.rmb_pan_rotate) - addon_prefs.rebind_switch_nav_rotate(blender_keyconfig, addon_keyconfig, addon_prefs.rmb_rotate_switch) + addon_prefs.rebind_switch_nav_rotate( + blender_keyconfig, addon_keyconfig, addon_prefs.rmb_rotate_switch + ) except KeyError: addon_prefs.rebind_3dview_keymap(user_keyconfig, addon_prefs.rmb_pan_rotate) - addon_prefs.rebind_switch_nav_rotate(user_keyconfig, addon_keyconfig, addon_prefs.rmb_rotate_switch) + addon_prefs.rebind_switch_nav_rotate( + user_keyconfig, addon_keyconfig, addon_prefs.rmb_rotate_switch + ) def register(): diff --git a/operators.py b/operators.py index 60f7011..3ef2f99 100644 --- a/operators.py +++ b/operators.py @@ -105,10 +105,15 @@ def callMenu(self, context): if space_type == "NODE_EDITOR": node_tree = context.space_data.node_tree if node_tree: - if node_tree.nodes.active is not None and node_tree.nodes.active.select: + if ( + node_tree.nodes.active is not None + and node_tree.nodes.active.select + ): bpy.ops.wm.call_menu(name="NODE_MT_context_menu") else: - bpy.ops.wm.search_single_menu("INVOKE_DEFAULT", menu_idname="NODE_MT_add") + bpy.ops.wm.search_single_menu( + "INVOKE_DEFAULT", menu_idname="NODE_MT_add" + ) else: try: bpy.ops.wm.call_menu(name=self.menu_by_mode[context.mode]) @@ -181,5 +186,7 @@ class RMN_OT_toggle_cam_navigation(Operator): def execute(self, context): addon_prefs = context.preferences.addons[__package__].preferences - addon_prefs.disable_camera_navigation = not addon_prefs.disable_camera_navigation + addon_prefs.disable_camera_navigation = ( + not addon_prefs.disable_camera_navigation + ) return {"FINISHED"} diff --git a/preferences.py b/preferences.py index cc0e625..343b80e 100644 --- a/preferences.py +++ b/preferences.py @@ -67,7 +67,7 @@ def update_node_keymap(self, context): key.active = addon_prefs.enable_for_node_editors -def update_rebind_3dview_keymap(self, context): +def update_rebind_3dview_keymap(self, context): wm = context.window_manager active_keyconfig = wm.keyconfigs.active blender_keyconfig = wm.keyconfigs["Blender"] @@ -81,7 +81,7 @@ def update_rebind_3dview_keymap(self, context): self.rebind_3dview_keymap(user_keyconfig, self.rmb_pan_rotate) -def update_rebind_switch_nav_rotate(self, context): +def update_rebind_switch_nav_rotate(self, context): wm = context.window_manager active_keyconfig = wm.keyconfigs.active addon_keyconfig = wm.keyconfigs.addon @@ -89,11 +89,17 @@ def update_rebind_switch_nav_rotate(self, context): user_keyconfig = wm.keyconfigs["Blender user"] try: - self.rebind_switch_nav_rotate(active_keyconfig, addon_keyconfig, self.rmb_rotate_switch) + self.rebind_switch_nav_rotate( + active_keyconfig, addon_keyconfig, self.rmb_rotate_switch + ) except KeyError: - self.rebind_switch_nav_rotate(blender_keyconfig, addon_keyconfig, self.rmb_rotate_switch) + self.rebind_switch_nav_rotate( + blender_keyconfig, addon_keyconfig, self.rmb_rotate_switch + ) except KeyError: - self.rebind_switch_nav_rotate(user_keyconfig, addon_keyconfig, self.rmb_rotate_switch) + self.rebind_switch_nav_rotate( + user_keyconfig, addon_keyconfig, self.rmb_rotate_switch + ) class RightMouseNavigationPreferences(AddonPreferences): @@ -261,7 +267,7 @@ def rebind_3dview_keymap(self, keyconfig, isActive): if key.idname == "transform.translate" and key.type == "MIDDLEMOUSE": key.type = "RIGHTMOUSE" - def rebind_switch_nav_rotate(self, keyconfig, addon_kc, isActive): + def rebind_switch_nav_rotate(self, keyconfig, addon_kc, isActive): if isActive: for key in addon_kc.keymaps["3D View"].keymap_items: if key.idname == "rmn.right_mouse_navigation": @@ -349,7 +355,9 @@ def draw(self, context): if panel: row = panel.row() row.prop(self, "rmb_pan_rotate", text="Swap MMB & RMB Navigation Controls") - row.prop(self, "rmb_rotate_switch", text="Require Alt for Walk/Fly Navigation") + row.prop( + self, "rmb_rotate_switch", text="Require Alt for Walk/Fly Navigation" + ) # Split the layout at 30% split = panel.split(factor=0.3) @@ -413,7 +421,9 @@ def draw(self, context): row.label(text="", icon="MOUSE_RMB_DRAG") label = row.row() label.active = False - text = "(Alt + Right Mouse)" if not self.rmb_rotate_switch else "(Right Mouse)" + text = ( + "(Alt + Right Mouse)" if not self.rmb_rotate_switch else "(Right Mouse)" + ) label.label(text=text) row = content.row(align=True)