3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-07 05:54:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rename bambu-studio to orca-slicer

Browse source
This commit is contained in:
SoftFever 2023-03-10 18:53:25 +08:00
parent da61839e84
commit 3a80173533
14 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/BambuStudio.cpp
View file

@ -367,7 +367,7 @@ int CLI::run(int argc, char **argv)
BOOST_LOG_TRIVIAL(info) << "index="<< index <<", arg is "<< argv[index] <<std::endl;
int debug_argc = 5;
char *debug_argv[] = {
"E:\work\projects\bambu_release\bamboo_slicer\build_debug\src\Debug\bambu-studio.exe",
"E:\work\projects\bambu_release\bamboo_slicer\build_debug\src\Debug\orca-slicer.exe",
"--slice",
"9",
//"--load-settings",
@ -2473,7 +2473,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
boost::nowide::cout
<< SLIC3R_APP_KEY <<"-"<< SLIC3R_VERSION << ":"
<< std::endl
<< "Usage: bambu-studio [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl
<< "Usage: orca-slicer [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl
<< std::endl
<< "OPTIONS:" << std::endl;
cli_misc_config_def.print_cli_help(boost::nowide::cout, false);

8
src/CMakeLists.txt
View file

@ -118,8 +118,8 @@ endif (MINGW)
if (NOT WIN32 AND NOT APPLE)
# Binary name on unix like systems (Linux, Unix)
set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "bambu-studio")
set(SLIC3R_APP_CMD "bambu-studio")
set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer")
set(SLIC3R_APP_CMD "orca-slicer")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
endif ()
@ -172,7 +172,7 @@ if (WIN32)
endif()
target_compile_definitions(BambuStudio_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
add_dependencies(BambuStudio_app_gui BambuStudio)
set_target_properties(BambuStudio_app_gui PROPERTIES OUTPUT_NAME "bambu-studio")
set_target_properties(BambuStudio_app_gui PROPERTIES OUTPUT_NAME "orca-slicer")
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
endif ()
@ -220,7 +220,7 @@ else ()
if (APPLE AND NOT CMAKE_MACOSX_BUNDLE)
# On OSX, the name of the binary matches the name of the Application.
add_custom_command(TARGET BambuStudio POST_BUILD
COMMAND ln -sf BambuStudio bambu-studio
COMMAND ln -sf BambuStudio orca-slicer
WORKING_DIRECTORY "$<TARGET_FILE_DIR:BambuStudio>"
VERBATIM)
else ()

2
src/platform/msw/BambuStudio.rc.in
View file

@ -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"

2
src/platform/unix/BambuGcodeviewer.desktop
View file

@ -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

4
src/platform/unix/BambuStudio.desktop
View file

@ -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

2
src/slic3r/GUI/DesktopIntegrationDialog.cpp
View file

@ -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)){

2
src/slic3r/GUI/Mouse3DHandlerMac.mm
View file

@ -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";

4
src/slic3r/Utils/Process.cpp
View file

@ -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<const wchar_t*> 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;