Skip to content

Commit 81ca772

Browse files
SoftFeverSoftFever
committed
change BambuStudio to OrcaSlicer
1 parent 20f2b2c commit 81ca772

16 files changed

+37
-37
lines changed

‎.github/workflows/build_mac_arm64.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
run: |
1818
brew install cmake git gettext zstd
1919
- run: mkdir -p ${{ github.workspace }}/deps/build
20-
# - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
20+
# - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2121

2222
# - name: build deps
2323
# id: cache_deps
2424
# uses: actions/cache@v3
2525
# env:
2626
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
2727
# with:
28-
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
28+
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2929
# key: build-${{ env.cache-name }}
3030

3131
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -38,8 +38,8 @@ jobs:
3838
run: |
3939
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
4040
tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
41-
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep
42-
ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep
41+
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
42+
ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
4343
rm BambuStudio_dep_arm64_21-01-2023.tar.gz
4444
4545

‎.github/workflows/build_mac_x64.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
run: |
1818
brew install cmake git gettext
1919
- run: mkdir -p ${{ github.workspace }}/deps/build
20-
- run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
20+
- run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2121

2222
# - name: build deps
2323
# id: cache_deps
2424
# uses: actions/cache@v3
2525
# env:
2626
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
2727
# with:
28-
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
28+
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2929
# key: build-${{ env.cache-name }}
3030

3131
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -39,8 +39,8 @@ jobs:
3939
run: |
4040
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_x86_64_21-01-2023.tar.gz
4141
tar -zxvf BambuStudio_dep_x86_64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
42-
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep
43-
ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep
42+
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
43+
ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
4444
rm BambuStudio_dep_x86_64_21-01-2023.tar.gz
4545
4646

‎.github/workflows/build_win.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run: |
1919
choco install strawberryperl
2020
- run: mkdir ${{ github.workspace }}/deps/build
21-
- run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep
21+
- run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2222
- name: download deps
2323
shell: powershell
2424
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,15 +27,15 @@ jobs:
2727
shell: cmd
2828
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_9Mar2023.zip'
2929

30-
- run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep"
30+
- run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep"
3131

3232
# - name: build deps
3333
# id: cache_deps
3434
# uses: actions/cache@v3
3535
# env:
3636
# cache-name: ${{ runner.os }}-cache-bambustudio_deps
3737
# with:
38-
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
38+
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
3939
# key: ${{ runner.os }}-build-${{ env.cache-name }}
4040

4141
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -44,7 +44,7 @@ jobs:
4444
# continue-on-error: true
4545
# run: .\build_release.bat deps
4646

47-
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force
47+
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
4848

4949
- name: Build studio
5050
working-directory: ${{ github.workspace }}

‎build_release.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ set WP=%CD%
22
cd deps
33
mkdir build
44
cd build
5-
set DEPS=%CD%/BambuStudio_dep
5+
set DEPS=%CD%/OrcaSlicer_dep
66
if "%1"=="studio" (
77
GOTO :studio
88
)
99
echo "building deps.."
10-
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
10+
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
1111
cmake --build . --config Release --target ALL_BUILD -- -m
1212

1313
if "%1"=="deps" exit /b 0

‎build_relwithdebinfo.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ set WP=%CD%
22
cd deps
33
mkdir build
44
cd build
5-
set DEPS=%CD%/BambuStudio_dep
5+
set DEPS=%CD%/OrcaSlicer_dep
66
if "%1"=="studio" (
77
GOTO :studio
88
)
99
echo "building deps.."
10-
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
10+
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
1111
cmake --build . --config Release --target ALL_BUILD -- -m
1212

1313
if "%1"=="deps" exit /b 0

‎doc/How to build - Mac OS.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ Cmake, git, gettext can be installed from brew(brew install cmake git gettext)
1414
You need to build the dependence of BambuStudio first. (Only needs for the first time)
1515

1616
Suppose you download the codes into /Users/_username_/work/projects/BambuStudio
17-
create a directory to store the dependence built: /Users/_username_/work/projects/BambuStudio_dep
17+
create a directory to store the dependence built: /Users/_username_/work/projects/OrcaSlicer_dep
1818
**(Please make sure to replace the username with the one on your computer)**
1919

2020
`cd BambuStudio/deps`
2121
`mkdir build;cd build`
2222

2323
for arm64 architecture
24-
`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"`
24+
`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"`
2525
for x86 architeccture
26-
`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"`
26+
`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"`
2727
`make -jN` (N can be a number between 1 and the max cpu number)
2828

2929
## building the Bambu Studio
@@ -33,9 +33,9 @@ create a directory to store the installed files at /Users/username/work/projects
3333
`mkdir build;cd build`
3434

3535
building it use cmake
36-
`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`
36+
`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`
3737
`cmake --build . --target install --config Release -jN`
3838

3939
building it use xcode
40-
`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`
40+
`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`
4141
then building it using Xcode

‎doc/How to build - Windows.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Install Following tools:
99

1010
## building the deps
1111
Suppose you download the codes into D:/work/Projects/BambuStudio
12-
create a directory to store the dependence built: D:/work/Projects/BambuStudio_dep
12+
create a directory to store the dependence built: D:/work/Projects/OrcaSlicer_dep
1313

1414
`cd BambuStudio/deps`
1515
`mkdir build;cd build`
16-
`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release`
16+
`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release`
1717
`msbuild /m ALL_BUILD.vcxproj`
1818

1919
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/
2525
`mkdir build;cd build`
2626

2727
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:
28-
`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"`
28+
`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"`
2929

3030
then build it using command
3131
`cmake --build . --target install --config Release`

‎src/slic3r/GUI/GUI_App.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,7 @@ bool GUI_App::on_init_inner()
21262126
RichMessageDialog
21272127
dlg(nullptr,
21282128
wxString::Format(_L("%s\nDo you want to continue?"), msg),
2129-
"BambuStudio", wxICON_QUESTION | wxYES_NO);
2129+
"OrcaSlicer", wxICON_QUESTION | wxYES_NO);
21302130
dlg.ShowCheckBox(_L("Remember my choice"));
21312131
if (dlg.ShowModal() != wxID_YES) return false;
21322132

@@ -5970,7 +5970,7 @@ void GUI_App::associate_files(std::wstring extend)
59705970

59715971
std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
59725972
std::wstring prog_id = L" Bambu.Studio.1";
5973-
std::wstring prog_desc = L"BambuStudio";
5973+
std::wstring prog_desc = L"OrcaSlicer";
59745974
std::wstring prog_command = prog_path + L" \"%1\"";
59755975
std::wstring reg_base = L"Software\\Classes";
59765976
std::wstring reg_extension = reg_base + L"\\." + extend;
@@ -5993,7 +5993,7 @@ void GUI_App::disassociate_files(std::wstring extend)
59935993

59945994
std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
59955995
std::wstring prog_id = L" Bambu.Studio.1";
5996-
std::wstring prog_desc = L"BambuStudio";
5996+
std::wstring prog_desc = L"OrcaSlicer";
59975997
std::wstring prog_command = prog_path + L" \"%1\"";
59985998
std::wstring reg_base = L"Software\\Classes";
59995999
std::wstring reg_extension = reg_base + L"\\." + extend;

‎src/slic3r/GUI/GUI_App.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ class GUI_App : public wxApp
309309
bool is_editor() const { return m_app_mode == EAppMode::Editor; }
310310
bool is_gcode_viewer() const { return m_app_mode == EAppMode::GCodeViewer; }
311311
bool is_recreating_gui() const { return m_is_recreating_gui; }
312-
std::string logo_name() const { return is_editor() ? "BambuStudio" : "BambuStudio-gcodeviewer"; }
312+
std::string logo_name() const { return is_editor() ? "OrcaSlicer" : "BambuStudio-gcodeviewer"; }
313313

314314
// To be called after the GUI is fully built up.
315315
// Process command line parameters cached in this->init_params,

‎src/slic3r/GUI/InstanceCheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ namespace instance_check_internal
104104
return true;
105105
std::wstring classNameString(className);
106106
std::wstring wndTextString(wndText);
107-
if (wndTextString.find(L"BambuStudio") != std::wstring::npos && classNameString == L"wxWindowNR") {
107+
if (wndTextString.find(L"OrcaSlicer") != std::wstring::npos && classNameString == L"wxWindowNR") {
108108
//check if other instances has same instance hash
109109
//if not it is not same version(binary) as this version
110110
HANDLE handle = GetProp(hwnd, L"Instance_Hash_Minor");

‎src/slic3r/GUI/Printer/gstbambusrc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ void gstbambusrc_register()
581581
return;
582582
did_register = 1;
583583

584-
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");
584+
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");
585585
}
586586

587587
#else
@@ -590,6 +590,6 @@ void gstbambusrc_register()
590590
#define PACKAGE "bambusrc"
591591
#endif
592592

593-
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")
593+
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")
594594

595595
#endif

‎src/slic3r/GUI/SelectMachine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2846,7 +2846,7 @@ bool SelectMachineDialog::is_show_timelapse()
28462846
}
28472847
break;
28482848
}
2849-
if (line == "BambuStudio")
2849+
if (line == "BambuStudio" || line == "OrcaSlicer")
28502850
is_version = true;
28512851
}
28522852
}

‎src/slic3r/GUI/WebGuideDialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Slic3r { namespace GUI {
3535
json m_ProfileJson;
3636

3737
GuideFrame::GuideFrame(GUI_App *pGUI, long style)
38-
: DPIDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "BambuStudio", wxDefaultPosition, wxDefaultSize, style),
38+
: DPIDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "OrcaSlicer", wxDefaultPosition, wxDefaultSize, style),
3939
m_appconfig_new()
4040
{
4141
SetBackgroundColour(*wxWHITE);

‎src/slic3r/GUI/WebUserLoginDialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ string &replace_str(string &str, const string &to_replaced, const string &newcha
5151

5252
int ZUserLogin::web_sequence_id = 20000;
5353

54-
ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_ANY, "BambuStudio")
54+
ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_ANY, "OrcaSlicer")
5555
{
5656
SetBackgroundColour(*wxWHITE);
5757
// Url

‎src/slic3r/Utils/Process.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
6161
#if defined(__APPLE__)
6262
{
6363
auto bundle_path = bin_path.parent_path().parent_path().parent_path();
64-
//bin_path = bin_path.parent_path() / "BambuStudio";
64+
//bin_path = bin_path.parent_path() / "OrcaSlicer";
6565
bin_path = "/usr/bin/open";
6666
// On Apple the wxExecute fails, thus we use boost::process instead.
6767
BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\"";

‎version.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Included by CMakeLists, edited by the build script
22
# (the version numbers are generated by the build script from the git current label)
33

4-
set(SLIC3R_APP_NAME "BambuStudio")
5-
set(SLIC3R_APP_KEY "BambuStudio")
4+
set(SLIC3R_APP_NAME "OrcaSlicer")
5+
set(SLIC3R_APP_KEY "OrcaSlicer")
66

77
if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
88
set(BBL_RELEASE_TO_PUBLIC "0")

0 commit comments

Comments
 (0)