From 81ca7720e963cbbba77435b077af4dedcfea55ef Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 10 Mar 2023 19:26:01 +0800 Subject: [PATCH] change BambuStudio to OrcaSlicer --- .github/workflows/build_mac_arm64.yml | 8 ++++---- .github/workflows/build_mac_x64.yml | 8 ++++---- .github/workflows/build_win.yml | 8 ++++---- build_release.bat | 4 ++-- build_relwithdebinfo.bat | 4 ++-- doc/How to build - Mac OS.md | 10 +++++----- doc/How to build - Windows.md | 6 +++--- src/slic3r/GUI/GUI_App.cpp | 6 +++--- src/slic3r/GUI/GUI_App.hpp | 2 +- src/slic3r/GUI/InstanceCheck.cpp | 2 +- src/slic3r/GUI/Printer/gstbambusrc.c | 4 ++-- src/slic3r/GUI/SelectMachine.cpp | 2 +- src/slic3r/GUI/WebGuideDialog.cpp | 2 +- src/slic3r/GUI/WebUserLoginDialog.cpp | 2 +- src/slic3r/Utils/Process.cpp | 2 +- version.inc | 4 ++-- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index 0a83327be..49a418722 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -17,7 +17,7 @@ jobs: run: | brew install cmake git gettext zstd - run: mkdir -p ${{ github.workspace }}/deps/build - # - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep + # - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep # - name: build deps # id: cache_deps @@ -25,7 +25,7 @@ jobs: # env: # cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64 # with: - # path: ${{ github.workspace }}/deps/build/BambuStudio_dep + # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep # key: build-${{ env.cache-name }} # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} @@ -38,8 +38,8 @@ jobs: run: | curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build - chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep - ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep + chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep + ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep rm BambuStudio_dep_arm64_21-01-2023.tar.gz diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index 07b3a52d5..b16c7ba5c 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -17,7 +17,7 @@ jobs: run: | brew install cmake git gettext - run: mkdir -p ${{ github.workspace }}/deps/build - - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep + - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep # - name: build deps # id: cache_deps @@ -25,7 +25,7 @@ jobs: # env: # cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64 # with: - # path: ${{ github.workspace }}/deps/build/BambuStudio_dep + # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep # key: build-${{ env.cache-name }} # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} @@ -39,8 +39,8 @@ jobs: run: | curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_x86_64_21-01-2023.tar.gz tar -zxvf BambuStudio_dep_x86_64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build - chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep - ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep + chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep + ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep rm BambuStudio_dep_x86_64_21-01-2023.tar.gz diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 2e5f8279f..3fbb3e370 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -18,7 +18,7 @@ jobs: run: | choco install strawberryperl - run: mkdir ${{ github.workspace }}/deps/build - - run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep + - run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep - name: download deps shell: powershell run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/3/BambuStudio_dep_9Mar2023.zip", "$env:temp\BambuStudio_dep_9Mar2023.zip")' @@ -27,7 +27,7 @@ jobs: shell: cmd run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_9Mar2023.zip' - - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep" + - run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep" # - name: build deps # id: cache_deps @@ -35,7 +35,7 @@ jobs: # env: # cache-name: ${{ runner.os }}-cache-bambustudio_deps # with: - # path: ${{ github.workspace }}/deps/build/BambuStudio_dep + # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep # key: ${{ runner.os }}-build-${{ env.cache-name }} # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} @@ -44,7 +44,7 @@ jobs: # continue-on-error: true # run: .\build_release.bat deps - # - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force + # - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force - name: Build studio working-directory: ${{ github.workspace }} diff --git a/build_release.bat b/build_release.bat index 3c1157fa1..8a6f29e25 100644 --- a/build_release.bat +++ b/build_release.bat @@ -2,12 +2,12 @@ set WP=%CD% cd deps mkdir build cd build -set DEPS=%CD%/BambuStudio_dep +set DEPS=%CD%/OrcaSlicer_dep if "%1"=="studio" ( GOTO :studio ) echo "building deps.." -cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release +cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release --target ALL_BUILD -- -m if "%1"=="deps" exit /b 0 diff --git a/build_relwithdebinfo.bat b/build_relwithdebinfo.bat index b5f581c13..8264da1c1 100644 --- a/build_relwithdebinfo.bat +++ b/build_relwithdebinfo.bat @@ -2,12 +2,12 @@ set WP=%CD% cd deps mkdir build cd build -set DEPS=%CD%/BambuStudio_dep +set DEPS=%CD%/OrcaSlicer_dep if "%1"=="studio" ( GOTO :studio ) echo "building deps.." -cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release +cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release --target ALL_BUILD -- -m if "%1"=="deps" exit /b 0 diff --git a/doc/How to build - Mac OS.md b/doc/How to build - Mac OS.md index b6336d5f5..7bf6da268 100644 --- a/doc/How to build - Mac OS.md +++ b/doc/How to build - Mac OS.md @@ -14,16 +14,16 @@ Cmake, git, gettext can be installed from brew(brew install cmake git gettext) You need to build the dependence of BambuStudio first. (Only needs for the first time) Suppose you download the codes into /Users/_username_/work/projects/BambuStudio -create a directory to store the dependence built: /Users/_username_/work/projects/BambuStudio_dep +create a directory to store the dependence built: /Users/_username_/work/projects/OrcaSlicer_dep **(Please make sure to replace the username with the one on your computer)** `cd BambuStudio/deps` `mkdir build;cd build` for arm64 architecture -`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"` +`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"` for x86 architeccture -`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"` +`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"` `make -jN` (N can be a number between 1 and the max cpu number) ## building the Bambu Studio @@ -33,9 +33,9 @@ create a directory to store the installed files at /Users/username/work/projects `mkdir build;cd build` building it use cmake -`cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on` +`cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on` `cmake --build . --target install --config Release -jN` building it use xcode -`cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on` +`cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on` then building it using Xcode \ No newline at end of file diff --git a/doc/How to build - Windows.md b/doc/How to build - Windows.md index 3d9e8db3b..7888e417b 100644 --- a/doc/How to build - Windows.md +++ b/doc/How to build - Windows.md @@ -9,11 +9,11 @@ Install Following tools: ## building the deps Suppose you download the codes into D:/work/Projects/BambuStudio -create a directory to store the dependence built: D:/work/Projects/BambuStudio_dep +create a directory to store the dependence built: D:/work/Projects/OrcaSlicer_dep `cd BambuStudio/deps` `mkdir build;cd build` -`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release` +`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release` `msbuild /m ALL_BUILD.vcxproj` It takes "00:14:27.37" to finish it on my machine (11th Gen Intel(R) Core(TM) i9-11900 @2.50GHz 2.50 GHz, with 32.0 GB DDR) @@ -25,7 +25,7 @@ create a directory to store the installed files at D:/work/Projects/BambuStudio/ `mkdir build;cd build` set -DWIN10SDK_PATH to your windows sdk path(for example: C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0) in below command: -`cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="D:/work/Projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"` +`cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="D:/work/Projects/OrcaSlicer_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"` then build it using command `cmake --build . --target install --config Release` diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 90648937b..9c3e8ca6d 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2126,7 +2126,7 @@ bool GUI_App::on_init_inner() RichMessageDialog dlg(nullptr, wxString::Format(_L("%s\nDo you want to continue?"), msg), - "BambuStudio", wxICON_QUESTION | wxYES_NO); + "OrcaSlicer", wxICON_QUESTION | wxYES_NO); dlg.ShowCheckBox(_L("Remember my choice")); if (dlg.ShowModal() != wxID_YES) return false; @@ -5970,7 +5970,7 @@ void GUI_App::associate_files(std::wstring extend) std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\""; std::wstring prog_id = L" Bambu.Studio.1"; - std::wstring prog_desc = L"BambuStudio"; + std::wstring prog_desc = L"OrcaSlicer"; std::wstring prog_command = prog_path + L" \"%1\""; std::wstring reg_base = L"Software\\Classes"; std::wstring reg_extension = reg_base + L"\\." + extend; @@ -5993,7 +5993,7 @@ void GUI_App::disassociate_files(std::wstring extend) std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\""; std::wstring prog_id = L" Bambu.Studio.1"; - std::wstring prog_desc = L"BambuStudio"; + std::wstring prog_desc = L"OrcaSlicer"; std::wstring prog_command = prog_path + L" \"%1\""; std::wstring reg_base = L"Software\\Classes"; std::wstring reg_extension = reg_base + L"\\." + extend; diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 1b8628069..c4e4655f9 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -309,7 +309,7 @@ public: bool is_editor() const { return m_app_mode == EAppMode::Editor; } bool is_gcode_viewer() const { return m_app_mode == EAppMode::GCodeViewer; } bool is_recreating_gui() const { return m_is_recreating_gui; } - std::string logo_name() const { return is_editor() ? "BambuStudio" : "BambuStudio-gcodeviewer"; } + std::string logo_name() const { return is_editor() ? "OrcaSlicer" : "BambuStudio-gcodeviewer"; } // To be called after the GUI is fully built up. // Process command line parameters cached in this->init_params, diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index 3034e5648..a617c5848 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -104,7 +104,7 @@ namespace instance_check_internal return true; std::wstring classNameString(className); std::wstring wndTextString(wndText); - if (wndTextString.find(L"BambuStudio") != std::wstring::npos && classNameString == L"wxWindowNR") { + if (wndTextString.find(L"OrcaSlicer") != std::wstring::npos && classNameString == L"wxWindowNR") { //check if other instances has same instance hash //if not it is not same version(binary) as this version HANDLE handle = GetProp(hwnd, L"Instance_Hash_Minor"); diff --git a/src/slic3r/GUI/Printer/gstbambusrc.c b/src/slic3r/GUI/Printer/gstbambusrc.c index e7339ec17..5b2bbd15d 100644 --- a/src/slic3r/GUI/Printer/gstbambusrc.c +++ b/src/slic3r/GUI/Printer/gstbambusrc.c @@ -581,7 +581,7 @@ void gstbambusrc_register() return; did_register = 1; - gst_plugin_register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR, "bambusrc", "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "BambuStudio", "BambuStudio", "https://github.com/bambulab/BambuStudio"); + gst_plugin_register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR, "bambusrc", "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "OrcaSlicer", "OrcaSlicer", "https://github.com/bambulab/BambuStudio"); } #else @@ -590,6 +590,6 @@ void gstbambusrc_register() #define PACKAGE "bambusrc" #endif -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, bambusrc, "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "BambuStudio", "https://github.com/bambulab/BambuStudio") +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, bambusrc, "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "OrcaSlicer", "https://github.com/bambulab/BambuStudio") #endif diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index c63725cda..581132b1b 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2846,7 +2846,7 @@ bool SelectMachineDialog::is_show_timelapse() } break; } - if (line == "BambuStudio") + if (line == "BambuStudio" || line == "OrcaSlicer") is_version = true; } } diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 1ae709bcc..29d57a636 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -35,7 +35,7 @@ namespace Slic3r { namespace GUI { json m_ProfileJson; GuideFrame::GuideFrame(GUI_App *pGUI, long style) - : DPIDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "BambuStudio", wxDefaultPosition, wxDefaultSize, style), + : DPIDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "OrcaSlicer", wxDefaultPosition, wxDefaultSize, style), m_appconfig_new() { SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 1c324b8d3..c79966cab 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -51,7 +51,7 @@ string &replace_str(string &str, const string &to_replaced, const string &newcha int ZUserLogin::web_sequence_id = 20000; -ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_ANY, "BambuStudio") +ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_ANY, "OrcaSlicer") { SetBackgroundColour(*wxWHITE); // Url diff --git a/src/slic3r/Utils/Process.cpp b/src/slic3r/Utils/Process.cpp index 4fc7b442f..a118e0009 100644 --- a/src/slic3r/Utils/Process.cpp +++ b/src/slic3r/Utils/Process.cpp @@ -61,7 +61,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance #if defined(__APPLE__) { auto bundle_path = bin_path.parent_path().parent_path().parent_path(); - //bin_path = bin_path.parent_path() / "BambuStudio"; + //bin_path = bin_path.parent_path() / "OrcaSlicer"; bin_path = "/usr/bin/open"; // On Apple the wxExecute fails, thus we use boost::process instead. BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\""; diff --git a/version.inc b/version.inc index df7cb40cf..15b7c5769 100644 --- a/version.inc +++ b/version.inc @@ -1,8 +1,8 @@ # Included by CMakeLists, edited by the build script # (the version numbers are generated by the build script from the git current label) -set(SLIC3R_APP_NAME "BambuStudio") -set(SLIC3R_APP_KEY "BambuStudio") +set(SLIC3R_APP_NAME "OrcaSlicer") +set(SLIC3R_APP_KEY "OrcaSlicer") if(NOT DEFINED BBL_RELEASE_TO_PUBLIC) set(BBL_RELEASE_TO_PUBLIC "0")