mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-11-01 13:12:38 -06:00
Change Application name to OrcaSlicer
This commit is contained in:
SoftFever
parent
81ca7720e9
commit
5b0ba1207e
93 changed files with 5629 additions and 10221 deletions
|
|
@ -360,7 +360,7 @@ int CLI::run(int argc, char **argv)
|
|||
boost::nowide::cerr << text.c_str() << std::endl;
|
||||
return CLI_ENVIRONMENT_ERROR;
|
||||
}
|
||||
BOOST_LOG_TRIVIAL(info) << "Current BambuStudio Version "<< SLIC3R_VERSION << std::endl;
|
||||
BOOST_LOG_TRIVIAL(info) << "Current OraSlicer Version "<< SoftFever_VERSION << std::endl;
|
||||
|
||||
/*BOOST_LOG_TRIVIAL(info) << "begin to setup params, argc=" << argc << std::endl;
|
||||
for (int index=0; index < argc; index++)
|
||||
|
|
@ -455,7 +455,7 @@ int CLI::run(int argc, char **argv)
|
|||
//BBS: remove GCodeViewer as seperate APP logic
|
||||
//params.start_as_gcodeviewer = start_as_gcodeviewer;
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "begin to launch BambuStudio GUI soon";
|
||||
BOOST_LOG_TRIVIAL(info) << "begin to launch OrcaSlicer GUI soon";
|
||||
return Slic3r::GUI::GUI_Run(params);
|
||||
#else // SLIC3R_GUI
|
||||
// No GUI support. Just print out a help.
|
||||
|
|
@ -1752,7 +1752,7 @@ int CLI::run(int argc, char **argv)
|
|||
//FIXME check for mixing the FFF / SLA parameters.
|
||||
// or better save fff_print_config vs. sla_print_config
|
||||
//m_print_config.save(m_config.opt_string("save"));
|
||||
m_print_config.save_to_json(m_config.opt_string(opt_key), std::string("project_settings"), std::string("project"), std::string(SLIC3R_VERSION));
|
||||
m_print_config.save_to_json(m_config.opt_string(opt_key), std::string("project_settings"), std::string("project"), std::string(SoftFever_VERSION));
|
||||
} else if (opt_key == "info") {
|
||||
// --info works on unrepaired model
|
||||
for (Model &model : m_models) {
|
||||
|
|
@ -2384,17 +2384,17 @@ bool CLI::setup(int argc, char **argv)
|
|||
detect_platform();
|
||||
|
||||
#ifdef WIN32
|
||||
// Notify user that a blacklisted DLL was injected into BambuStudio process (for example Nahimic, see GH #5573).
|
||||
// We hope that if a DLL is being injected into a BambuStudio process, it happens at the very start of the application,
|
||||
// Notify user that a blacklisted DLL was injected into OrcaSlicer process (for example Nahimic, see GH #5573).
|
||||
// We hope that if a DLL is being injected into a OrcaSlicer process, it happens at the very start of the application,
|
||||
// thus we shall detect them now.
|
||||
if (BlacklistedLibraryCheck::get_instance().perform_check()) {
|
||||
std::wstring text = L"Following DLLs have been injected into the BambuStudio process:\n\n";
|
||||
std::wstring text = L"Following DLLs have been injected into the OrcaSlicer process:\n\n";
|
||||
text += BlacklistedLibraryCheck::get_instance().get_blacklisted_string();
|
||||
text += L"\n\n"
|
||||
L"BambuStudio is known to not run correctly with these DLLs injected. "
|
||||
L"We suggest stopping or uninstalling these services if you experience "
|
||||
L"crashes or unexpected behaviour while using BambuStudio.\n"
|
||||
L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes BambuStudio "
|
||||
L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes OrcaSlicer "
|
||||
L"to crash on a secondary monitor";
|
||||
MessageBoxW(NULL, text.c_str(), L"Warning"/*L"Incopatible library found"*/, MB_OK);
|
||||
}
|
||||
|
|
@ -2471,7 +2471,7 @@ bool CLI::setup(int argc, char **argv)
|
|||
void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const
|
||||
{
|
||||
boost::nowide::cout
|
||||
<< SLIC3R_APP_KEY <<"-"<< SLIC3R_VERSION << ":"
|
||||
<< SLIC3R_APP_KEY <<"-"<< SoftFever_VERSION << ":"
|
||||
<< std::endl
|
||||
<< "Usage: orca-slicer [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl
|
||||
<< std::endl
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@ public:
|
|||
wc.lpfnWndProc = OpenGLVersionCheck::supports_opengl2_wndproc;
|
||||
wc.hInstance = (HINSTANCE)GetModuleHandle(nullptr);
|
||||
wc.hbrBackground = (HBRUSH)(COLOR_BACKGROUND);
|
||||
wc.lpszClassName = L"BambuStudio_opengl_version_check";
|
||||
wc.lpszClassName = L"OrcaSlicer_opengl_version_check";
|
||||
wc.style = CS_OWNDC;
|
||||
if (RegisterClass(&wc)) {
|
||||
HWND hwnd = CreateWindowW(wc.lpszClassName, L"BambuStudio_opengl_version_check", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, wc.hInstance, (LPVOID)this);
|
||||
HWND hwnd = CreateWindowW(wc.lpszClassName, L"OrcaSlicer_opengl_version_check", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, wc.hInstance, (LPVOID)this);
|
||||
if (hwnd) {
|
||||
message_pump_exit = false;
|
||||
while (GetMessage(&msg, NULL, 0, 0 ) > 0 && ! message_pump_exit)
|
||||
|
|
@ -283,11 +283,11 @@ int wmain(int argc, wchar_t **argv)
|
|||
|
||||
wchar_t path_to_slic3r[MAX_PATH + 1] = { 0 };
|
||||
wcscpy(path_to_slic3r, path_to_exe);
|
||||
wcscat(path_to_slic3r, L"BambuStudio.dll");
|
||||
wcscat(path_to_slic3r, L"OrcaSlicer.dll");
|
||||
// printf("Loading Slic3r library: %S\n", path_to_slic3r);
|
||||
HINSTANCE hInstance_Slic3r = LoadLibraryExW(path_to_slic3r, nullptr, 0);
|
||||
if (hInstance_Slic3r == nullptr) {
|
||||
printf("BambuStudio.dll was not loaded, error=%d\n", GetLastError());
|
||||
printf("OrcaSlicer.dll was not loaded, error=%d\n", GetLastError());
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -301,7 +301,7 @@ int wmain(int argc, wchar_t **argv)
|
|||
#endif
|
||||
);
|
||||
if (bambustu_main == nullptr) {
|
||||
printf("could not locate the function bambustu_main in BambuStudio.dll\n");
|
||||
printf("could not locate the function bambustu_main in OrcaSlicer.dll\n");
|
||||
return -1;
|
||||
}
|
||||
// argc minus the trailing nullptr of the argv
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
cmake_minimum_required(VERSION 3.13)
|
||||
project(BambuStudio-native)
|
||||
project(OrcaSlicer-native)
|
||||
|
||||
add_subdirectory(build-utils)
|
||||
add_subdirectory(admesh)
|
||||
|
|
@ -106,55 +106,55 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/BambuStudio.rc.in ${CMAK
|
|||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/BambuStudio.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/BambuStudio.manifest @ONLY)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
|
||||
if (WIN32)
|
||||
add_library(BambuStudio SHARED BambuStudio.cpp BambuStudio.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h)
|
||||
add_library(OrcaSlicer SHARED BambuStudio.cpp BambuStudio.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h)
|
||||
else ()
|
||||
add_executable(BambuStudio BambuStudio.cpp BambuStudio.hpp)
|
||||
add_executable(OrcaSlicer BambuStudio.cpp BambuStudio.hpp)
|
||||
endif ()
|
||||
|
||||
if (MINGW)
|
||||
target_link_options(BambuStudio PUBLIC "-Wl,-allow-multiple-definition")
|
||||
set_target_properties(BambuStudio PROPERTIES PREFIX "")
|
||||
target_link_options(OrcaSlicer PUBLIC "-Wl,-allow-multiple-definition")
|
||||
set_target_properties(OrcaSlicer PROPERTIES PREFIX "")
|
||||
endif (MINGW)
|
||||
|
||||
if (NOT WIN32 AND NOT APPLE)
|
||||
# Binary name on unix like systems (Linux, Unix)
|
||||
set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer")
|
||||
set_target_properties(OrcaSlicer 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 ()
|
||||
|
||||
target_link_libraries(BambuStudio libslic3r cereal)
|
||||
target_link_libraries(OrcaSlicer libslic3r cereal)
|
||||
if (APPLE)
|
||||
# add_compile_options(-stdlib=libc++)
|
||||
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
|
||||
# -liconv: boost links to libiconv by default
|
||||
target_link_libraries(BambuStudio "-liconv -framework IOKit" "-framework CoreFoundation" "-framework AVFoundation" "-framework AVKit" "-framework CoreMedia" "-framework VideoToolbox" -lc++)
|
||||
target_link_libraries(OrcaSlicer "-liconv -framework IOKit" "-framework CoreFoundation" "-framework AVFoundation" "-framework AVKit" "-framework CoreMedia" "-framework VideoToolbox" -lc++)
|
||||
elseif (MSVC)
|
||||
# Manifest is provided through BambuStudio.rc, don't generate your own.
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
|
||||
else ()
|
||||
# Boost on Raspberry-Pi does not link to pthreads explicitely.
|
||||
target_link_libraries(BambuStudio ${CMAKE_DL_LIBS} -lstdc++ Threads::Threads pangoft2-1.0)
|
||||
target_link_libraries(OrcaSlicer ${CMAKE_DL_LIBS} -lstdc++ Threads::Threads pangoft2-1.0)
|
||||
endif ()
|
||||
|
||||
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
|
||||
if (SLIC3R_GUI)
|
||||
# target_link_libraries(BambuStudio ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
|
||||
target_link_libraries(BambuStudio libslic3r_gui)
|
||||
# target_link_libraries(OrcaSlicer ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
|
||||
target_link_libraries(OrcaSlicer libslic3r_gui)
|
||||
if (MSVC)
|
||||
# Generate debug symbols even in release mode.
|
||||
target_link_options(BambuStudio PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||
target_link_libraries(BambuStudio user32.lib Setupapi.lib)
|
||||
target_link_options(OrcaSlicer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||
target_link_libraries(OrcaSlicer user32.lib Setupapi.lib)
|
||||
elseif (MINGW)
|
||||
target_link_libraries(BambuStudio ws2_32 uxtheme setupapi)
|
||||
target_link_libraries(OrcaSlicer ws2_32 uxtheme setupapi)
|
||||
elseif (APPLE)
|
||||
target_link_libraries(BambuStudio "-framework OpenGL")
|
||||
target_link_libraries(OrcaSlicer "-framework OpenGL")
|
||||
else ()
|
||||
target_link_libraries(BambuStudio -ldl)
|
||||
target_link_libraries(OrcaSlicer -ldl)
|
||||
endif ()
|
||||
#if (WIN32)
|
||||
# find_library(PSAPI_LIB NAMES Psapi)
|
||||
# target_link_libraries(BambuStudio ${PSAPI_LIB})
|
||||
# target_link_libraries(OrcaSlicer ${PSAPI_LIB})
|
||||
#endif ()
|
||||
endif ()
|
||||
|
||||
|
|
@ -165,15 +165,15 @@ if (WIN32)
|
|||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
|
||||
endif()
|
||||
|
||||
add_executable(BambuStudio_app_gui WIN32 BambuStudio_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/BambuStudio.rc)
|
||||
add_executable(OrcaSlicer_app_gui WIN32 BambuStudio_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/BambuStudio.rc)
|
||||
# Generate debug symbols even in release mode.
|
||||
if(MSVC)
|
||||
target_link_options(BambuStudio_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||
target_link_options(OrcaSlicer_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||
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 "orca-slicer")
|
||||
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
|
||||
target_compile_definitions(OrcaSlicer_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
|
||||
add_dependencies(OrcaSlicer_app_gui OrcaSlicer)
|
||||
set_target_properties(OrcaSlicer_app_gui PROPERTIES OUTPUT_NAME "orca-slicer")
|
||||
target_link_libraries(OrcaSlicer_app_gui PRIVATE boost_headeronly)
|
||||
endif ()
|
||||
|
||||
# Link the resources dir to where Slic3r GUI expects it
|
||||
|
|
@ -182,13 +182,13 @@ set(output_dlls_Debug "")
|
|||
set(output_dlls_RelWithDebInfo "")
|
||||
if (WIN32)
|
||||
# This has to be a separate target due to the windows command line lenght limits
|
||||
add_custom_target(BambuStudioDllsCopy ALL DEPENDS BambuStudio)
|
||||
add_custom_target(COPY_DLLS ALL DEPENDS OrcaSlicer)
|
||||
|
||||
if (CMAKE_CONFIGURATION_TYPES)
|
||||
foreach (CONF ${CMAKE_CONFIGURATION_TYPES})
|
||||
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CONF}" WIN_CONF_OUTPUT_DIR)
|
||||
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CONF}/resources" WIN_RESOURCES_SYMLINK)
|
||||
add_custom_command(TARGET BambuStudio POST_BUILD
|
||||
add_custom_command(TARGET OrcaSlicer POST_BUILD
|
||||
COMMAND if exist "${WIN_CONF_OUTPUT_DIR}" "("
|
||||
if not exist "${WIN_RESOURCES_SYMLINK}" "("
|
||||
mklink /J "${WIN_RESOURCES_SYMLINK}" "${SLIC3R_RESOURCES_DIR_WIN}"
|
||||
|
|
@ -200,15 +200,15 @@ if (WIN32)
|
|||
endforeach ()
|
||||
|
||||
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
||||
bambustudio_copy_dlls(BambuStudioDllsCopy "Debug" "d" output_dlls_Debug)
|
||||
orcaslicer_copy_dlls(COPY_DLLS "Debug" "d" output_dlls_Debug)
|
||||
elseif("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
|
||||
bambustudio_copy_dlls(BambuStudioDllsCopy "RelWithDebInfo" "" output_dlls_RelWithDebInfo)
|
||||
orcaslicer_copy_dlls(COPY_DLLS "RelWithDebInfo" "" output_dlls_RelWithDebInfo)
|
||||
else()
|
||||
bambustudio_copy_dlls(BambuStudioDllsCopy "Release" "" output_dlls_Release)
|
||||
orcaslicer_copy_dlls(COPY_DLLS "Release" "" output_dlls_Release)
|
||||
endif()
|
||||
else ()
|
||||
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/resources" WIN_RESOURCES_SYMLINK)
|
||||
add_custom_command(TARGET BambuStudio POST_BUILD
|
||||
add_custom_command(TARGET OrcaSlicer POST_BUILD
|
||||
COMMAND if not exist "${WIN_RESOURCES_SYMLINK}" "(" mklink /J "${WIN_RESOURCES_SYMLINK}" "${SLIC3R_RESOURCES_DIR_WIN}" ")"
|
||||
COMMENT "Symlinking the resources directory into the build tree"
|
||||
VERBATIM
|
||||
|
|
@ -219,13 +219,13 @@ if (WIN32)
|
|||
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 orca-slicer
|
||||
WORKING_DIRECTORY "$<TARGET_FILE_DIR:BambuStudio>"
|
||||
add_custom_command(TARGET OrcaSlicer POST_BUILD
|
||||
COMMAND ln -sf OrcaSlicer orca-slicer
|
||||
WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
|
||||
VERBATIM)
|
||||
else ()
|
||||
add_custom_command(TARGET BambuStudio POST_BUILD
|
||||
WORKING_DIRECTORY "$<TARGET_FILE_DIR:BambuStudio>"
|
||||
add_custom_command(TARGET OrcaSlicer POST_BUILD
|
||||
WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
|
||||
VERBATIM)
|
||||
endif ()
|
||||
if (XCODE)
|
||||
|
|
@ -238,11 +238,11 @@ else ()
|
|||
if (CMAKE_MACOSX_BUNDLE)
|
||||
set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/OrcaSlicer.app/Contents/Resources")
|
||||
set(MACOSX_BUNDLE_ICON_FILE Icon.icns)
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME "Bambu Studio")
|
||||
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${SLIC3R_VERSION})
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME "Orca Slicer")
|
||||
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${SoftFever_VERSION})
|
||||
set(MACOSX_BUNDLE_COPYRIGHT "Copyright(C) 2021-2023 Lunkuo All Rights Reserved")
|
||||
endif()
|
||||
add_custom_command(TARGET BambuStudio POST_BUILD
|
||||
add_custom_command(TARGET OrcaSlicer POST_BUILD
|
||||
COMMAND ln -sfn "${SLIC3R_RESOURCES_DIR}" "${BIN_RESOURCES_DIR}"
|
||||
COMMENT "Symlinking the resources directory into the build tree"
|
||||
VERBATIM)
|
||||
|
|
@ -262,11 +262,11 @@ endif()
|
|||
message(STATUS "libslic3r-CMAKE_BUILD_TYPE: ${build_type}")
|
||||
message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
|
||||
if (WIN32)
|
||||
install(TARGETS BambuStudio RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
if (MSVC)
|
||||
install(TARGETS BambuStudio_app_gui RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
install(TARGETS OrcaSlicer_app_gui RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
endif ()
|
||||
install(FILES ${output_dlls_${build_type}} DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
else ()
|
||||
install(TARGETS BambuStudio RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif ()
|
||||
|
|
|
|||
|
|
@ -710,7 +710,7 @@ generate_hash_secret_salt(XML_Parser parser)
|
|||
{
|
||||
/* Process ID is 0 bits entropy if attacker has local access
|
||||
* XML_Parser address is few bits of entropy if attacker has local access */
|
||||
// BambuStudio specific: Fix for a following warning, which turns to an error on some Perl/XS installations:
|
||||
// OrcaSlicer specific: Fix for a following warning, which turns to an error on some Perl/XS installations:
|
||||
// error: cast from 'XML_Parser' to 'long unsigned int' loses precision [-fpermissive]
|
||||
unsigned long *parser_addr = (unsigned long*)&parser;
|
||||
const unsigned long entropy =
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ int main(int argc, char* argv[])
|
|||
}
|
||||
try {
|
||||
path_to_ini = boost::filesystem::canonical(boost::filesystem::path(argv[1])).parent_path() / "resources" / "data" / "hints.ini";
|
||||
path_to_pot = boost::filesystem::canonical(boost::filesystem::path(argv[2])).parent_path() / "i18n" /"BambuStudio.pot";
|
||||
path_to_pot = boost::filesystem::canonical(boost::filesystem::path(argv[2])).parent_path() / "i18n" /"OrcaSlicer.pot";
|
||||
} catch (std::exception&) {
|
||||
std::cout << "HINTS_TO_POT FAILED: BOOST CANNONICAL" << std::endl;
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -1184,7 +1184,7 @@ ConfigSubstitutions ConfigBase::load_from_gcode_file(const std::string &file, Fo
|
|||
// Read a 64k block from the end of the G-code.
|
||||
boost::nowide::ifstream ifs(file);
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": before parse_file %1%") % file.c_str();
|
||||
// Look for Slic3r or BambuStudio header.
|
||||
// Look for Slic3r or OrcaSlicer header.
|
||||
// Look for the header across the whole file as the G-code may have been extended at the start by a post-processing script or the user.
|
||||
//BBS
|
||||
bool has_delimiters = true;
|
||||
|
|
|
|||
|
|
@ -231,8 +231,8 @@ class ConfigOptionDef;
|
|||
struct ConfigOptionDeleter { void operator()(ConfigOption* p); };
|
||||
using ConfigOptionUniquePtr = std::unique_ptr<ConfigOption, ConfigOptionDeleter>;
|
||||
|
||||
// When parsing a configuration value, if the old_value is not understood by this BambuStudio version,
|
||||
// it is being substituted with some default value that this BambuStudio could work with.
|
||||
// When parsing a configuration value, if the old_value is not understood by this OrcaSlicer version,
|
||||
// it is being substituted with some default value that this OrcaSlicer could work with.
|
||||
// This structure serves to inform the user about the substitutions having been done during file import.
|
||||
struct ConfigSubstitution {
|
||||
const ConfigOptionDef *opt_def { nullptr };
|
||||
|
|
|
|||
|
|
@ -835,7 +835,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
bool m_load_restore;
|
||||
std::string m_backup_path;
|
||||
std::string m_origin_file;
|
||||
// Semantic version of Bambu Studio, that generated this 3MF.
|
||||
// Semantic version of Orca Slicer, that generated this 3MF.
|
||||
boost::optional<Semver> m_bambuslicer_generator_version;
|
||||
unsigned int m_fdm_supports_painting_version = 0;
|
||||
unsigned int m_seam_painting_version = 0;
|
||||
|
|
@ -1501,7 +1501,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
lock.close();
|
||||
|
||||
if (!m_is_bbl_3mf) {
|
||||
// if the 3mf was not produced by BambuStudio and there is more than one instance,
|
||||
// if the 3mf was not produced by OrcaSlicer and there is more than one instance,
|
||||
// split the object in as many objects as instances
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", found 3mf from other vendor, split as instance");
|
||||
for (const IdToModelObjectMap::value_type& object : m_objects) {
|
||||
|
|
@ -2776,7 +2776,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
}
|
||||
|
||||
if (!m_is_bbl_3mf) {
|
||||
// if the 3mf was not produced by BambuStudio and there is only one object,
|
||||
// if the 3mf was not produced by OrcaSlicer and there is only one object,
|
||||
// set the object name to match the filename
|
||||
if (m_model->objects.size() == 1)
|
||||
m_model->objects.front()->name = m_name;
|
||||
|
|
@ -3175,15 +3175,15 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
/*} else if (m_curr_metadata_name == BBS_FDM_SUPPORTS_PAINTING_VERSION) {
|
||||
m_fdm_supports_painting_version = (unsigned int) atoi(m_curr_characters.c_str());
|
||||
check_painting_version(m_fdm_supports_painting_version, FDM_SUPPORTS_PAINTING_VERSION,
|
||||
_(L("The selected 3MF contains FDM supports painted object using a newer version of BambuStudio and is not compatible.")));
|
||||
_(L("The selected 3MF contains FDM supports painted object using a newer version of OrcaSlicer and is not compatible.")));
|
||||
} else if (m_curr_metadata_name == BBS_SEAM_PAINTING_VERSION) {
|
||||
m_seam_painting_version = (unsigned int) atoi(m_curr_characters.c_str());
|
||||
check_painting_version(m_seam_painting_version, SEAM_PAINTING_VERSION,
|
||||
_(L("The selected 3MF contains seam painted object using a newer version of BambuStudio and is not compatible.")));
|
||||
_(L("The selected 3MF contains seam painted object using a newer version of OrcaSlicer and is not compatible.")));
|
||||
} else if (m_curr_metadata_name == BBS_MM_PAINTING_VERSION) {
|
||||
m_mm_painting_version = (unsigned int) atoi(m_curr_characters.c_str());
|
||||
check_painting_version(m_mm_painting_version, MM_PAINTING_VERSION,
|
||||
_(L("The selected 3MF contains multi-material painted object using a newer version of BambuStudio and is not compatible.")));*/
|
||||
_(L("The selected 3MF contains multi-material painted object using a newer version of OrcaSlicer and is not compatible.")));*/
|
||||
} else if (m_curr_metadata_name == BBL_MODEL_ID_TAG) {
|
||||
m_model_id = xml_unescape(m_curr_characters);
|
||||
} else if (m_curr_metadata_name == BBL_MODEL_NAME_TAG) {
|
||||
|
|
@ -3897,7 +3897,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
TriangleMesh triangle_mesh(std::move(its), volume_data->mesh_stats);
|
||||
|
||||
if (!m_is_bbl_3mf) {
|
||||
// if the 3mf was not produced by BambuStudio and there is only one instance,
|
||||
// if the 3mf was not produced by OrcaSlicer and there is only one instance,
|
||||
// bake the transformation into the geometry to allow the reload from disk command
|
||||
// to work properly
|
||||
if (object.instances.size() == 1) {
|
||||
|
|
@ -4072,7 +4072,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
TriangleMesh triangle_mesh(std::move(its), volume_data.mesh_stats);
|
||||
|
||||
if (!m_is_bbl_3mf) {
|
||||
// if the 3mf was not produced by BambuStudio and there is only one instance,
|
||||
// if the 3mf was not produced by OrcaSlicer and there is only one instance,
|
||||
// bake the transformation into the geometry to allow the reload from disk command
|
||||
// to work properly
|
||||
if (object.instances.size() == 1) {
|
||||
|
|
@ -4911,7 +4911,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
}
|
||||
|
||||
// Adds content types file ("[Content_Types].xml";).
|
||||
// The content of this file is the same for each BambuStudio 3mf.
|
||||
// The content of this file is the same for each OrcaSlicer 3mf.
|
||||
if (!_add_content_types_file_to_archive(archive)) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -5187,7 +5187,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||
}
|
||||
|
||||
// Adds relationships file ("_rels/.rels").
|
||||
// The content of this file is the same for each BambuStudio 3mf.
|
||||
// The content of this file is the same for each OrcaSlicer 3mf.
|
||||
// The relationshis file contains a reference to the geometry file "3D/3dmodel.model", the name was chosen to be compatible with CURA.
|
||||
if (!_add_relationships_file_to_archive(archive, {}, {}, {}, temp_data, export_plate_idx)) {
|
||||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", _add_relationships_file_to_archive failed\n");
|
||||
|
|
|
|||
|
|
@ -1542,7 +1542,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
|
|||
file.write_format(
|
||||
"; %s\n\n",
|
||||
std::string(
|
||||
std::string("generated by SuperSlicer " SLIC3R_VERSION " on ") +
|
||||
std::string("generated by SuperSlicer " SoftFever_VERSION " on ") +
|
||||
Slic3r::Utils::utc_timestamp())
|
||||
.c_str());
|
||||
|
||||
|
|
|
|||
|
|
@ -833,10 +833,11 @@ void GCodeProcessorResult::reset() {
|
|||
#endif // ENABLE_GCODE_VIEWER_STATISTICS
|
||||
|
||||
const std::vector<std::pair<GCodeProcessor::EProducer, std::string>> GCodeProcessor::Producers = {
|
||||
//BBS: BambuStudio is also "bambu". Otherwise the time estimation didn't work.
|
||||
//BBS: OrcaSlicer is also "bambu". Otherwise the time estimation didn't work.
|
||||
//FIXME: Workaround and should be handled when do removing-bambu
|
||||
{ EProducer::BambuStudio, SLIC3R_APP_NAME },
|
||||
{ EProducer::BambuStudio, "generated by BambuStudio" }
|
||||
{ EProducer::BambuStudio, "generated by BambuStudio" },
|
||||
{ EProducer::BambuStudio, "BambuStudio" }
|
||||
//{ EProducer::Slic3rPE, "generated by Slic3r Bambu Edition" },
|
||||
//{ EProducer::Slic3r, "generated by Slic3r" },
|
||||
//{ EProducer::SuperSlicer, "generated by SuperSlicer" },
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ namespace Slic3r {
|
|||
|
||||
PlaceholderParser::PlaceholderParser(const DynamicConfig *external_config) : m_external_config(external_config)
|
||||
{
|
||||
this->set("version", std::string(SLIC3R_VERSION));
|
||||
this->set("version", std::string(SoftFever_VERSION));
|
||||
this->apply_env_variables();
|
||||
this->update_timestamp();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
|
|||
DynamicConfig cfg;
|
||||
if (config_override != nullptr)
|
||||
cfg = *config_override;
|
||||
cfg.set_key_value("version", new ConfigOptionString(std::string(SLIC3R_VERSION)));
|
||||
cfg.set_key_value("version", new ConfigOptionString(std::string(SoftFever_VERSION)));
|
||||
PlaceholderParser::update_timestamp(cfg);
|
||||
this->update_object_placeholders(cfg, default_ext);
|
||||
if (! filename_base.empty()) {
|
||||
|
|
|
|||
|
|
@ -5094,8 +5094,8 @@ CLIMiscConfigDef::CLIMiscConfigDef()
|
|||
|
||||
def = this->add("config_compatibility", coEnum);
|
||||
def->label = L("Forward-compatibility rule when loading configurations from config files and project files (3MF, AMF).");
|
||||
def->tooltip = L("This version of BambuStudio may not understand configurations produced by the newest BambuStudio versions. "
|
||||
"For example, newer BambuStudio may extend the list of supported firmware flavors. One may decide to "
|
||||
def->tooltip = L("This version of OrcaSlicer may not understand configurations produced by the newest OrcaSlicer versions. "
|
||||
"For example, newer OrcaSlicer may extend the list of supported firmware flavors. One may decide to "
|
||||
"bail out or to substitute an unknown value with a default silently or verbosely.");
|
||||
def->enum_keys_map = &ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>::get_enum_values();
|
||||
def->enum_values.push_back("disable");
|
||||
|
|
@ -5130,7 +5130,7 @@ CLIMiscConfigDef::CLIMiscConfigDef()
|
|||
def = this->add("single_instance", coBool);
|
||||
def->label = L("Single instance mode");
|
||||
def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI BambuStudio, "
|
||||
"or an existing BambuStudio window is activated. "
|
||||
"or an existing OrcaSlicer window is activated. "
|
||||
"Overrides the \"single_instance\" configuration value from application preferences.");*/
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
|
||||
#include <boost/system/error_code.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
#include "libslic3r.h"
|
||||
|
|
@ -567,6 +568,9 @@ inline std::string get_bbl_remain_time_dhms(float time_in_secs)
|
|||
|
||||
bool bbl_calc_md5(std::string &filename, std::string &md5_out);
|
||||
|
||||
void copy_directory_recursively(const boost::filesystem::path &source, const boost::filesystem::path &target);
|
||||
|
||||
|
||||
} // namespace Slic3r
|
||||
|
||||
#if WIN32
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#define _libslic3r_h_
|
||||
|
||||
#include "libslic3r_version.h"
|
||||
#define SLIC3R_APP_FULL_NAME "Bambu Studio"
|
||||
#define SLIC3R_APP_FULL_NAME "Orca Slicer"
|
||||
#define GCODEVIEWER_APP_NAME "BambuStudio G-code Viewer"
|
||||
#define GCODEVIEWER_APP_KEY "BambuStudioGcodeViewer"
|
||||
#define GCODEVIEWER_BUILD_ID std::string("BambuStudio G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-RC")
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@
|
|||
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
#include <boost/nowide/convert.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
|
|
@ -1106,12 +1105,12 @@ std::string string_printf(const char *format, ...)
|
|||
|
||||
std::string header_slic3r_generated()
|
||||
{
|
||||
return std::string(SLIC3R_APP_NAME "-SoftFever" " " SLIC3R_VERSION);
|
||||
return std::string(SLIC3R_APP_NAME " " SoftFever_VERSION);
|
||||
}
|
||||
|
||||
std::string header_gcodeviewer_generated()
|
||||
{
|
||||
return std::string(GCODEVIEWER_APP_NAME " " SLIC3R_VERSION);
|
||||
return std::string(GCODEVIEWER_APP_NAME " " SoftFever_VERSION);
|
||||
}
|
||||
|
||||
unsigned get_current_pid()
|
||||
|
|
@ -1421,5 +1420,36 @@ bool bbl_calc_md5(std::string &filename, std::string &md5_out)
|
|||
return true;
|
||||
}
|
||||
|
||||
// SoftFever: copy directory recursively
|
||||
void copy_directory_recursively(const boost::filesystem::path &source, const boost::filesystem::path &target)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(info) << format("copy_directory_recursively %1% -> %2%", source, target);
|
||||
std::string error_message;
|
||||
|
||||
if (boost::filesystem::exists(target))
|
||||
boost::filesystem::remove_all(target);
|
||||
boost::filesystem::create_directories(target);
|
||||
for (auto &dir_entry : boost::filesystem::directory_iterator(source))
|
||||
{
|
||||
std::string source_file = dir_entry.path().string();
|
||||
std::string name = dir_entry.path().filename().string();
|
||||
std::string target_file = target.string() + "/" + name;
|
||||
|
||||
if (boost::filesystem::is_directory(dir_entry)) {
|
||||
const auto target_path = target / name;
|
||||
copy_directory_recursively(dir_entry, target_path);
|
||||
}
|
||||
else {
|
||||
CopyFileResult cfr = copy_file(source_file, target_file, error_message, false);
|
||||
if (cfr != CopyFileResult::SUCCESS) {
|
||||
BOOST_LOG_TRIVIAL(error) << "Copying failed(" << cfr << "): " << error_message;
|
||||
throw Slic3r::CriticalException(format(
|
||||
("Copying directory %1% to %2% failed: %3%"),
|
||||
source, target, error_message));
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
}; // namespace Slic3r
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ cat << EOF >@SLIC3R_APP_CMD@
|
|||
DIR=\$(readlink -f "\$0" | xargs dirname)
|
||||
export LD_LIBRARY_PATH="\$DIR/bin"
|
||||
|
||||
# FIXME: BambuStudio segfault workarounds
|
||||
# 1) BambuStudio will segfault on systems where locale info is not as expected (i.e. Holo-ISO arch-based distro)
|
||||
# FIXME: OrcaSlicer segfault workarounds
|
||||
# 1) OrcaSlicer will segfault on systems where locale info is not as expected (i.e. Holo-ISO arch-based distro)
|
||||
export LC_ALL=C
|
||||
|
||||
exec "\$DIR/bin/@SLIC3R_APP_CMD@" "\$@"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[Desktop Entry]
|
||||
Name=BambuStudio
|
||||
Name=OrcaSlicer
|
||||
GenericName=3D Printing Software
|
||||
Icon=BambuStudio
|
||||
Exec=orca-slicer %F
|
||||
|
|
@ -374,7 +374,7 @@ static void copy_config_dir_single_level(const boost::filesystem::path &path_src
|
|||
#if 0
|
||||
if (! boost::filesystem::is_directory(path_dst) &&
|
||||
! boost::filesystem::create_directory(path_dst))
|
||||
throw Slic3r::RuntimeError(std::string("BambuStudio was unable to create a directory at ") + path_dst.string());
|
||||
throw Slic3r::RuntimeError(std::string("OrcaSlicer was unable to create a directory at ") + path_dst.string());
|
||||
|
||||
for (auto &dir_entry : boost::filesystem::directory_iterator(path_src))
|
||||
if (Slic3r::is_ini_file(dir_entry))
|
||||
|
|
@ -593,8 +593,8 @@ bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot:
|
|||
return true;
|
||||
} catch (std::exception &err) {
|
||||
RichMessageDialog dlg(static_cast<wxWindow*>(wxGetApp().mainframe),
|
||||
_L("BambuStudio has encountered an error while taking a configuration snapshot.") + "\n\n" + from_u8(err.what()) + "\n\n" + from_u8(message),
|
||||
_L("BambuStudio error"),
|
||||
_L("OrcaSlicer has encountered an error while taking a configuration snapshot.") + "\n\n" + from_u8(err.what()) + "\n\n" + from_u8(message),
|
||||
_L("OrcaSlicer error"),
|
||||
wxYES_NO);
|
||||
dlg.SetYesNoLabels(_L("Continue"), _L("Abort"));
|
||||
return dlg.ShowModal() == wxID_YES;
|
||||
|
|
|
|||
|
|
@ -147,9 +147,9 @@ wxString CopyrightsDialog::get_html_text()
|
|||
"<font size=\"3\">",
|
||||
bgr_clr_str, text_clr_str, text_clr_str,
|
||||
_L("License"),
|
||||
_L("Bambu Studio is licensed under "),
|
||||
_L("Orca Slicer is licensed under "),
|
||||
"https://www.gnu.org/licenses/agpl-3.0.html",_L("GNU Affero General Public License, version 3"),
|
||||
_L("Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r by Alessandro Ranellucci and the RepRap community"),
|
||||
_L("Orca Slicer is based on BambuStudio by Bambulab, which is from PrusaSlicer by Prusa Research. PrusaSlicer is from Slic3r by Alessandro Ranellucci and the RepRap community"),
|
||||
_L("Libraries"),
|
||||
_L("This software uses open source components whose copyright and other proprietary rights belong to their respective owners"));
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ AboutDialog::AboutDialog()
|
|||
wxPanel *m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(237)), wxTAB_TRAVERSAL);
|
||||
|
||||
wxBoxSizer *panel_versizer = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer *vesizer = new wxBoxSizer(wxVERTICAL);
|
||||
// wxBoxSizer *vesizer = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
m_panel->SetSizer(panel_versizer);
|
||||
|
||||
|
|
@ -230,18 +230,20 @@ AboutDialog::AboutDialog()
|
|||
main_sizer->Add(m_panel, 1, wxEXPAND | wxALL, 0);
|
||||
main_sizer->Add(ver_sizer, 0, wxEXPAND | wxALL, 0);
|
||||
|
||||
// logo
|
||||
m_logo_bitmap = ScalableBitmap(this, "BambuStudio_about", 250);
|
||||
m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0);
|
||||
m_logo->SetSizer(vesizer);
|
||||
// // logo
|
||||
// m_logo_bitmap = ScalableBitmap(this, "BambuStudio_about", 250);
|
||||
// m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0);
|
||||
// m_logo->SetSizer(vesizer);
|
||||
|
||||
panel_versizer->Add(m_logo, 1, wxALL | wxEXPAND, 0);
|
||||
// panel_versizer->Add(m_logo, 1, wxALL | wxEXPAND, 0);
|
||||
|
||||
// version
|
||||
{
|
||||
vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5));
|
||||
auto version_string = _L("SoftFever Version") + " " + std::string(SoftFever_VERSION);
|
||||
panel_versizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5));
|
||||
auto version_string = _L("Orca Slicer ") + " " + std::string(SoftFever_VERSION);
|
||||
wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
|
||||
wxStaticText* bs_version = new wxStaticText(this, wxID_ANY, wxString::Format("Based on BambuStudio %s",std::string(SLIC3R_VERSION)), wxDefaultPosition, wxDefaultSize);
|
||||
bs_version->SetFont(Label::Body_12);
|
||||
wxFont version_font = GetFont();
|
||||
#ifdef __WXMSW__
|
||||
version_font.SetPointSize(version_font.GetPointSize()-1);
|
||||
|
|
@ -250,21 +252,22 @@ AboutDialog::AboutDialog()
|
|||
#endif
|
||||
version_font.SetPointSize(FromDIP(16));
|
||||
version->SetFont(version_font);
|
||||
version->SetForegroundColour(wxColour("#FFFFFD"));
|
||||
if(wxGetApp().dark_mode())
|
||||
version->SetBackgroundColour(wxColour("#00675b"));
|
||||
else
|
||||
version->SetBackgroundColour(wxColour("#009688"));
|
||||
// version->SetForegroundColour(wxColour("#FFFFFD"));
|
||||
// if(wxGetApp().dark_mode())
|
||||
// version->SetBackgroundColour(wxColour("#00675b"));
|
||||
// else
|
||||
// version->SetBackgroundColour(wxColour("#009688"));
|
||||
|
||||
vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));
|
||||
#if BBL_INTERNAL_TESTING
|
||||
wxString build_time = wxString::Format("Build Time: %s", std::string(SLIC3R_BUILD_TIME));
|
||||
wxStaticText* build_time_text = new wxStaticText(this, wxID_ANY, build_time, wxDefaultPosition, wxDefaultSize);
|
||||
build_time_text->SetForegroundColour(wxColour("#FFFFFE"));
|
||||
build_time_text->SetBackgroundColour(wxColour("#00AF42"));
|
||||
vesizer->Add(build_time_text, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));
|
||||
#endif
|
||||
vesizer->Add(0, 0, 1, wxEXPAND, FromDIP(5));
|
||||
panel_versizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));
|
||||
panel_versizer->Add(bs_version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));
|
||||
// #if BBL_INTERNAL_TESTING
|
||||
// wxString build_time = wxString::Format("Build Time: %s", std::string(SLIC3R_BUILD_TIME));
|
||||
// wxStaticText* build_time_text = new wxStaticText(this, wxID_ANY, build_time, wxDefaultPosition, wxDefaultSize);
|
||||
// build_time_text->SetForegroundColour(wxColour("#FFFFFE"));
|
||||
// build_time_text->SetBackgroundColour(wxColour("#00AF42"));
|
||||
// vesizer->Add(build_time_text, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));
|
||||
// #endif
|
||||
panel_versizer->Add(0, 0, 1, wxEXPAND, FromDIP(5));
|
||||
}
|
||||
|
||||
wxBoxSizer *text_sizer_horiz = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
|
@ -272,11 +275,10 @@ AboutDialog::AboutDialog()
|
|||
text_sizer_horiz->Add( 0, 0, 0, wxLEFT, FromDIP(23));
|
||||
|
||||
std::vector<wxString> text_list;
|
||||
text_list.push_back(_L("Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by Merill(supermerill)."));
|
||||
text_list.push_back(_L("OrcaSlicer is based on BambuStudio, PrusaSlicer, and SuperSlicer."));
|
||||
text_list.push_back(_L("BambuStudio is originally based on PrusaSlicer by PrusaResearch."));
|
||||
text_list.push_back(_L("PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci."));
|
||||
text_list.push_back(_L("Slic3r was created by Alessandro Ranellucci with the help of many other contributors."));
|
||||
text_list.push_back(_L("Bambu Studio also referenced some ideas from Cura by Ultimaker."));
|
||||
text_list.push_back(_L("There many parts of the software that come from community contributions, so we're unable to list them one-by-one, and instead, they'll be attributed in the corresponding code comments."));
|
||||
|
||||
text_sizer->Add( 0, 0, 0, wxTOP, FromDIP(33));
|
||||
bool is_zh = wxGetApp().app_config->get("language") == "zh_CN";
|
||||
|
|
@ -319,7 +321,7 @@ AboutDialog::AboutDialog()
|
|||
copyright_hor_sizer->Add(copyright_ver_sizer, 0, wxALL,5);
|
||||
copyright_hor_sizer->Add( 0, 0, 0, wxLEFT, FromDIP(120));
|
||||
|
||||
wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2021-2023 Lunkuo All Rights Reserved", wxDefaultPosition, wxDefaultSize);
|
||||
wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2022-2023 Li Jiang All Rights Reserved", wxDefaultPosition, wxDefaultSize);
|
||||
html_text->SetForegroundColour(wxColour(107, 107, 107));
|
||||
|
||||
copyright_ver_sizer->Add(html_text, 0, wxALL , 0);
|
||||
|
|
@ -336,7 +338,7 @@ AboutDialog::AboutDialog()
|
|||
(boost::format(
|
||||
"<html>"
|
||||
"<body>"
|
||||
"<p style=\"text-align:left\"><a href=\"www.bambulab.com\">www.bambulab.com</ a></p>"
|
||||
"<p style=\"text-align:left\"><a href=\"https://github.com/SoftFever/Orcaslicer\">https://github.com/SoftFever/Orcaslicer</ a></p>"
|
||||
"</body>"
|
||||
"</html>")
|
||||
).str());
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ void DesktopIntegrationDialog::perform_desktop_integration()
|
|||
}
|
||||
}
|
||||
if(target_dir_icons.empty()) {
|
||||
BOOST_LOG_TRIVIAL(error) << "Copying BambuStudio icon to icons directory failed.";
|
||||
BOOST_LOG_TRIVIAL(error) << "Copying OrcaSlicer icon to icons directory failed.";
|
||||
} else
|
||||
// save path to icon
|
||||
app_config->set("desktop_integration_icon_slicer_path", GUI::format("%1%/images/%2%BambuStudio%3%.png", target_dir_icons, icon_theme_path, version_suffix));
|
||||
|
|
@ -330,7 +330,7 @@ void DesktopIntegrationDialog::perform_desktop_integration()
|
|||
// Write slicer desktop file
|
||||
std::string desktop_file = GUI::format(
|
||||
"[Desktop Entry]\n"
|
||||
"Name=BambuStudio%1%\n"
|
||||
"Name=OrcaSlicer%1%\n"
|
||||
"GenericName=3D Printing Software\n"
|
||||
"Icon=BambuStudio%2%\n"
|
||||
"Exec=\"%3%\" %%F\n"
|
||||
|
|
@ -342,13 +342,13 @@ void DesktopIntegrationDialog::perform_desktop_integration()
|
|||
"StartupNotify=false\n"
|
||||
"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);
|
||||
std::string path = GUI::format("%1%/applications/OrcaSlicer%2%.desktop", target_dir_desktop, version_suffix);
|
||||
if (create_desktop_file(path, desktop_file)){
|
||||
BOOST_LOG_TRIVIAL(debug) << "BambuStudio.desktop file installation success.";
|
||||
BOOST_LOG_TRIVIAL(debug) << "OrcaSlicer.desktop file installation success.";
|
||||
break;
|
||||
} else {
|
||||
// write failed - try another path
|
||||
BOOST_LOG_TRIVIAL(debug) << "Attempt to BambuStudio.desktop file installation failed. failed path: " << target_candidates[i];
|
||||
BOOST_LOG_TRIVIAL(debug) << "Attempt to OrcaSlicer.desktop file installation failed. failed path: " << target_candidates[i];
|
||||
target_dir_desktop.clear();
|
||||
}
|
||||
// if all failed - try creating default home folder
|
||||
|
|
@ -357,7 +357,7 @@ void DesktopIntegrationDialog::perform_desktop_integration()
|
|||
create_path(boost::nowide::narrow(wxFileName::GetHomeDir()), ".local/share/applications");
|
||||
// create desktop file
|
||||
target_dir_desktop = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
|
||||
std::string path = GUI::format("%1%/applications/BambuStudio%2%.desktop", target_dir_desktop, version_suffix);
|
||||
std::string path = GUI::format("%1%/applications/OrcaSlicer%2%.desktop", target_dir_desktop, version_suffix);
|
||||
if (contains_path_dir(target_dir_desktop, "applications")) {
|
||||
if (!create_desktop_file(path, desktop_file)) {
|
||||
// Desktop file not written - end desktop integration
|
||||
|
|
@ -379,7 +379,7 @@ void DesktopIntegrationDialog::perform_desktop_integration()
|
|||
return;
|
||||
}
|
||||
// save path to desktop file
|
||||
app_config->set("desktop_integration_app_path", GUI::format("%1%/applications/BambuStudio%2%.desktop", target_dir_desktop, version_suffix));
|
||||
app_config->set("desktop_integration_app_path", GUI::format("%1%/applications/OrcaSlicer%2%.desktop", target_dir_desktop, version_suffix));
|
||||
|
||||
// Repeat for Gcode viewer - use same paths as for slicer files
|
||||
// Do NOT add gcode viewer desktop file on ChromeOS
|
||||
|
|
@ -410,13 +410,13 @@ void DesktopIntegrationDialog::perform_desktop_integration()
|
|||
"Keywords=3D;Printing;Slicer;\n"
|
||||
"StartupNotify=false\n", name_suffix, version_suffix, excutable_path);
|
||||
|
||||
std::string desktop_path = GUI::format("%1%/applications/BambuStudioGcodeViewer%2%.desktop", target_dir_desktop, version_suffix);
|
||||
std::string desktop_path = GUI::format("%1%/applications/OrcaSlicerGcodeViewer%2%.desktop", target_dir_desktop, version_suffix);
|
||||
if (create_desktop_file(desktop_path, desktop_file))
|
||||
// save path to desktop file
|
||||
app_config->set("desktop_integration_app_viewer_path", desktop_path);
|
||||
else {
|
||||
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - could not create Gcodeviewer desktop file";
|
||||
show_error(nullptr, _L("Performing desktop integration failed - could not create Gcodeviewer desktop file. BambuStudio desktop file was probably created successfully."));
|
||||
show_error(nullptr, _L("Performing desktop integration failed - could not create Gcodeviewer desktop file. OrcaSlicer desktop file was probably created successfully."));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public:
|
|||
|
||||
// methods that actually do / undo desktop integration. Static to be accesible from anywhere.
|
||||
|
||||
// returns true if path to BambuStudio.desktop is stored in App Config and existence of desktop file.
|
||||
// returns true if path to OrcaSlicer.desktop is stored in App Config and existence of desktop file.
|
||||
// Does not check if desktop file leads to this binary or existence of icons and viewer desktop file.
|
||||
static bool is_integrated();
|
||||
// true if appimage
|
||||
|
|
|
|||
|
|
@ -1909,7 +1909,7 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const
|
|||
}
|
||||
|
||||
fprintf(fp, "# G-Code Toolpaths Materials\n");
|
||||
fprintf(fp, "# Generated by %s-%s based on Slic3r\n", SLIC3R_APP_NAME, SLIC3R_VERSION);
|
||||
fprintf(fp, "# Generated by %s-%s based on Slic3r\n", SLIC3R_APP_NAME, SoftFever_VERSION);
|
||||
|
||||
unsigned int colors_count = 1;
|
||||
for (const Color& color : colors) {
|
||||
|
|
@ -1929,7 +1929,7 @@ void GCodeViewer::export_toolpaths_to_obj(const char* filename) const
|
|||
}
|
||||
|
||||
fprintf(fp, "# G-Code Toolpaths\n");
|
||||
fprintf(fp, "# Generated by %s-%s based on Slic3r\n", SLIC3R_APP_NAME, SLIC3R_VERSION);
|
||||
fprintf(fp, "# Generated by %s-%s based on Slic3r\n", SLIC3R_APP_NAME, SoftFever_VERSION);
|
||||
fprintf(fp, "\nmtllib ./%s\n", mat_filename.filename().string().c_str());
|
||||
|
||||
const size_t floats_per_vertex = t_buffer.vertices.vertex_size_floats();
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ static void add_config_substitutions(const ConfigSubstitutions& conf_substitutio
|
|||
static wxString substitution_message(const wxString& changes)
|
||||
{
|
||||
return
|
||||
_L("The configuration may be generated by a newer version of BambuStudio.") + " " +
|
||||
_L("The configuration may be generated by a newer version of OrcaSlicer.") + " " +
|
||||
_L("Some values have been replaced. Please check them:") + "\n" + changes + "\n";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ bool is_associate_files(std::wstring extend)
|
|||
wchar_t app_path[MAX_PATH];
|
||||
::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
|
||||
|
||||
std::wstring prog_id = L" Bambu.Studio.1";
|
||||
std::wstring prog_id = L" Orca.Slicer.1";
|
||||
std::wstring reg_base = L"Software\\Classes";
|
||||
std::wstring reg_extension = reg_base + L"\\." + extend;
|
||||
|
||||
|
|
@ -290,13 +290,13 @@ public:
|
|||
memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM);
|
||||
|
||||
// #if BBL_INTERNAL_TESTING
|
||||
auto sf_version = wxString::Format("SoftFever %s",std::string(SoftFever_VERSION)).ToStdString();
|
||||
wxSize text_rect = memDc.GetTextExtent(sf_version);
|
||||
int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth();
|
||||
auto bs_version = wxString::Format("Based on BambuStudio %s",std::string(SLIC3R_VERSION)).ToStdString();
|
||||
memDc.SetFont(Label::Body_12);
|
||||
wxSize text_rect = memDc.GetTextExtent(bs_version);
|
||||
int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth()/2;
|
||||
int start_y = version_rect.GetBottom() + 10;
|
||||
wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect));
|
||||
memDc.SetFont(m_constant_text.version_font);
|
||||
memDc.DrawLabel(sf_version, internal_sign_rect, wxALIGN_CENTER);
|
||||
memDc.DrawLabel(bs_version, internal_sign_rect, wxALIGN_RIGHT);
|
||||
// #endif
|
||||
|
||||
// load bitmap for logo
|
||||
|
|
@ -568,7 +568,7 @@ private:
|
|||
// #if BBL_INTERNAL_TESTING
|
||||
// version = _L("Internal Version") + " " + std::string(SLIC3R_VERSION);
|
||||
// #else
|
||||
version = _L("SoftFever Version") + " " + std::string(SoftFever_VERSION);
|
||||
// version = _L("") + " " + std::string(SoftFever_VERSION);
|
||||
// #endif
|
||||
|
||||
// credits infornation
|
||||
|
|
@ -951,7 +951,7 @@ static void generic_exception_handle()
|
|||
} catch (const std::bad_alloc& ex) {
|
||||
// bad_alloc in main thread is most likely fatal. Report immediately to the user (wxLogError would be delayed)
|
||||
// and terminate the app so it is at least certain to happen now.
|
||||
wxString errmsg = wxString::Format(_L("BambuStudio will terminate because of running out of memory."
|
||||
wxString errmsg = wxString::Format(_L("OrcaSlicer will terminate because of running out of memory."
|
||||
"It may be a bug. It will be appreciated if you report the issue to our team."));
|
||||
wxMessageBox(errmsg + "\n\n" + wxString(ex.what()), _L("Fatal error"), wxOK | wxICON_ERROR);
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("std::bad_alloc exception: %1%") % ex.what();
|
||||
|
|
@ -959,14 +959,14 @@ static void generic_exception_handle()
|
|||
std::terminate();
|
||||
//throw;
|
||||
} catch (const boost::io::bad_format_string& ex) {
|
||||
wxString errmsg = _L("BambuStudio will terminate because of a localization error. "
|
||||
wxString errmsg = _L("OrcaSlicer will terminate because of a localization error. "
|
||||
"It will be appreciated if you report the specific scenario this issue happened.");
|
||||
wxMessageBox(errmsg + "\n\n" + wxString(ex.what()), _L("Critical error"), wxOK | wxICON_ERROR);
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
|
||||
std::terminate();
|
||||
//throw;
|
||||
} catch (const std::exception& ex) {
|
||||
wxLogError(format_wxstr(_L("BambuStudio got an unhandled exception: %1%"), ex.what()));
|
||||
wxLogError(format_wxstr(_L("OrcaSlicer got an unhandled exception: %1%"), ex.what()));
|
||||
BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
|
||||
throw;
|
||||
}
|
||||
|
|
@ -1856,9 +1856,12 @@ static boost::optional<Semver> parse_semver_from_ini(std::string path)
|
|||
std::stringstream buffer;
|
||||
buffer << stream.rdbuf();
|
||||
std::string body = buffer.str();
|
||||
size_t start = body.find("BambuStudio ");
|
||||
if (start == std::string::npos)
|
||||
return boost::none;
|
||||
size_t start = body.find("OrcaSlicer ");
|
||||
if (start == std::string::npos) {
|
||||
start = body.find("BambuStudio ");
|
||||
if (start == std::string::npos)
|
||||
return boost::none;
|
||||
}
|
||||
body = body.substr(start + 12);
|
||||
size_t end = body.find_first_of(" \n");
|
||||
if (end < body.size())
|
||||
|
|
@ -1887,7 +1890,7 @@ void GUI_App::init_download_path()
|
|||
void GUI_App::init_app_config()
|
||||
{
|
||||
// Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release.
|
||||
SetAppName("OrcaSlicer");
|
||||
SetAppName(SLIC3R_APP_KEY);
|
||||
// SetAppName(SLIC3R_APP_KEY "-alpha");
|
||||
// SetAppName(SLIC3R_APP_KEY "-beta");
|
||||
// SetAppDisplayName(SLIC3R_APP_NAME);
|
||||
|
|
@ -1898,12 +1901,11 @@ void GUI_App::init_app_config()
|
|||
// Mac : "~/Library/Application Support/Slic3r"
|
||||
|
||||
if (data_dir().empty()) {
|
||||
boost::filesystem::path data_dir_path;
|
||||
#ifndef __linux__
|
||||
std::string data_dir = wxStandardPaths::Get().GetUserDataDir().ToUTF8().data();
|
||||
//BBS create folder if not exists
|
||||
boost::filesystem::path data_dir_path(data_dir);
|
||||
if (!boost::filesystem::exists(data_dir_path))
|
||||
boost::filesystem::create_directory(data_dir_path);
|
||||
data_dir_path = boost::filesystem::path(data_dir);
|
||||
set_data_dir(data_dir);
|
||||
#else
|
||||
// Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}.
|
||||
|
|
@ -1912,10 +1914,18 @@ void GUI_App::init_app_config()
|
|||
if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
|
||||
dir = wxFileName::GetHomeDir() + wxS("/.config");
|
||||
set_data_dir((dir + "/" + GetAppName()).ToUTF8().data());
|
||||
boost::filesystem::path data_dir_path(data_dir());
|
||||
if (!boost::filesystem::exists(data_dir_path))
|
||||
boost::filesystem::create_directory(data_dir_path);
|
||||
data_dir_path = boost::filesystem::path(data_dir());
|
||||
#endif
|
||||
if (!boost::filesystem::exists(data_dir_path)){
|
||||
auto older_data_dir = data_dir_path.parent_path() / "BambuStudio-SoftFever";
|
||||
if(boost::filesystem::exists(older_data_dir)){
|
||||
copy_directory_recursively(older_data_dir,data_dir_path);
|
||||
boost::filesystem::rename(data_dir_path / "BambuStudio.conf", data_dir_path / "OrcaSlicer.conf");
|
||||
boost::filesystem::rename(data_dir_path / "BambuStudio.conf.bak", data_dir_path / "OrcaSlicer.conf.bak");
|
||||
}
|
||||
else
|
||||
boost::filesystem::create_directory(data_dir_path);
|
||||
}
|
||||
} else {
|
||||
m_datadir_redefined = true;
|
||||
}
|
||||
|
|
@ -1932,7 +1942,7 @@ void GUI_App::init_app_config()
|
|||
if (!error.empty()) {
|
||||
// Error while parsing config file. We'll customize the error message and rethrow to be displayed.
|
||||
throw Slic3r::RuntimeError(
|
||||
_u8L("BambuStudio configuration file may be corrupted and is not abled to be parsed."
|
||||
_u8L("OrcaSlicer configuration file may be corrupted and is not abled to be parsed."
|
||||
"Please delete the file and try again.") +
|
||||
"\n\n" + app_config->config_path() + "\n\n" + error);
|
||||
}
|
||||
|
|
@ -2260,7 +2270,7 @@ bool GUI_App::on_init_inner()
|
|||
/* wxString tips = wxString::Format(_L("Click to download new version in default browser: %s"), version_info.version_str);
|
||||
DownloadDialog dialog(this->mainframe,
|
||||
tips,
|
||||
_L("New version of Bambu Studio"),
|
||||
_L("New version of Orca Slicer"),
|
||||
false,
|
||||
wxCENTER | wxICON_INFORMATION);
|
||||
|
||||
|
|
@ -2308,7 +2318,7 @@ bool GUI_App::on_init_inner()
|
|||
wxString tips = wxString::Format(_L("Click to download new version in default browser: %s"), version_str);
|
||||
DownloadDialog dialog(this->mainframe,
|
||||
tips,
|
||||
_L("The Bambu Studio needs an upgrade"),
|
||||
_L("The Orca Slicer needs an upgrade"),
|
||||
false,
|
||||
wxCENTER | wxICON_INFORMATION);
|
||||
dialog.SetExtendedMessage(description_text);
|
||||
|
|
@ -4132,19 +4142,10 @@ void GUI_App::no_new_version()
|
|||
std::string GUI_App::version_display = "";
|
||||
std::string GUI_App::format_display_version()
|
||||
{
|
||||
if (!version_display.empty()) return version_display;
|
||||
if (!version_display.empty())
|
||||
return version_display;
|
||||
|
||||
auto version_text = std::string(SLIC3R_VERSION);
|
||||
int len = version_text.length();
|
||||
for (int i = 0, j = 0; i < len; ++i) {
|
||||
if (!(version_text[i] == '0' && j == 0))
|
||||
version_display += version_text[i];
|
||||
|
||||
if (version_text[i] == '.')
|
||||
j = 0;
|
||||
else
|
||||
++j;
|
||||
}
|
||||
version_display = SoftFever_VERSION;
|
||||
return version_display;
|
||||
}
|
||||
|
||||
|
|
@ -4600,7 +4601,7 @@ bool GUI_App::load_language(wxString language, bool initial)
|
|||
// Get the active language from PrusaSlicer.ini, or empty string if the key does not exist.
|
||||
language = app_config->get("language");
|
||||
if (! language.empty())
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("language provided by PBambuStudio.conf: %1%") % language;
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("language provided by OrcaSlicer.conf: %1%") % language;
|
||||
else {
|
||||
// Get the system language.
|
||||
const wxLanguage lang_system = wxLanguage(wxLocale::GetSystemLanguage());
|
||||
|
|
@ -4668,7 +4669,7 @@ bool GUI_App::load_language(wxString language, bool initial)
|
|||
}
|
||||
|
||||
if (language_info != nullptr && language_info->LayoutDirection == wxLayout_RightToLeft) {
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("The following language code requires right to left layout, which is not supported by BambuStudio: %1%") % language_info->CanonicalName.ToUTF8().data();
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("The following language code requires right to left layout, which is not supported by OrcaSlicer: %1%") % language_info->CanonicalName.ToUTF8().data();
|
||||
language_info = nullptr;
|
||||
}
|
||||
|
||||
|
|
@ -4752,14 +4753,14 @@ bool GUI_App::load_language(wxString language, bool initial)
|
|||
|
||||
if (! wxLocale::IsAvailable(language_info->Language)) {
|
||||
// Loading the language dictionary failed.
|
||||
wxString message = "Switching Bambu Studio to language " + language_info->CanonicalName + " failed.";
|
||||
wxString message = "Switching Orca Slicer to language " + language_info->CanonicalName + " failed.";
|
||||
#if !defined(_WIN32) && !defined(__APPLE__)
|
||||
// likely some linux system
|
||||
message += "\nYou may need to reconfigure the missing locales, likely by running the \"locale-gen\" and \"dpkg-reconfigure locales\" commands.\n";
|
||||
#endif
|
||||
if (initial)
|
||||
message + "\n\nApplication will close.";
|
||||
wxMessageBox(message, "Bambu Studio - Switching language failed", wxOK | wxICON_ERROR);
|
||||
wxMessageBox(message, "Orca Slicer - Switching language failed", wxOK | wxICON_ERROR);
|
||||
if (initial)
|
||||
std::exit(EXIT_FAILURE);
|
||||
else
|
||||
|
|
@ -5375,7 +5376,7 @@ void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames)
|
|||
if (is_gcode_file(into_u8(filename)))
|
||||
++ num_gcodes;
|
||||
if (fileNames.size() == num_gcodes) {
|
||||
// Opening PrusaSlicer by drag & dropping a G-Code onto BambuStudio icon in Finder,
|
||||
// Opening PrusaSlicer by drag & dropping a G-Code onto OrcaSlicer icon in Finder,
|
||||
// just G-codes were passed. Switch to G-code viewer mode.
|
||||
m_app_mode = EAppMode::GCodeViewer;
|
||||
unlock_lockfile(get_instance_hash_string() + ".lock", data_dir() + "/cache/");
|
||||
|
|
@ -5969,7 +5970,7 @@ void GUI_App::associate_files(std::wstring extend)
|
|||
::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
|
||||
|
||||
std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
|
||||
std::wstring prog_id = L" Bambu.Studio.1";
|
||||
std::wstring prog_id = L" Orca.Slicer.1";
|
||||
std::wstring prog_desc = L"OrcaSlicer";
|
||||
std::wstring prog_command = prog_path + L" \"%1\"";
|
||||
std::wstring reg_base = L"Software\\Classes";
|
||||
|
|
@ -5992,7 +5993,7 @@ void GUI_App::disassociate_files(std::wstring extend)
|
|||
::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
|
||||
|
||||
std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
|
||||
std::wstring prog_id = L" Bambu.Studio.1";
|
||||
std::wstring prog_id = L" Orca.Slicer.1";
|
||||
std::wstring prog_desc = L"OrcaSlicer";
|
||||
std::wstring prog_command = prog_path + L" \"%1\"";
|
||||
std::wstring reg_base = L"Software\\Classes";
|
||||
|
|
|
|||
|
|
@ -65,10 +65,10 @@ int GUI_Run(GUI_InitParams ¶ms)
|
|||
}
|
||||
} catch (const Slic3r::Exception &ex) {
|
||||
BOOST_LOG_TRIVIAL(error) << ex.what() << std::endl;
|
||||
wxMessageBox(boost::nowide::widen(ex.what()), _L("Bambu Studio GUI initialization failed"), wxICON_STOP);
|
||||
wxMessageBox(boost::nowide::widen(ex.what()), _L("Orca Slicer GUI initialization failed"), wxICON_STOP);
|
||||
} catch (const std::exception &ex) {
|
||||
BOOST_LOG_TRIVIAL(error) << ex.what() << std::endl;
|
||||
wxMessageBox(format_wxstr(_L("Fatal error, exception catched: %1%"), ex.what()), _L("Bambu Studio GUI initialization failed"), wxICON_STOP);
|
||||
wxMessageBox(format_wxstr(_L("Fatal error, exception catched: %1%"), ex.what()), _L("Orca Slicer GUI initialization failed"), wxICON_STOP);
|
||||
}
|
||||
// error
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -236,10 +236,10 @@ namespace instance_check_internal
|
|||
dbus_uint32_t serial = 0;
|
||||
const char* sigval = message_text.c_str();
|
||||
//std::string interface_name = "com.prusa3d.prusaslicer.InstanceCheck";
|
||||
std::string interface_name = "com.bbl.bambuslicer.InstanceCheck.Object" + version;
|
||||
std::string interface_name = "com.softfever3d.orcaslicer.InstanceCheck.Object" + version;
|
||||
std::string method_name = "AnotherInstance";
|
||||
//std::string object_name = "/com/prusa3d/prusaslicer/InstanceCheck";
|
||||
std::string object_name = "/com/BambuLab/BambuStudio/InstanceCheck/Object" + version;
|
||||
std::string object_name = "/com/softfever3d/OrcaSlicer/InstanceCheck/Object" + version;
|
||||
|
||||
|
||||
// initialise the error value
|
||||
|
|
@ -538,7 +538,7 @@ namespace MessageHandlerDBusInternal
|
|||
" <arg name=\"data\" direction=\"out\" type=\"s\" />"
|
||||
" </method>"
|
||||
" </interface>"
|
||||
" <interface name=\"com.bbl.bambuslicer.InstanceCheck\">"
|
||||
" <interface name=\"com.softfever3d.orcaslicer.InstanceCheck\">"
|
||||
" <method name=\"AnotherInstance\">"
|
||||
" <arg name=\"data\" direction=\"in\" type=\"s\" />"
|
||||
" </method>"
|
||||
|
|
@ -550,7 +550,7 @@ namespace MessageHandlerDBusInternal
|
|||
dbus_connection_send(connection, reply, NULL);
|
||||
dbus_message_unref(reply);
|
||||
}
|
||||
//method AnotherInstance receives message from another BambuStudio instance
|
||||
//method AnotherInstance receives message from another OrcaSlicer instance
|
||||
static void handle_method_another_instance(DBusConnection *connection, DBusMessage *request)
|
||||
{
|
||||
DBusError err;
|
||||
|
|
@ -576,7 +576,7 @@ namespace MessageHandlerDBusInternal
|
|||
{
|
||||
const char* interface_name = dbus_message_get_interface(message);
|
||||
const char* member_name = dbus_message_get_member(message);
|
||||
std::string our_interface = "com.BambuLab.BambuStudio.InstanceCheck.Object" + wxGetApp().get_instance_hash_string();
|
||||
std::string our_interface = "com.softfever3d.OrcaSlicer.InstanceCheck.Object" + wxGetApp().get_instance_hash_string();
|
||||
BOOST_LOG_TRIVIAL(trace) << "DBus message received: interface: " << interface_name << ", member: " << member_name;
|
||||
if (0 == strcmp("org.freedesktop.DBus.Introspectable", interface_name) && 0 == strcmp("Introspect", member_name)) {
|
||||
respond_to_introspect(connection, message);
|
||||
|
|
@ -596,8 +596,8 @@ void OtherInstanceMessageHandler::listen()
|
|||
int name_req_val;
|
||||
DBusObjectPathVTable vtable;
|
||||
std::string instance_hash = wxGetApp().get_instance_hash_string();
|
||||
std::string interface_name = "com.BambuLab.BambuStudio.InstanceCheck.Object" + instance_hash;
|
||||
std::string object_name = "/com/BambuLab/BambuStudio/InstanceCheck/Object" + instance_hash;
|
||||
std::string interface_name = "com.softfever3d.OrcaSlicer.InstanceCheck.Object" + instance_hash;
|
||||
std::string object_name = "/com/softfever3d/OrcaSlicer/InstanceCheck/Object" + instance_hash;
|
||||
|
||||
//BOOST_LOG_TRIVIAL(debug) << "init dbus listen " << interface_name << " " << object_name;
|
||||
dbus_error_init(&err);
|
||||
|
|
@ -625,7 +625,7 @@ void OtherInstanceMessageHandler::listen()
|
|||
return;
|
||||
}
|
||||
if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != name_req_val) {
|
||||
BOOST_LOG_TRIVIAL(error) << "Not primary owner of DBus name - probably another BambuStudio instance is running.";
|
||||
BOOST_LOG_TRIVIAL(error) << "Not primary owner of DBus name - probably another OrcaSlicer instance is running.";
|
||||
BOOST_LOG_TRIVIAL(error) << "Dbus Messages listening terminating.";
|
||||
dbus_connection_unref(conn);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1499,7 +1499,7 @@ wxBoxSizer* MainFrame::create_side_tools()
|
|||
p->append_button(export_gcode_btn);
|
||||
}
|
||||
else {
|
||||
//Bambu Studio Buttons
|
||||
//Orca Slicer Buttons
|
||||
SideButton* print_plate_btn = new SideButton(p, _L("Print plate"), "");
|
||||
print_plate_btn->SetCornerRadius(0);
|
||||
|
||||
|
|
|
|||
|
|
@ -202,9 +202,9 @@ 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 "orca-slicer")
|
||||
// set_target_properties(OrcaSlicer PROPERTIES OUTPUT_NAME "orca-slicer")
|
||||
clientID = RegisterConnexionClient(
|
||||
0, "\013BambuStudio", kConnexionClientModeTakeOver, kConnexionMaskAxis);
|
||||
0, "\013OrcaSlicer", kConnexionClientModeTakeOver, kConnexionMaskAxis);
|
||||
BOOST_LOG_TRIVIAL(info) << "3dx mac handler registered";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1450,7 +1450,7 @@ void Sidebar::sync_ams_list()
|
|||
wxGetApp().app_config ->set("ams_filament_ids", p->ams_list_device, ams_filament_ids);
|
||||
if (unknowns > 0) {
|
||||
MessageDialog dlg(this,
|
||||
_L("There are some unknown filaments mapped to generic preset. Please update Bambu Studio or restart Bambu Studio to check if there is an update to system presets."),
|
||||
_L("There are some unknown filaments mapped to generic preset. Please update Orca Slicer or restart Orca Slicer to check if there is an update to system presets."),
|
||||
_L("Sync filaments with AMS"), wxOK);
|
||||
dlg.ShowModal();
|
||||
}
|
||||
|
|
@ -3125,7 +3125,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
|||
q->select_plate(0);
|
||||
if (load_type != LoadType::LoadGeometry) {
|
||||
if (en_3mf_file_type == En3mfType::From_BBS)
|
||||
show_info(q, _L("The 3mf is generated by old Bambu Studio, load geometry data only."), _L("Load 3mf"));
|
||||
show_info(q, _L("The 3mf is generated by old Orca Slicer, load geometry data only."), _L("Load 3mf"));
|
||||
else
|
||||
show_info(q, _L("The 3mf is not from Bambu Lab, load geometry data only."), _L("Load 3mf"));
|
||||
}
|
||||
|
|
@ -7466,7 +7466,7 @@ void Plater::priv::bring_instance_forward() const
|
|||
BOOST_LOG_TRIVIAL(debug) << "Couldnt bring instance forward - mainframe is null";
|
||||
return;
|
||||
}
|
||||
BOOST_LOG_TRIVIAL(debug) << "Bambu Studio window going forward";
|
||||
BOOST_LOG_TRIVIAL(debug) << "Orca Slicer window going forward";
|
||||
//this code maximize app window on Fedora
|
||||
{
|
||||
main_frame->Iconize(false);
|
||||
|
|
@ -11673,7 +11673,7 @@ void Plater::show_object_info()
|
|||
|
||||
#ifndef __WINDOWS__
|
||||
if (non_manifold_edges > 0) {
|
||||
info_manifold += into_u8("\n" + _L("Tips:") + "\n" +_L("\"Fix Model\" feature is currently only on Windows. Please repair the model on Bambu Studio(windows) or CAD softwares."));
|
||||
info_manifold += into_u8("\n" + _L("Tips:") + "\n" +_L("\"Fix Model\" feature is currently only on Windows. Please repair the model on Orca Slicer(windows) or CAD softwares."));
|
||||
}
|
||||
#endif //APPLE & LINUX
|
||||
|
||||
|
|
|
|||
|
|
@ -826,15 +826,15 @@ wxWindow* PreferencesDialog::create_general_page()
|
|||
auto item_user_sync = create_item_checkbox(_L("Auto sync user presets(Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset");
|
||||
|
||||
#ifdef _WIN32
|
||||
auto title_associate_file = create_item_title(_L("Associate files to BambuStudio"), page, _L("Associate files to BambuStudio"));
|
||||
auto title_associate_file = create_item_title(_L("Associate files to OrcaSlicer"), page, _L("Associate files to OrcaSlicer"));
|
||||
|
||||
// associate file
|
||||
auto item_associate_3mf = create_item_checkbox(_L("Associate .3mf files to BambuStudio"), page,
|
||||
_L("If enabled, sets BambuStudio as default application to open .3mf files"), 50, "associate_3mf");
|
||||
auto item_associate_stl = create_item_checkbox(_L("Associate .stl files to BambuStudio"), page,
|
||||
_L("If enabled, sets BambuStudio as default application to open .stl files"), 50, "associate_stl");
|
||||
auto item_associate_step = create_item_checkbox(_L("Associate .step/.stp files to BambuStudio"), page,
|
||||
_L("If enabled, sets BambuStudio as default application to open .step files"), 50, "associate_step");
|
||||
auto item_associate_3mf = create_item_checkbox(_L("Associate .3mf files to OrcaSlicer"), page,
|
||||
_L("If enabled, sets OrcaSlicer as default application to open .3mf files"), 50, "associate_3mf");
|
||||
auto item_associate_stl = create_item_checkbox(_L("Associate .stl files to OrcaSlicer"), page,
|
||||
_L("If enabled, sets OrcaSlicer as default application to open .stl files"), 50, "associate_stl");
|
||||
auto item_associate_step = create_item_checkbox(_L("Associate .step/.stp files to OrcaSlicer"), page,
|
||||
_L("If enabled, sets OrcaSlicer as default application to open .step files"), 50, "associate_step");
|
||||
#endif // _WIN32
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
|
|||
m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30));
|
||||
|
||||
|
||||
operation_tips = new ::Label(this, _L("Click OK to update the Network plug-in when Bambu Studio launches next time."));
|
||||
operation_tips = new ::Label(this, _L("Click OK to update the Network plug-in when Orca Slicer launches next time."));
|
||||
operation_tips->SetFont(::Label::Body_12);
|
||||
operation_tips->SetMinSize(wxSize(FromDIP(260), -1));
|
||||
operation_tips->SetMaxSize(wxSize(FromDIP(260), -1));
|
||||
|
|
@ -255,7 +255,7 @@ void UpdatePluginDialog::update_info(std::string json_path)
|
|||
}
|
||||
|
||||
UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
|
||||
: DPIDialog(parent, wxID_ANY, _L("New version of Bambu Studio"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER)
|
||||
: DPIDialog(parent, wxID_ANY, _L("New version of Orca Slicer"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER)
|
||||
{
|
||||
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str();
|
||||
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
|
||||
|
|
@ -974,7 +974,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent)
|
|||
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1));
|
||||
m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
|
||||
|
||||
comfirm_before_enter_text = _L("Step 1, please confirm Bambu Studio and your printer are in the same LAN.");
|
||||
comfirm_before_enter_text = _L("Step 1, please confirm Orca Slicer and your printer are in the same LAN.");
|
||||
comfirm_after_enter_text = _L("Step 2, if the IP and Access Code below are different from the actual values on your printer, please correct them.");
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ static bool should_dialog_be_shown()
|
|||
|
||||
|
||||
|
||||
// Following function saves current BambuStudio version into app config.
|
||||
// Following function saves current OrcaSlicer version into app config.
|
||||
// It will be later used to decide whether to open the dialog or not.
|
||||
static void save_version()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1064,7 +1064,7 @@ void SendToPrinterDialog::show_status(PrintDialogStatus status, std::vector<wxSt
|
|||
Enable_Refresh_Button(true);
|
||||
}
|
||||
else if (status == PrintDialogStatus::PrintStatusNotOnTheSameLAN) {
|
||||
wxString msg_text = _L("The printer is required to be in the same LAN as Bambu Studio.");
|
||||
wxString msg_text = _L("The printer is required to be in the same LAN as Orca Slicer.");
|
||||
update_print_status_msg(msg_text, true, true);
|
||||
Enable_Send_Button(false);
|
||||
Enable_Refresh_Button(true);
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ SysInfoDialog::SysInfoDialog()
|
|||
#ifdef WIN32
|
||||
std::wstring blacklisted_libraries = BlacklistedLibraryCheck::get_instance().get_blacklisted_string().c_str();
|
||||
if (! blacklisted_libraries.empty())
|
||||
blacklisted_libraries_message = wxString("<br><b>") + _L("Blacklisted libraries loaded into BambuStudio process:") + "</b><br>" + blacklisted_libraries;
|
||||
blacklisted_libraries_message = wxString("<br><b>") + _L("Blacklisted libraries loaded into OrcaSlicer process:") + "</b><br>" + blacklisted_libraries;
|
||||
#endif // WIN32
|
||||
const auto text = GUI::format_wxstr(
|
||||
"<html>"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ using namespace nlohmann;
|
|||
|
||||
namespace Slic3r { namespace GUI {
|
||||
|
||||
DownPluginFrame::DownPluginFrame(GUI_App *pGUI) : wxDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "Bambu Studio"), m_appconfig_new()
|
||||
DownPluginFrame::DownPluginFrame(GUI_App *pGUI) : wxDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "Orca Slicer"), m_appconfig_new()
|
||||
{
|
||||
// INI
|
||||
m_MainPtr = pGUI;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ GuideFrame::GuideFrame(GUI_App *pGUI, long style)
|
|||
SetBackgroundColour(*wxWHITE);
|
||||
// INI
|
||||
m_SectionName = "firstguide";
|
||||
PrivacyUse = true;
|
||||
PrivacyUse = false;
|
||||
InstallNetplugin = false;
|
||||
|
||||
m_MainPtr = pGUI;
|
||||
|
|
@ -524,11 +524,12 @@ bool GuideFrame::IsFirstUse()
|
|||
|
||||
int GuideFrame::SaveProfile()
|
||||
{
|
||||
// SoftFever: don't collect info
|
||||
//privacy
|
||||
if (PrivacyUse == true) {
|
||||
m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "1");
|
||||
} else
|
||||
m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "0");
|
||||
// if (PrivacyUse == true) {
|
||||
// m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "1");
|
||||
// } else
|
||||
// m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "0");
|
||||
|
||||
m_MainPtr->app_config->set("region", m_Region);
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ void wxMediaCtrl2::Load(wxURI url)
|
|||
|
||||
if (!hasplugins) {
|
||||
Slic3r::GUI::wxGetApp().CallAfter([] {
|
||||
wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Bambu Studio?)"), _L("Error"), wxOK);
|
||||
wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Orca Slicer?)"), _L("Error"), wxOK);
|
||||
});
|
||||
m_error = 101;
|
||||
wxMediaEvent event(wxEVT_MEDIA_STATECHANGED);
|
||||
|
|
|
|||
|
|
@ -71,39 +71,6 @@ void copy_file_fix(const fs::path &source, const fs::path &target)
|
|||
fs::permissions(target, perms);
|
||||
}
|
||||
|
||||
//BBS: add directory copy
|
||||
void copy_directory_fix(const fs::path &source, const fs::path &target)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(debug) << format("PresetUpdater: Copying %1% -> %2%", source, target);
|
||||
std::string error_message;
|
||||
|
||||
if (fs::exists(target))
|
||||
fs::remove_all(target);
|
||||
fs::create_directories(target);
|
||||
for (auto &dir_entry : boost::filesystem::directory_iterator(source))
|
||||
{
|
||||
std::string source_file = dir_entry.path().string();
|
||||
std::string name = dir_entry.path().filename().string();
|
||||
std::string target_file = target.string() + "/" + name;
|
||||
|
||||
if (boost::filesystem::is_directory(dir_entry)) {
|
||||
const auto target_path = target / name;
|
||||
copy_directory_fix(dir_entry, target_path);
|
||||
}
|
||||
else {
|
||||
//CopyFileResult cfr = Slic3r::GUI::copy_file_gui(source_file, target_file, error_message, false);
|
||||
CopyFileResult cfr = copy_file(source_file, target_file, error_message, false);
|
||||
if (cfr != CopyFileResult::SUCCESS) {
|
||||
BOOST_LOG_TRIVIAL(error) << "Copying failed(" << cfr << "): " << error_message;
|
||||
throw Slic3r::CriticalException(GUI::format(
|
||||
_L("Copying directory %1% to %2% failed: %3%"),
|
||||
source, target, error_message));
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
struct Update
|
||||
{
|
||||
fs::path source;
|
||||
|
|
@ -137,7 +104,7 @@ struct Update
|
|||
void install() const
|
||||
{
|
||||
if (is_directory) {
|
||||
copy_directory_fix(source, target);
|
||||
copy_directory_recursively(source, target);
|
||||
}
|
||||
else {
|
||||
copy_file_fix(source, target);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include <boost/filesystem.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
// For starting another BambuStudio instance on OSX.
|
||||
// For starting another OrcaSlicer instance on OSX.
|
||||
// Fails to compile on Windows on the build server.
|
||||
#ifdef __APPLE__
|
||||
#include <boost/process/spawn.hpp>
|
||||
|
|
@ -51,7 +51,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
|
|||
args.emplace_back(L"--single-instance");
|
||||
args.emplace_back(nullptr);
|
||||
BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << into_u8(path) << "\"";
|
||||
// Don't call with wxEXEC_HIDE_CONSOLE, BambuStudio in GUI mode would just show the splash screen. It would not open the main window though, it would
|
||||
// Don't call with wxEXEC_HIDE_CONSOLE, OrcaSlicer in GUI mode would just show the splash screen. It would not open the main window though, it would
|
||||
// just hang in the background.
|
||||
if (wxExecute(const_cast<wchar_t**>(args.data()), wxEXEC_ASYNC) <= 0)
|
||||
BOOST_LOG_TRIVIAL(error) << "Failed to spawn a new slicer \"" << into_u8(path);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue