diff --git a/resources/images/BambuStudio.ico b/resources/images/BambuStudio.ico deleted file mode 100644 index c6d127efd..000000000 Binary files a/resources/images/BambuStudio.ico and /dev/null differ diff --git a/resources/images/OrcaSlicer.ico b/resources/images/OrcaSlicer.ico new file mode 100644 index 000000000..67c77feda Binary files /dev/null and b/resources/images/OrcaSlicer.ico differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 84952256d..6cc91dcba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -103,8 +103,8 @@ endif() # Create a slic3r executable # Process mainfests for various platforms. set(MACOSX_BUNDLE_COPYRIGHT "Copyright(C) 2022-2023 Li Jiang All Rights Reserved") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/BambuStudio.rc.in ${CMAKE_CURRENT_BINARY_DIR}/BambuStudio.rc @ONLY) -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/msw/BambuStudio.rc.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/BambuStudio.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.manifest @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY) if (WIN32) add_library(OrcaSlicer SHARED BambuStudio.cpp BambuStudio.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h) @@ -166,7 +166,7 @@ if (WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode") endif() - add_executable(OrcaSlicer_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}/OrcaSlicer.rc) # Generate debug symbols even in release mode. if(MSVC) target_link_options(OrcaSlicer_app_gui PUBLIC "$<$:/DEBUG>") diff --git a/src/platform/msw/BambuStudio.rc.in b/src/platform/msw/BambuStudio.rc.in index 1aa5e18f8..5165fc292 100644 --- a/src/platform/msw/BambuStudio.rc.in +++ b/src/platform/msw/BambuStudio.rc.in @@ -21,5 +21,5 @@ PRODUCTVERSION @SLIC3R_VERSION@ VALUE "Translation", 0x409, 1252 } } -2 ICON "@SLIC3R_RESOURCES_DIR@/images/BambuStudio.ico" +2 ICON "@SLIC3R_RESOURCES_DIR@/images/OrcaSlicer.ico" 1 24 "BambuStudio.manifest" diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index 8928f87d7..301ae9912 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -3286,7 +3286,7 @@ ObjectTableDialog::ObjectTableDialog(wxWindow* parent, Plater* platerObj, Model auto m_main_sizer = new wxBoxSizer(wxVERTICAL); // icon - std::string icon_path = (boost::format("%1%/images/BambuStudio.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicer.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); //top line