Skip to content

Commit 3a80173

Browse files
committed
rename bambu-studio to orca-slicer
1 parent da61839 commit 3a80173

14 files changed

+28
-28
lines changed

BuildLinux.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ while getopts ":dsiuhgbr" opt; do
5656
echo " -g: force gtk2 build"
5757
echo " -b: build in debug mode"
5858
echo " -d: build deps (optional)"
59-
echo " -s: build bambu-studio (optional)"
59+
echo " -s: build orca-slicer (optional)"
6060
echo " -u: only update clock & dependency packets (optional and need sudo)"
6161
echo " -r: skip free ram check (low ram compiling)"
6262
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
@@ -73,7 +73,7 @@ then
7373
echo " -g: force gtk2 build"
7474
echo " -b: build in debug mode"
7575
echo " -d: build deps (optional)"
76-
echo " -s: build bambu-studio (optional)"
76+
echo " -s: build orca-slicer (optional)"
7777
echo " -u: only update clock & dependency packets (optional and need sudo)"
7878
echo " -r: skip free ram check (low ram compiling)"
7979
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ if(SLIC3R_BUILD_TESTS)
680680
endif()
681681

682682
if (NOT WIN32 AND NOT APPLE)
683-
set(SLIC3R_APP_CMD "bambu-studio")
683+
set(SLIC3R_APP_CMD "orca-slicer")
684684
configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
685685
endif()
686686

Containerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Build Bambu Slicer in a container
22
#
33
# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
4-
# 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
4+
# 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
55
#
66
# Troubleshooting the build container:
7-
# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash
7+
# podman run -it --name orca-slicer-builder localhost/orca-slicer-builder /bin/bash
88
#
99
# Debugging the resulting AppImage:
1010
# 1) Install `gdb`
@@ -13,7 +13,7 @@
1313
# 3) Find related issue using backtrace output for clues and add backtrace to it on github
1414
#
1515
# Docker alternative AppImage build syntax (use this if you can't install podman):
16-
# 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
16+
# 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
1717
#
1818
#
1919
# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ RUN [[ "$UID" != "0" ]] \
8989

9090
# Using an entrypoint instead of CMD because the binary
9191
# accepts several command line arguments.
92-
ENTRYPOINT ["/BambuStudio/build/package/bin/bambu-studio"]
92+
ENTRYPOINT ["/BambuStudio/build/package/bin/orca-slicer"]

build_win.bat

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
@ECHO deps-dirty - build deps without cleaning
2929
@ECHO Default: %PS_STEPS_DEFAULT%
3030
@ECHO -r -RUN Specifies what to perform at the run step:
31-
@ECHO console - run and wait on bambu-studio-console.exe
31+
@ECHO console - run and wait on orca-slicer-console.exe
3232
@ECHO custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE%
3333
@ECHO ide - open project in Visual Studio if not open (no wait)
3434
@ECHO none - run step does nothing
3535
@ECHO viewer - run bambu-gcodeviewer.exe (no wait)
36-
@ECHO window - run bambu-studio.exe (no wait)
36+
@ECHO window - run orca-slicer.exe (no wait)
3737
@ECHO Default: none
3838
@ECHO -d -DESTDIR Deps destination directory
3939
@ECHO Warning: Changing destdir path will not delete the old destdir.
@@ -246,11 +246,11 @@ FOR /F "tokens=2 delims=," %%I in (
246246
@ECHO Running %PS_RUN% application...
247247
@REM icacls below is just a hack for file-not-found error handling
248248
IF "%PS_RUN%" EQU "console" (
249-
icacls bambu-studio-console.exe >nul || GOTO :END
250-
start /wait /b bambu-studio-console.exe
249+
icacls orca-slicer-console.exe >nul || GOTO :END
250+
start /wait /b orca-slicer-console.exe
251251
) ELSE IF "%PS_RUN%" EQU "window" (
252-
icacls bambu-studio.exe >nul || GOTO :END
253-
start bambu-studio.exe
252+
icacls orca-slicer.exe >nul || GOTO :END
253+
start orca-slicer.exe
254254
) ELSE IF "%PS_RUN%" EQU "viewer" (
255255
icacls bambu-gcodeviewer.exe >nul || GOTO :END
256256
start bambu-gcodeviewer.exe

cmake/modules/MacOSXBundleInfo.plist.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleIconFile</key>
1212
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
1313
<key>CFBundleIdentifier</key>
14-
<string>com.bambulab.bambu-studio</string>
14+
<string>com.softfever3d.orca-slicer</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleLongVersionString</key>

src/BambuStudio.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ int CLI::run(int argc, char **argv)
367367
BOOST_LOG_TRIVIAL(info) << "index="<< index <<", arg is "<< argv[index] <<std::endl;
368368
int debug_argc = 5;
369369
char *debug_argv[] = {
370-
"E:\work\projects\bambu_release\bamboo_slicer\build_debug\src\Debug\bambu-studio.exe",
370+
"E:\work\projects\bambu_release\bamboo_slicer\build_debug\src\Debug\orca-slicer.exe",
371371
"--slice",
372372
"9",
373373
//"--load-settings",
@@ -2473,7 +2473,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
24732473
boost::nowide::cout
24742474
<< SLIC3R_APP_KEY <<"-"<< SLIC3R_VERSION << ":"
24752475
<< std::endl
2476-
<< "Usage: bambu-studio [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl
2476+
<< "Usage: orca-slicer [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl
24772477
<< std::endl
24782478
<< "OPTIONS:" << std::endl;
24792479
cli_misc_config_def.print_cli_help(boost::nowide::cout, false);

src/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ endif (MINGW)
118118

119119
if (NOT WIN32 AND NOT APPLE)
120120
# Binary name on unix like systems (Linux, Unix)
121-
set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "bambu-studio")
122-
set(SLIC3R_APP_CMD "bambu-studio")
121+
set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer")
122+
set(SLIC3R_APP_CMD "orca-slicer")
123123
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
124124
endif ()
125125

@@ -172,7 +172,7 @@ if (WIN32)
172172
endif()
173173
target_compile_definitions(BambuStudio_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
174174
add_dependencies(BambuStudio_app_gui BambuStudio)
175-
set_target_properties(BambuStudio_app_gui PROPERTIES OUTPUT_NAME "bambu-studio")
175+
set_target_properties(BambuStudio_app_gui PROPERTIES OUTPUT_NAME "orca-slicer")
176176
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
177177
endif ()
178178

@@ -220,7 +220,7 @@ else ()
220220
if (APPLE AND NOT CMAKE_MACOSX_BUNDLE)
221221
# On OSX, the name of the binary matches the name of the Application.
222222
add_custom_command(TARGET BambuStudio POST_BUILD
223-
COMMAND ln -sf BambuStudio bambu-studio
223+
COMMAND ln -sf BambuStudio orca-slicer
224224
WORKING_DIRECTORY "$<TARGET_FILE_DIR:BambuStudio>"
225225
VERBATIM)
226226
else ()

src/platform/msw/BambuStudio.rc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PRODUCTVERSION @SLIC3R_VERSION@
1313
VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
1414
VALUE "InternalName", "@SLIC3R_APP_NAME@"
1515
VALUE "LegalCopyright", "Copyright(C) 2021-2023 Lunkuo All Rights Reserved"
16-
VALUE "OriginalFilename", "bambu-studio.exe"
16+
VALUE "OriginalFilename", "orca-slicer.exe"
1717
}
1818
}
1919
BLOCK "VarFileInfo"

src/platform/unix/BambuGcodeviewer.desktop

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
22
Name=Bambu GCode viewer
3-
Exec=bambu-studio --gcodeviewer %F
3+
Exec=orca-slicer --gcodeviewer %F
44
Icon=BambuStudio-gcodeviewer
55
Terminal=false
66
Type=Application

src/platform/unix/BambuStudio.desktop

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Name=BambuStudio
33
GenericName=3D Printing Software
44
Icon=BambuStudio
5-
Exec=bambu-studio %F
5+
Exec=orca-slicer %F
66
Terminal=false
77
Type=Application
88
MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
99
Categories=Graphics;3DGraphics;Engineering;
1010
Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
1111
StartupNotify=false
12-
StartupWMClass=bambu-studio
12+
StartupWMClass=orca-slicer

src/slic3r/GUI/DesktopIntegrationDialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void DesktopIntegrationDialog::perform_desktop_integration()
340340
"Categories=Graphics;3DGraphics;Engineering;\n"
341341
"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA\n"
342342
"StartupNotify=false\n"
343-
"StartupWMClass=bambu-studio\n", name_suffix, version_suffix, excutable_path);
343+
"StartupWMClass=orca-slicer\n", name_suffix, version_suffix, excutable_path);
344344

345345
std::string path = GUI::format("%1%/applications/BambuStudio%2%.desktop", target_dir_desktop, version_suffix);
346346
if (create_desktop_file(path, desktop_file)){

src/slic3r/GUI/Mouse3DHandlerMac.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static void DeviceEvent(uint32_t unused, uint32_t msg_type, void *msg_arg)
202202
// Registration is done either by 4letter constant (CFBundleSignature - obsolete
203203
//and we dont have that) or Executable name in pascal string(first byte is string lenght).
204204
//If no packets are recieved the name might be different - check cmake. If debugging try commenting
205-
// set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "bambu-studio")
205+
// set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer")
206206
clientID = RegisterConnexionClient(
207207
0, "\013BambuStudio", kConnexionClientModeTakeOver, kConnexionMaskAxis);
208208
BOOST_LOG_TRIVIAL(info) << "3dx mac handler registered";

src/slic3r/Utils/Process.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
3939
wxString path;
4040
wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &path, nullptr, nullptr, wxPATH_NATIVE);
4141
path += "\\";
42-
path += (instance_type == NewSlicerInstanceType::Slicer) ? "bambu-studio.exe" : "bambu-gcodeviewer.exe";
42+
path += (instance_type == NewSlicerInstanceType::Slicer) ? "orca-slicer.exe" : "bambu-gcodeviewer.exe";
4343
std::vector<const wchar_t*> args;
4444
args.reserve(4);
4545
args.emplace_back(path.wc_str());
@@ -102,7 +102,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
102102
std::string my_path;
103103
if (args.empty()) {
104104
// Binary path was not set to the AppImage in the Linux specific block above, call the application directly.
105-
my_path = (bin_path.parent_path() / ((instance_type == NewSlicerInstanceType::Slicer) ? "bambu-studio" : "bambu-gcodeviewer")).string();
105+
my_path = (bin_path.parent_path() / ((instance_type == NewSlicerInstanceType::Slicer) ? "orca-slicer" : "bambu-gcodeviewer")).string();
106106
args.emplace_back(my_path.c_str());
107107
}
108108
std::string to_open;

0 commit comments

Comments
 (0)