diff --git a/src/blenderbim/blenderbim/bim/__init__.py b/src/blenderbim/blenderbim/bim/__init__.py index 60f34831d3..52c4900bea 100644 --- a/src/blenderbim/blenderbim/bim/__init__.py +++ b/src/blenderbim/blenderbim/bim/__init__.py @@ -105,17 +105,17 @@ classes = [ ui.BIM_UL_generic, ui.BIM_UL_topics, ui.BIM_ADDON_preferences, - # scene panel groups --> + # Scene panel groups + ui.BIM_PT_project_info, ui.BIM_PT_project_setup, - ui.BIM_PT_utilities, ui.BIM_PT_collaboration, ui.BIM_PT_geometry, - ui.BIM_PT_4D5D, - ui.BIM_PT_structural, ui.BIM_PT_services, - ui.BIM_PT_misc, + ui.BIM_PT_structural, + ui.BIM_PT_4D5D, ui.BIM_PT_quality_control, - # object panel groups --> + ui.BIM_PT_integrations, + # Object panel groups ui.BIM_PT_object_metadata, ui.BIM_PT_geometry_object, ui.BIM_PT_services_object, diff --git a/src/blenderbim/blenderbim/bim/module/attribute/ui.py b/src/blenderbim/blenderbim/bim/module/attribute/ui.py index b99654f5f1..cc533a1183 100644 --- a/src/blenderbim/blenderbim/bim/module/attribute/ui.py +++ b/src/blenderbim/blenderbim/bim/module/attribute/ui.py @@ -60,7 +60,6 @@ class BIM_PT_object_attributes(Panel): bl_region_type = "WINDOW" bl_context = "object" bl_parent_id = "BIM_PT_object_metadata" - bl_options = {"DEFAULT_CLOSED"} @classmethod def poll(cls, context): diff --git a/src/blenderbim/blenderbim/bim/module/augin/ui.py b/src/blenderbim/blenderbim/bim/module/augin/ui.py index 8349cd8c23..896a8e5386 100644 --- a/src/blenderbim/blenderbim/bim/module/augin/ui.py +++ b/src/blenderbim/blenderbim/bim/module/augin/ui.py @@ -26,6 +26,7 @@ class BIM_PT_augin(bpy.types.Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" + bl_parent_id = "BIM_PT_integrations" def draw(self, context): layout = self.layout diff --git a/src/blenderbim/blenderbim/bim/module/constraint/ui.py b/src/blenderbim/blenderbim/bim/module/constraint/ui.py index f1aa2a3831..9f918c31fa 100644 --- a/src/blenderbim/blenderbim/bim/module/constraint/ui.py +++ b/src/blenderbim/blenderbim/bim/module/constraint/ui.py @@ -29,7 +29,7 @@ class BIM_PT_constraints(Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" - bl_parent_id = "BIM_PT_misc" + bl_parent_id = "BIM_PT_project_setup" @classmethod def poll(cls, context): diff --git a/src/blenderbim/blenderbim/bim/module/covetool/ui.py b/src/blenderbim/blenderbim/bim/module/covetool/ui.py index e67e654caf..f74aa1a97b 100644 --- a/src/blenderbim/blenderbim/bim/module/covetool/ui.py +++ b/src/blenderbim/blenderbim/bim/module/covetool/ui.py @@ -26,6 +26,7 @@ class BIM_PT_covetool(bpy.types.Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" + bl_parent_id = "BIM_PT_integrations" def draw(self, context): layout = self.layout diff --git a/src/blenderbim/blenderbim/bim/module/group/ui.py b/src/blenderbim/blenderbim/bim/module/group/ui.py index 7e3efab4ed..ce24d514cc 100644 --- a/src/blenderbim/blenderbim/bim/module/group/ui.py +++ b/src/blenderbim/blenderbim/bim/module/group/ui.py @@ -28,7 +28,7 @@ class BIM_PT_groups(Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" - bl_parent_id = "BIM_PT_utilities" + bl_parent_id = "BIM_PT_project_setup" @classmethod def poll(cls, context): diff --git a/src/blenderbim/blenderbim/bim/module/lca/ui.py b/src/blenderbim/blenderbim/bim/module/lca/ui.py index 4a4d7d062e..a76b38d8f8 100644 --- a/src/blenderbim/blenderbim/bim/module/lca/ui.py +++ b/src/blenderbim/blenderbim/bim/module/lca/ui.py @@ -27,6 +27,7 @@ class BIM_PT_lca(Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" + bl_parent_id = "BIM_PT_integrations" def draw(self, context): props = context.scene.BIMLCAProperties diff --git a/src/blenderbim/blenderbim/bim/module/project/ui.py b/src/blenderbim/blenderbim/bim/module/project/ui.py index 7567a4b7cb..f24f96e7ac 100644 --- a/src/blenderbim/blenderbim/bim/module/project/ui.py +++ b/src/blenderbim/blenderbim/bim/module/project/ui.py @@ -28,7 +28,7 @@ class BIM_PT_project(Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" - bl_parent_id = "BIM_PT_project_setup" + bl_parent_id = "BIM_PT_project_info" def draw(self, context): if not ProjectData.is_loaded: @@ -143,14 +143,6 @@ class BIM_PT_project(Panel): op.should_save_as = True row.operator("bim.select_ifc_file", icon="FILE_FOLDER", text="") - row = self.layout.row(align=True) - row.prop(props, "schema_dir") - row.operator("bim.select_schema_dir", icon="FILE_FOLDER", text="") - - row = self.layout.row(align=True) - row.prop(props, "data_dir") - row.operator("bim.select_data_dir", icon="FILE_FOLDER", text="") - def draw_create_project_ui(self, context): props = context.scene.BIMProperties pprops = context.scene.BIMProjectProperties diff --git a/src/blenderbim/blenderbim/bim/module/search/ui.py b/src/blenderbim/blenderbim/bim/module/search/ui.py index ff9068d06c..44dce8431a 100644 --- a/src/blenderbim/blenderbim/bim/module/search/ui.py +++ b/src/blenderbim/blenderbim/bim/module/search/ui.py @@ -28,7 +28,7 @@ class BIM_PT_search(Panel): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" - bl_parent_id = "BIM_PT_utilities" + bl_parent_id = "BIM_PT_collaboration" @classmethod def poll(cls, context): diff --git a/src/blenderbim/blenderbim/bim/ui.py b/src/blenderbim/blenderbim/bim/ui.py index 796ec67806..04dbc9d526 100644 --- a/src/blenderbim/blenderbim/bim/ui.py +++ b/src/blenderbim/blenderbim/bim/ui.py @@ -152,6 +152,14 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): row = layout.row() row.prop(context.scene.BIMModelProperties, "occurrence_name_function") + row = self.layout.row(align=True) + row.prop(context.scene.BIMProperties, "schema_dir") + row.operator("bim.select_schema_dir", icon="FILE_FOLDER", text="") + + row = self.layout.row(align=True) + row.prop(context.scene.BIMProperties, "data_dir") + row.operator("bim.select_data_dir", icon="FILE_FOLDER", text="") + row = layout.row() row.operator("bim.configure_visibility") @@ -173,9 +181,9 @@ def ifc_units(self, context): row.prop(props, "metric_precision") -# Scene Panel Groups --> -class BIM_PT_project_setup(Panel): - bl_label = "IFC Project Setup" +# Scene panel groups +class BIM_PT_project_info(Panel): + bl_label = "IFC Project Info" bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" @@ -184,17 +192,13 @@ class BIM_PT_project_setup(Panel): pass -class BIM_PT_utilities(Panel): - bl_label = "IFC Utilities" +class BIM_PT_project_setup(Panel): + bl_label = "IFC Project Setup" bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "scene" bl_options = {"DEFAULT_CLOSED"} - @classmethod - def poll(cls, context): - return tool.Ifc.get() - def draw(self, context): pass @@ -270,21 +274,6 @@ class BIM_PT_services(Panel): pass -class BIM_PT_misc(Panel): - bl_label = "IFC Misc." - bl_space_type = "PROPERTIES" - bl_region_type = "WINDOW" - bl_context = "scene" - bl_options = {"DEFAULT_CLOSED"} - - @classmethod - def poll(cls, context): - return tool.Ifc.get() - - def draw(self, context): - pass - - class BIM_PT_quality_control(Panel): bl_label = "IFC Quality Control" bl_space_type = "PROPERTIES" @@ -296,7 +285,18 @@ class BIM_PT_quality_control(Panel): pass -# Object Panel Groups --> +class BIM_PT_integrations(Panel): + bl_label = "BIM Integrations" + bl_space_type = "PROPERTIES" + bl_region_type = "WINDOW" + bl_context = "scene" + bl_options = {"DEFAULT_CLOSED"} + + def draw(self, context): + pass + + +# Object panel groups class BIM_PT_object_metadata(Panel): bl_label = "IFC Object Metadata" bl_space_type = "PROPERTIES"