From e57076c84f55603bda39229ce9cfaaf1ea81417d Mon Sep 17 00:00:00 2001 From: Dirk Olbrich Date: Mon, 27 May 2024 14:19:02 +0200 Subject: [PATCH] [BBIM] Add preference option for default startup workspace, remove ambiguous wording (#4749) * [BlenderBIM] change ambiguous wording from preferences * [BlenderBIM] add option for BIM as default workspace * [BlenderBIM] revert variable name change --- src/blenderbim/blenderbim/bim/handler.py | 3 ++- src/blenderbim/blenderbim/bim/ui.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/handler.py b/src/blenderbim/blenderbim/bim/handler.py index 49cb42cf9b..6855c9ba80 100644 --- a/src/blenderbim/blenderbim/bim/handler.py +++ b/src/blenderbim/blenderbim/bim/handler.py @@ -301,7 +301,8 @@ def load_post(scene): if bpy.context.preferences.addons["blenderbim"].preferences.should_setup_workspace: if "BIM" in bpy.data.workspaces: - bpy.context.window.workspace = bpy.data.workspaces["BIM"] + if bpy.context.preferences.addons["blenderbim"].preferences.activate_workspace: + bpy.context.window.workspace = bpy.data.workspaces["BIM"] else: bpy.ops.workspace.append_activate(idname="BIM", filepath=os.path.join(cwd, "data", "workspace.blend")) diff --git a/src/blenderbim/blenderbim/bim/ui.py b/src/blenderbim/blenderbim/bim/ui.py index 0de6b9cc23..664102ac22 100644 --- a/src/blenderbim/blenderbim/bim/ui.py +++ b/src/blenderbim/blenderbim/bim/ui.py @@ -195,18 +195,19 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): pdf_command: StringProperty(name="PDF Command", description='E.g. [["firefox", "path"]]') spreadsheet_command: StringProperty(name="Spreadsheet Command", description='E.g. [["libreoffice", "path"]]') openlca_port: IntProperty(name="OpenLCA IPC Port", default=8080) - should_hide_empty_props: BoolProperty(name="Should Hide Empty Properties", default=True) - should_setup_workspace: BoolProperty(name="Should Setup Workspace Layout for BIM", default=True) + should_hide_empty_props: BoolProperty(name="Hide Empty Properties", default=True) + should_setup_workspace: BoolProperty(name="Setup Workspace Layout for BIM", default=True) + activate_workspace: BoolProperty(name="Activate BIM Workspace on Startup", default=True) should_setup_toolbar: BoolProperty( name="Always Show Toolbar In 3D Viewport", default=True, description="If disabled, the toolbar will only load when an IFC model is active", ) should_play_chaching_sound: BoolProperty( - name="Should Make A Cha-Ching Sound When Project Costs Updates", default=False + name="Play A Cha-Ching Sound When Project Costs Updates", default=False ) - lock_grids_on_import: BoolProperty(name="Should Lock Grids By Default", default=True) - spatial_elements_unselectable: BoolProperty(name="Should Make Spatial Elements Unselectable By Default", default=True) + lock_grids_on_import: BoolProperty(name="Lock Grids By Default", default=True) + spatial_elements_unselectable: BoolProperty(name="Make Spatial Elements Unselectable By Default", default=True) decorations_colour: bpy.props.FloatVectorProperty( name="Decorations Colour", subtype="COLOR", default=(1, 1, 1, 1), min=0.0, max=1.0, size=4 ) @@ -283,6 +284,8 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): row = layout.row() row.prop(self, "should_setup_workspace") row = layout.row() + row.prop(self, "activate_workspace") + row = layout.row() row.prop(self, "should_setup_toolbar") row = layout.row() row.prop(self, "should_play_chaching_sound")