From b15820dd102cba7bc092218509dfe9c216d5d439 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Wed, 14 Aug 2024 16:20:06 +0500 Subject: [PATCH] bonsai libs/desktop #5178 --- src/bonsai/bonsai/bim/operator.py | 20 +++++++++--------- src/bonsai/bonsai/libs/desktop/Makefile | 18 ++++++++-------- src/bonsai/bonsai/libs/desktop/README.md | 8 +++---- src/bonsai/bonsai/libs/desktop/blenderbim | 16 -------------- .../bonsai/libs/desktop/blenderbim.desktop | 9 -------- src/bonsai/bonsai/libs/desktop/blenderbim.png | Bin 5056 -> 0 bytes src/bonsai/bonsai/libs/desktop/blenderbim.xml | 14 ------------ .../libs/desktop/windows_bbim_association.ps1 | 8 +++---- 8 files changed, 27 insertions(+), 66 deletions(-) delete mode 100755 src/bonsai/bonsai/libs/desktop/blenderbim delete mode 100644 src/bonsai/bonsai/libs/desktop/blenderbim.desktop delete mode 100644 src/bonsai/bonsai/libs/desktop/blenderbim.png delete mode 100644 src/bonsai/bonsai/libs/desktop/blenderbim.xml diff --git a/src/bonsai/bonsai/bim/operator.py b/src/bonsai/bonsai/bim/operator.py index ef0ae2dd64..ff1d2ec605 100644 --- a/src/bonsai/bonsai/bim/operator.py +++ b/src/bonsai/bonsai/bim/operator.py @@ -310,15 +310,15 @@ class FileAssociate(bpy.types.Operator): os.makedirs(os.path.join(destdir, rel_path), exist_ok=True) shutil.copy( - os.path.join(src_dir, "blenderbim.png"), + os.path.join(src_dir, "bonsai.png"), os.path.join(destdir, "share/icons/hicolor/128x128/apps"), ) shutil.copy( - os.path.join(src_dir, "blenderbim.desktop"), + os.path.join(src_dir, "bonsai.desktop"), os.path.join(destdir, "share/applications"), ) shutil.copy( - os.path.join(src_dir, "blenderbim.xml"), + os.path.join(src_dir, "bonsai.xml"), os.path.join(destdir, "share/mime/packages"), ) shutil.copyfile( @@ -327,13 +327,13 @@ class FileAssociate(bpy.types.Operator): ) # copy and rewrite wrapper script - with open(os.path.join(src_dir, "blenderbim"), "r") as wrapper_template: + with open(os.path.join(src_dir, "bonsai"), "r") as wrapper_template: filedata = wrapper_template.read() filedata = filedata.replace("#BLENDER_EXE=/opt/blender-3.3/blender", 'BLENDER_EXE="' + binary_path + '"') - with open(os.path.join(destdir, "bin", "blenderbim"), "w") as wrapper: + with open(os.path.join(destdir, "bin", "bonsai"), "w") as wrapper: wrapper.write(filedata) - os.chmod(os.path.join(destdir, "bin", "blenderbim"), 0o755) + os.chmod(os.path.join(destdir, "bin", "bonsai"), 0o755) self.refresh_system_linux(destdir=destdir) @@ -383,11 +383,11 @@ class FileUnassociate(bpy.types.Operator): def uninstall_desktop_linux(self, destdir="/tmp"): """Removes linux file assocations and launcher icon""" for rel_path in ( - "share/icons/hicolor/128x128/apps/blenderbim.png", + "share/icons/hicolor/128x128/apps/bonsai.png", "share/icons/hicolor/128x128/mimetypes/x-ifc.png", - "share/applications/blenderbim.desktop", - "share/mime/packages/blenderbim.xml", - "bin/blenderbim", + "share/applications/bonsai.desktop", + "share/mime/packages/bonsai.xml", + "bin/bonsai", ): try: os.remove(os.path.join(destdir, rel_path)) diff --git a/src/bonsai/bonsai/libs/desktop/Makefile b/src/bonsai/bonsai/libs/desktop/Makefile index e17077fae7..c77eec7215 100644 --- a/src/bonsai/bonsai/libs/desktop/Makefile +++ b/src/bonsai/bonsai/libs/desktop/Makefile @@ -9,21 +9,21 @@ install : ${DESTDIR}/share/icons/hicolor/128x128/mimetypes \ ${DESTDIR}/share/applications \ ${DESTDIR}/share/mime/packages - cp blenderbim ${DESTDIR}/bin/ - chmod +x ${DESTDIR}/bin/blenderbim - cp blenderbim.png ${DESTDIR}/share/icons/hicolor/128x128/apps/ - cp blenderbim.desktop ${DESTDIR}/share/applications/ - cp blenderbim.xml ${DESTDIR}/share/mime/packages/ + cp bonsai ${DESTDIR}/bin/ + chmod +x ${DESTDIR}/bin/bonsai + cp bonsai.png ${DESTDIR}/share/icons/hicolor/128x128/apps/ + cp bonsai.desktop ${DESTDIR}/share/applications/ + cp bonsai.xml ${DESTDIR}/share/mime/packages/ cp x-ifc_128x128.png ${DESTDIR}/share/icons/hicolor/128x128/mimetypes/x-ifc.png update-mime-database ${DESTDIR}/share/mime/ || true update-desktop-database ${DESTDIR}/share/applications/ || true uninstall : rm -f \ - ${DESTDIR}/bin/blenderbim \ - ${DESTDIR}/share/icons/hicolor/128x128/apps/blenderbim.png \ - ${DESTDIR}/share/applications/blenderbim.desktop \ - ${DESTDIR}/share/mime/packages/blenderbim.xml \ + ${DESTDIR}/bin/bonsai \ + ${DESTDIR}/share/icons/hicolor/128x128/apps/bonsai.png \ + ${DESTDIR}/share/applications/bonsai.desktop \ + ${DESTDIR}/share/mime/packages/bonsai.xml \ ${DESTDIR}/share/icons/hicolor/128x128/mimetypes/x-ifc.png update-mime-database ${DESTDIR}/share/mime/ || true update-desktop-database ${DESTDIR}/share/applications/ || true diff --git a/src/bonsai/bonsai/libs/desktop/README.md b/src/bonsai/bonsai/libs/desktop/README.md index a3567de060..b77cfffa6d 100644 --- a/src/bonsai/bonsai/libs/desktop/README.md +++ b/src/bonsai/bonsai/libs/desktop/README.md @@ -2,20 +2,20 @@ Desktop ======= This folder contains everything needed to create file associations and icons to -present BlenderBIM as a desktop application. +present Bonsai as a desktop application. Linux ----- -Assuming that blender and BlenderBIM are already installed on your system, +Assuming that blender and Bonsai are already installed on your system, configure associations and icons for a single user by running `make`: make install -Test by running the wrapper script directly, this should launch BlenderBIM with +Test by running the wrapper script directly, this should launch Bonsai with an empty IFC project: - blenderbim + bonsai This `Makefile` installs files to `~/.local` by default, to install to an alternative location, set `DESTDIR`: diff --git a/src/bonsai/bonsai/libs/desktop/blenderbim b/src/bonsai/bonsai/libs/desktop/blenderbim deleted file mode 100755 index 1de7b9a710..0000000000 --- a/src/bonsai/bonsai/libs/desktop/blenderbim +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Wrapper script to launch BlenderBIM. - -# If the `blender` executable can't be found in your PATH environment, set -# BLENDER_EXE to the location of your preferred `blender` executable. - -#BLENDER_EXE=/opt/blender-3.3/blender - -: ${BLENDER_EXE:=blender} - -if [[ $# -eq 1 && -f "$@" ]]; then - "${BLENDER_EXE}" --python-expr 'import bpy; bpy.data.batch_remove(bpy.data.objects); bpy.ops.outliner.orphans_purge(do_local_ids=True, do_linked_ids=True, do_recursive=True); bpy.ops.bim.load_project(filepath="'"$@"'")' -else - "${BLENDER_EXE}" --python-expr 'import bpy; bpy.data.batch_remove(bpy.data.objects); bpy.ops.outliner.orphans_purge(do_local_ids=True, do_linked_ids=True, do_recursive=True); bpy.ops.bim.create_project()' -fi; diff --git a/src/bonsai/bonsai/libs/desktop/blenderbim.desktop b/src/bonsai/bonsai/libs/desktop/blenderbim.desktop deleted file mode 100644 index 29919736d1..0000000000 --- a/src/bonsai/bonsai/libs/desktop/blenderbim.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Terminal=false -Exec=blenderbim %f -Name=BlenderBIM -Icon=blenderbim -X-Desktop-File-Install-Version=0.26 -GenericName=Blender BIM add-on -MimeType=application/x-ifc; diff --git a/src/bonsai/bonsai/libs/desktop/blenderbim.png b/src/bonsai/bonsai/libs/desktop/blenderbim.png deleted file mode 100644 index 3df402d81759048e743c9d4c4d81afb61d7fd318..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5056 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 WSV5!pM$9t+0000 - - - - Industry Foundation Classes - - - - - - - - - diff --git a/src/bonsai/bonsai/libs/desktop/windows_bbim_association.ps1 b/src/bonsai/bonsai/libs/desktop/windows_bbim_association.ps1 index 11926a170a..c89dccbd62 100644 --- a/src/bonsai/bonsai/libs/desktop/windows_bbim_association.ps1 +++ b/src/bonsai/bonsai/libs/desktop/windows_bbim_association.ps1 @@ -6,11 +6,11 @@ Start-Process cmd -ArgumentList ` "/k ", ` "ASSOC .IFC=", ` "&", ` - "FTYPE BLENDERBIM=""$BlenderPath"" --python-expr ""import bpy; bpy.ops.bim.load_project(filepath=r'%1')""", + "FTYPE BONSAI=""$BlenderPath"" --python-expr ""import bpy; bpy.ops.bim.load_project(filepath=r'%1')""", "&", ` - "echo. & echo. & echo To create an association between .IFC files and BlenderBIM", ` + "echo. & echo. & echo To create an association between .IFC files and Bonsai", ` "&", ` "echo type the command below & echo.", ` "&", ` - "echo ASSOC .IFC=BLENDERBIM & echo." ` --Verb RunAs \ No newline at end of file + "echo ASSOC .IFC=BONSAI & echo." ` +-Verb RunAs