diff --git a/BuildLinux.sh b/BuildLinux.sh index 1461e63b8..06b7a8143 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -56,7 +56,7 @@ while getopts ":dsiuhgbr" opt; do echo " -g: force gtk2 build" echo " -b: build in debug mode" echo " -d: build deps (optional)" - echo " -s: build bambu-studio (optional)" + echo " -s: build orca-slicer (optional)" echo " -u: only update clock & dependency packets (optional and need sudo)" echo " -r: skip free ram check (low ram compiling)" echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'" @@ -73,7 +73,7 @@ then echo " -g: force gtk2 build" echo " -b: build in debug mode" echo " -d: build deps (optional)" - echo " -s: build bambu-studio (optional)" + echo " -s: build orca-slicer (optional)" echo " -u: only update clock & dependency packets (optional and need sudo)" echo " -r: skip free ram check (low ram compiling)" echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'" diff --git a/CMakeLists.txt b/CMakeLists.txt index ccb79bc22..3f912ed54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -680,7 +680,7 @@ if(SLIC3R_BUILD_TESTS) endif() if (NOT WIN32 AND NOT APPLE) - set(SLIC3R_APP_CMD "bambu-studio") + set(SLIC3R_APP_CMD "orca-slicer") configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY) endif() diff --git a/Containerfile b/Containerfile index 4969b3ded..78ff1e5f2 100644 --- a/Containerfile +++ b/Containerfile @@ -1,10 +1,10 @@ # Build Bambu Slicer in a container # # Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md): -# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv +# rm -rf build; podman build . -t orca-slicer-builder && podman run --rm localhost/orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv # # Troubleshooting the build container: -# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash +# podman run -it --name orca-slicer-builder localhost/orca-slicer-builder /bin/bash # # Debugging the resulting AppImage: # 1) Install `gdb` @@ -13,7 +13,7 @@ # 3) Find related issue using backtrace output for clues and add backtrace to it on github # # Docker alternative AppImage build syntax (use this if you can't install podman): -# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv +# rm -rf build; docker build . --file Containerfile -t orca-slicer-builder; docker run --rm orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv # # # TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work. diff --git a/Dockerfile b/Dockerfile index 3f34d66a2..3a8135ca4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,4 +89,4 @@ RUN [[ "$UID" != "0" ]] \ # Using an entrypoint instead of CMD because the binary # accepts several command line arguments. -ENTRYPOINT ["/BambuStudio/build/package/bin/bambu-studio"] +ENTRYPOINT ["/BambuStudio/build/package/bin/orca-slicer"] diff --git a/build_win.bat b/build_win.bat index 3d0d2bd07..29ee7f09e 100644 --- a/build_win.bat +++ b/build_win.bat @@ -28,12 +28,12 @@ @ECHO deps-dirty - build deps without cleaning @ECHO Default: %PS_STEPS_DEFAULT% @ECHO -r -RUN Specifies what to perform at the run step: -@ECHO console - run and wait on bambu-studio-console.exe +@ECHO console - run and wait on orca-slicer-console.exe @ECHO custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE% @ECHO ide - open project in Visual Studio if not open (no wait) @ECHO none - run step does nothing @ECHO viewer - run bambu-gcodeviewer.exe (no wait) -@ECHO window - run bambu-studio.exe (no wait) +@ECHO window - run orca-slicer.exe (no wait) @ECHO Default: none @ECHO -d -DESTDIR Deps destination directory @ECHO Warning: Changing destdir path will not delete the old destdir. @@ -246,11 +246,11 @@ FOR /F "tokens=2 delims=," %%I in ( @ECHO Running %PS_RUN% application... @REM icacls below is just a hack for file-not-found error handling IF "%PS_RUN%" EQU "console" ( - icacls bambu-studio-console.exe >nul || GOTO :END - start /wait /b bambu-studio-console.exe + icacls orca-slicer-console.exe >nul || GOTO :END + start /wait /b orca-slicer-console.exe ) ELSE IF "%PS_RUN%" EQU "window" ( - icacls bambu-studio.exe >nul || GOTO :END - start bambu-studio.exe + icacls orca-slicer.exe >nul || GOTO :END + start orca-slicer.exe ) ELSE IF "%PS_RUN%" EQU "viewer" ( icacls bambu-gcodeviewer.exe >nul || GOTO :END start bambu-gcodeviewer.exe diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index d513c387a..5e61a9e94 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -11,7 +11,7 @@ CFBundleIconFile ${MACOSX_BUNDLE_ICON_FILE} CFBundleIdentifier - com.bambulab.bambu-studio + com.softfever3d.orca-slicer CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString diff --git a/src/BambuStudio.cpp b/src/BambuStudio.cpp index 9e624e2bd..cb005cb1f 100644 --- a/src/BambuStudio.cpp +++ b/src/BambuStudio.cpp @@ -367,7 +367,7 @@ int CLI::run(int argc, char **argv) BOOST_LOG_TRIVIAL(info) << "index="<< index <<", arg is "<< argv[index] <" VERBATIM) else () diff --git a/src/platform/msw/BambuStudio.rc.in b/src/platform/msw/BambuStudio.rc.in index 4774021f2..1aa5e18f8 100644 --- a/src/platform/msw/BambuStudio.rc.in +++ b/src/platform/msw/BambuStudio.rc.in @@ -13,7 +13,7 @@ PRODUCTVERSION @SLIC3R_VERSION@ VALUE "ProductVersion", "@SLIC3R_BUILD_ID@" VALUE "InternalName", "@SLIC3R_APP_NAME@" VALUE "LegalCopyright", "Copyright(C) 2021-2023 Lunkuo All Rights Reserved" - VALUE "OriginalFilename", "bambu-studio.exe" + VALUE "OriginalFilename", "orca-slicer.exe" } } BLOCK "VarFileInfo" diff --git a/src/platform/unix/BambuGcodeviewer.desktop b/src/platform/unix/BambuGcodeviewer.desktop index 436712ea1..0cdfed6ed 100644 --- a/src/platform/unix/BambuGcodeviewer.desktop +++ b/src/platform/unix/BambuGcodeviewer.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Bambu GCode viewer -Exec=bambu-studio --gcodeviewer %F +Exec=orca-slicer --gcodeviewer %F Icon=BambuStudio-gcodeviewer Terminal=false Type=Application diff --git a/src/platform/unix/BambuStudio.desktop b/src/platform/unix/BambuStudio.desktop index ebd2df4a6..bc5a17aa5 100644 --- a/src/platform/unix/BambuStudio.desktop +++ b/src/platform/unix/BambuStudio.desktop @@ -2,11 +2,11 @@ Name=BambuStudio GenericName=3D Printing Software Icon=BambuStudio -Exec=bambu-studio %F +Exec=orca-slicer %F Terminal=false Type=Application MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf; Categories=Graphics;3DGraphics;Engineering; Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA StartupNotify=false -StartupWMClass=bambu-studio +StartupWMClass=orca-slicer diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp index 9c7a8642f..a58050d09 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp @@ -340,7 +340,7 @@ void DesktopIntegrationDialog::perform_desktop_integration() "Categories=Graphics;3DGraphics;Engineering;\n" "Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA\n" "StartupNotify=false\n" - "StartupWMClass=bambu-studio\n", name_suffix, version_suffix, excutable_path); + "StartupWMClass=orca-slicer\n", name_suffix, version_suffix, excutable_path); std::string path = GUI::format("%1%/applications/BambuStudio%2%.desktop", target_dir_desktop, version_suffix); if (create_desktop_file(path, desktop_file)){ diff --git a/src/slic3r/GUI/Mouse3DHandlerMac.mm b/src/slic3r/GUI/Mouse3DHandlerMac.mm index 733b7f6d7..eb363952f 100644 --- a/src/slic3r/GUI/Mouse3DHandlerMac.mm +++ b/src/slic3r/GUI/Mouse3DHandlerMac.mm @@ -202,7 +202,7 @@ void Mouse3DController::init() // Registration is done either by 4letter constant (CFBundleSignature - obsolete //and we dont have that) or Executable name in pascal string(first byte is string lenght). //If no packets are recieved the name might be different - check cmake. If debugging try commenting - // set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "bambu-studio") + // set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer") clientID = RegisterConnexionClient( 0, "\013BambuStudio", kConnexionClientModeTakeOver, kConnexionMaskAxis); BOOST_LOG_TRIVIAL(info) << "3dx mac handler registered"; diff --git a/src/slic3r/Utils/Process.cpp b/src/slic3r/Utils/Process.cpp index 309ad2308..4fc7b442f 100644 --- a/src/slic3r/Utils/Process.cpp +++ b/src/slic3r/Utils/Process.cpp @@ -39,7 +39,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance wxString path; wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &path, nullptr, nullptr, wxPATH_NATIVE); path += "\\"; - path += (instance_type == NewSlicerInstanceType::Slicer) ? "bambu-studio.exe" : "bambu-gcodeviewer.exe"; + path += (instance_type == NewSlicerInstanceType::Slicer) ? "orca-slicer.exe" : "bambu-gcodeviewer.exe"; std::vector args; args.reserve(4); args.emplace_back(path.wc_str()); @@ -102,7 +102,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance std::string my_path; if (args.empty()) { // Binary path was not set to the AppImage in the Linux specific block above, call the application directly. - my_path = (bin_path.parent_path() / ((instance_type == NewSlicerInstanceType::Slicer) ? "bambu-studio" : "bambu-gcodeviewer")).string(); + my_path = (bin_path.parent_path() / ((instance_type == NewSlicerInstanceType::Slicer) ? "orca-slicer" : "bambu-gcodeviewer")).string(); args.emplace_back(my_path.c_str()); } std::string to_open;