amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Change Application name to OrcaSlicer

Browse source
This commit is contained in:
SoftFever 2023-03-12 10:02:38 +08:00
parent 81ca7720e9
commit 5b0ba1207e
93 changed files with 5629 additions and 10221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/build_linux.yml vendored
View file

@ -4,6 +4,9 @@ on:
push:
branches:
- SoftFever
pull_request:
branches:
- SoftFever
jobs:
appimage-builder:
@ -16,24 +19,24 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 automake -y
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
- name: Install dependencies from BuildLinux.sh
shell: bash
run: sudo ./BuildLinux.sh -ur
- name: Fix permissions
shell: bash
run: sudo chown $USER -R ./
- name: build deps
- name: Build deps
id: cache_deps
uses: actions/cache@v3
env:
cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
with:
path: ${{ github.workspace }}/deps/build/destdir
key: build-${{ env.cache-name }}
- if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
name: build deps
name: Build deps
working-directory: ${{ github.workspace }}
continue-on-error: true
run: ./BuildLinux.sh -dr
@ -44,4 +47,4 @@ jobs:
- uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_Linux
path: './build/BambuStudio_ubu64.AppImage'
path: './build/OrcaSlicer_ubu64.AppImage'

23
.github/workflows/build_mac_arm64.yml vendored
View file

@ -4,6 +4,9 @@ on:
push:
branches:
- SoftFever
pull_request:
branches:
- SoftFever
jobs:
build_win64:
@ -16,14 +19,14 @@ jobs:
- name: Install tools
run: |
brew install cmake git gettext zstd
- run: mkdir -p ${{ github.workspace }}/deps/build
# - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
- run: mkdir -p ${{ github.workspace }}/deps/build_arm64
- run: mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_x86_64
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_arm64
# with:
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
# key: build-${{ env.cache-name }}
@ -36,11 +39,11 @@ jobs:
- name: Download and extract deps
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
rm BambuStudio_dep_arm64_21-01-2023.tar.gz
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
tar -zxvf OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
ls -l ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
rm OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
- name: Build studio
@ -50,5 +53,5 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_Mac
path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip
name: OrcaSlicer_Mac_AppleSilicon
path: ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer*.zip

23
.github/workflows/build_mac_x64.yml vendored
View file

@ -4,6 +4,9 @@ on:
push:
branches:
- SoftFever
pull_request:
branches:
- SoftFever
jobs:
build_win64:
@ -16,14 +19,14 @@ jobs:
- name: Install tools
run: |
brew install cmake git gettext
- run: mkdir -p ${{ github.workspace }}/deps/build
- run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
- run: mkdir -p ${{ github.workspace }}/deps/build_x86_64
- run: mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
# with:
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
# key: build-${{ env.cache-name }}
@ -37,11 +40,11 @@ jobs:
- name: Download and extract deps
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_x86_64_21-01-2023.tar.gz
tar -zxvf BambuStudio_dep_x86_64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
rm BambuStudio_dep_x86_64_21-01-2023.tar.gz
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
tar -zxvf OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
ls -l ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
rm OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
- name: Build studio
@ -51,5 +54,5 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_Mac
path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip
name: OrcaSlicer_Mac_Intel
path: ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer*.zip

44
.github/workflows/build_ubuntu.yml vendored
View file

@ -1,44 +0,0 @@
name: Build Linux
on: [pull_request]
jobs:
appimage-builder:
name: Linux AppImage Build
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
- name: Install dependencies from BuildLinux.sh
shell: bash
run: sudo ./BuildLinux.sh -ur
- name: Fix permissions
shell: bash
run: sudo chown $USER -R ./
- name: Build deps
id: cache_deps
uses: actions/cache@v3
env:
cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
with:
path: ${{ github.workspace }}/deps/build/destdir
key: build-${{ env.cache-name }}
- if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
name: Build deps
working-directory: ${{ github.workspace }}
continue-on-error: true
run: ./BuildLinux.sh -dsr
- name: Build Studio
shell: bash
run: ./BuildLinux.sh -ir
- uses: actions/upload-artifact@v3
with:
name: BambuStudio_Linux
path: './build/BambuStudio_ubu64.AppImage'

10
.github/workflows/build_win.yml vendored
View file

@ -4,7 +4,9 @@ on:
push:
branches:
- SoftFever
pull_request:
branches:
- SoftFever
jobs:
build_win64:
@ -21,11 +23,11 @@ jobs:
- run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
- name: download deps
shell: powershell
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/3/BambuStudio_dep_9Mar2023.zip", "$env:temp\BambuStudio_dep_9Mar2023.zip")'
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_12Mar2023.zip", "$env:temp\OrcaSlicer_dep_12Mar2023.zip")'
- name: extract deps
working-directory: ${{ github.workspace }}/deps/build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_9Mar2023.zip'
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_12Mar2023.zip'
- run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep"
@ -33,7 +35,7 @@ jobs:
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps
# with:
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
# key: ${{ runner.os }}-build-${{ env.cache-name }}

2
Build.PL
View file

@ -124,7 +124,7 @@ EOF
}
print "\n";
print "In the next step, you need to build the BambuStudio C++ library.\n";
print "In the next step, you need to build the OrcaSlicer C++ library.\n";
print "1) Create a build directory and change to it\n";
print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
print "3) run make\n";

8
BuildLinux.sh
View file

@ -15,13 +15,13 @@ function check_available_memory_and_disk() {
MIN_DISK_KB=$((10 * 1024 * 1024))
if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
echo && free -h && echo
exit 2
fi
if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then
echo -e "\nERROR: Bambu Studio Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
echo -e "\nERROR: Orca Slicer Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
echo && df -h . && echo
exit 1
fi
@ -192,7 +192,7 @@ then
make -j$NCORES
echo "done"
# rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
# rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
# echo "[5/9] Renaming wxscintilla library..."
# pushd destdir/usr/local/lib
# if [[ -z "$FOUND_GTK3_DEV" ]]
@ -234,7 +234,7 @@ then
# make Slic3r
echo "[8/9] Building Slic3r..."
make -j$NCORES BambuStudio # Slic3r
make -j$NCORES OrcaSlicer # Slic3r
# make .mo
# make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?

40
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.13)
project(BambuStudio)
project(OrcaSlicer)
include("version.inc")
include(GNUInstallDirs)
@ -23,11 +23,11 @@ else()
endif()
endif()
option(SLIC3R_STATIC "Compile BambuStudio with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
option(SLIC3R_GUI "Compile BambuStudio with GUI components (OpenGL, wxWidgets)" 1)
option(SLIC3R_FHS "Assume BambuStudio is to be installed in a FHS directory structure" 0)
option(SLIC3R_STATIC "Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
option(SLIC3R_GUI "Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1)
option(SLIC3R_FHS "Assume OrcaSlicer is to be installed in a FHS directory structure" 0)
option(SLIC3R_WX_STABLE "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
option(SLIC3R_PROFILE "Compile BambuStudio with an invasive Shiny profiler" 0)
option(SLIC3R_PROFILE "Compile OrcaSlicer with an invasive Shiny profiler" 0)
option(SLIC3R_PCH "Use precompiled headers" 1)
option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1)
@ -117,7 +117,7 @@ if (MINGW)
endif ()
if (NOT MSVC)
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for BambuStudio on all platforms.
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for OrcaSlicer on all platforms.
add_compile_options(-fsigned-char)
endif ()
@ -297,7 +297,7 @@ if(WIN32)
if(MSVC)
# BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 )
# Force the source code encoding to UTF-8. See BambuStudio GH pull request #5583
# Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
endif(MSVC)
@ -309,7 +309,7 @@ add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV)
if (SLIC3R_PROFILE)
message("BambuStudio will be built with a Shiny invasive profiler")
message("OrcaSlicer will be built with a Shiny invasive profiler")
add_definitions(-DSLIC3R_PROFILE)
endif ()
@ -507,7 +507,7 @@ set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bbl/i18n")
add_custom_target(gettext_make_pot
COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
-f "${BBL_L18N_DIR}/list.txt"
-o "${BBL_L18N_DIR}/BambuStudio.pot"
-o "${BBL_L18N_DIR}/OrcaSlicer.pot"
COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate pot file from strings in the source tree"
@ -516,13 +516,13 @@ add_custom_target(gettext_merge_po_with_pot
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Merge localization po with new generted pot file"
)
file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/BambuStudio*.po")
file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po")
foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
SET(po_new_file "${po_dir}/BambuStudio_.po")
SET(po_new_file "${po_dir}/OrcaSlicer_.po")
add_custom_command(
TARGET gettext_merge_po_with_pot PRE_BUILD
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/BambuStudio.pot"
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot"
DEPENDS ${po_file}
)
endforeach()
@ -530,11 +530,11 @@ add_custom_target(gettext_po_to_mo
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate localization po files (binary) from mo files (texts)"
)
file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/BambuStudio*.po")
file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po")
foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(SECOND_FOLDER_ABSOLUTE ${po_file} DIRECTORY)
string(REGEX REPLACE ".*/(.*)" "\\1" po_dir "${SECOND_FOLDER_ABSOLUTE}" )
SET(mo_file "${L10N_DIR}/${po_dir}/BambuStudio.mo")
SET(mo_file "${L10N_DIR}/${po_dir}/OrcaSlicer.mo")
add_custom_command(
TARGET gettext_po_to_mo PRE_BUILD
COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
@ -563,7 +563,7 @@ endif ()
set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
function(bambustudio_copy_dlls target config postfix output_dlls)
function(orcaslicer_copy_dlls target config postfix output_dlls)
if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(_bits 64)
elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
@ -658,9 +658,9 @@ function(bambustudio_copy_dlls target config postfix output_dlls)
endfunction()
# libslic3r, BambuStudio GUI and the BambuStudio executable.
# libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
add_subdirectory(src)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT BambuStudio_app_gui)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OrcaSlicer_app_gui)
add_dependencies(gettext_make_pot hintsToPot)
@ -695,11 +695,11 @@ if (WIN32)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
elseif (SLIC3R_FHS)
# CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/BambuStudio")
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer")
install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
PATTERN "*/udev" EXCLUDE
)
install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
foreach(SIZE 32 128 192)
install(FILES ${SLIC3R_RESOURCES_DIR}/images/BambuStudio_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png
@ -708,7 +708,7 @@ elseif (SLIC3R_FHS)
elseif (CMAKE_MACOSX_BUNDLE)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources")
else ()
install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif ()

2
Containerfile
View file

@ -16,7 +16,7 @@
# 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
#
#
# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.
# TODO: bind mount OrcaSlicer to inside the container instead of COPY to enable faster rebuilds during dev work.
FROM docker.io/ubuntu:20.04
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"

4
Dockerfile
View file

@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \
ENV LC_ALL=en_US.utf8
RUN locale-gen $LC_ALL
# Set this so that Bambu Studio doesn't complain about
# Set this so that Orca Slicer doesn't complain about
# the CA cert path on every startup
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
@ -74,7 +74,7 @@ RUN ./BuildLinux.sh -s
ENV container podman
RUN ./BuildLinux.sh -i
# It's easier to run Bambu Studio as the same username,
# It's easier to run Orca Slicer as the same username,
# UID and GID as your workstation. Since we bind mount
# your home directory into the container, it's handy
# to keep permissions the same. Just in case, defaults

0
BambuStudio.mo → OrcaSlicer.mo
View file

20
README.md
View file

@ -1,11 +1,11 @@
# Bambu Studio - SoftFever
A modified version of Bambu Studio with many handy features.
# Orca Slicer - SoftFever
A modified version of Orca Slicer with many handy features.
It's fully compatible with Bambulab X1/X1-C/P1P printers.
It also supports Anycubic, Anker, Creality, Prusa MK3S, RatRig and Voron printers.
You can download it here: https://github.com/SoftFever/OrcaSlicer/releases
## BambuStudio SoftFever change notes:
## OrcaSlicer SoftFever change notes:
### [V1.4.2 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.4.2):
- Change the color theme :)
@ -147,7 +147,7 @@ Demo video: https://youtu.be/vSNE9iGj2II
- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
- [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
## 3. BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer.
## 3. OrcaSlicer use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer.
- For Voron and any Klipper based printers:
You can enable gcode_arcs(G2/G3) support by adding following section into you printer.cfg file:
```
@ -193,7 +193,7 @@ gcode:
~~ It's also recommended to add followinging dummy macros to make Klipper happy ~~
Update: latest Klipper has supported G17 command. Don't add following macro if you are running on latest Klipper.
```
# Make BambuStudio happy
# Make OrcaSlicer happy
[gcode_macro G17]
gcode:
@ -225,17 +225,17 @@ Image credits:
![image](https://user-images.githubusercontent.com/106916061/179006347-497d24c0-9bd6-45b7-8c49-d5cc8ecfe5d7.png)
# BambuStudio
Bambu Studio is a cutting-edge, feature-rich slicing software.
Orca Slicer is a cutting-edge, feature-rich slicing software.
It contains project-based workflows, systematically optimized slicing algorithms, and an easy-to-use graphic interface, bringing users an incredibly smooth printing experience.
Prebuilt Windows, macOS 64-bit releases are available through the [github releases page](https://github.com/bambulab/BambuStudio/releases/).
Linux version currently is not supported.
Bambu Studio is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
Orca Slicer is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
See the [wiki](https://github.com/bambulab/BambuStudio/wiki) and the [documentation directory](https://github.com/bambulab/BambuStudio/tree/master/doc) for more informations.
# What are Bambu Studio's main features?
# What are Orca Slicer's main features?
Key features are:
- Basic slicing features & GCode viewer
- Multiple plates management
@ -264,7 +264,7 @@ Following platforms are currently supported to compile:
You can add an issue to the [github tracker](https://github.com/bambulab/BambuStudio/issues) if **it isn't already present.**
# License
Bambu Studio is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on PrusaSlicer by PrusaResearch.
PrusaSlicer is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
@ -272,5 +272,5 @@ Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3
The GNU Affero General Public License, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
The bambu networking plugin is based on non-free libraries. It is optional to the Bambu Studio and provides extended functionalities for users.
The bambu networking plugin is based on non-free libraries. It is optional to the Orca Slicer and provides extended functionalities for users.

7793
bbl/i18n/BambuStudio-Softfever.pot
View file

File diff suppressed because it is too large Load diff

496
bbl/i18n/BambuStudio.pot → bbl/i18n/OrcaSlicer.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-05 17:03+0800\n"
"POT-Creation-Date: 2023-03-12 09:40+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -367,6 +367,12 @@ msgstr ""
msgid "Remove selection"
msgstr ""
msgid "Shift + Mouse move up or dowm"
msgstr ""
msgid "Rotate text"
msgstr ""
msgid "Text shape"
msgstr ""
@ -379,7 +385,24 @@ msgstr ""
msgid "Input text"
msgstr ""
msgid "Add"
msgid "Embeded"
msgstr ""
msgid "Text Gap"
msgstr ""
msgid "Angle"
msgstr ""
msgid ""
"Embeded\n"
"depth"
msgstr ""
msgid "Surface"
msgstr ""
msgid "Horizontal text"
msgstr ""
msgid "Notice"
@ -395,7 +418,7 @@ msgstr ""
msgid "%1% was replaced with %2%"
msgstr ""
msgid "The configuration may be generated by a newer version of BambuStudio."
msgid "The configuration may be generated by a newer version of OrcaSlicer."
msgstr ""
msgid "Some values have been replaced. Please check them:"
@ -421,11 +444,8 @@ msgstr ""
msgid "V"
msgstr ""
msgid "SoftFever Version"
msgstr ""
msgid ""
"BambuStudio will terminate because of running out of memory.It may be a bug. "
"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."
msgstr ""
@ -433,7 +453,7 @@ msgid "Fatal error"
msgstr ""
msgid ""
"BambuStudio will terminate because of a localization error. It will be "
"OrcaSlicer will terminate because of a localization error. It will be "
"appreciated if you report the specific scenario this issue happened."
msgstr ""
@ -441,7 +461,7 @@ msgid "Critical error"
msgstr ""
#, possible-boost-format
msgid "BambuStudio got an unhandled exception: %1%"
msgid "OrcaSlicer got an unhandled exception: %1%"
msgstr ""
msgid "Downloading Bambu Network Plug-in"
@ -455,8 +475,8 @@ msgid "Connect %s failed! [SN:%s, code=%s]"
msgstr ""
msgid ""
"BambuStudio configuration file may be corrupted and is not abled to be "
"parsed.Please delete the file and try again."
"OrcaSlicer configuration file may be corrupted and is not abled to be parsed."
"Please delete the file and try again."
msgstr ""
#, possible-c-format, possible-boost-format
@ -475,7 +495,7 @@ msgstr ""
msgid "Click to download new version in default browser: %s"
msgstr ""
msgid "The Bambu Studio needs an upgrade"
msgid "The Orca Slicer needs an upgrade"
msgstr ""
msgid "This is the newest version."
@ -484,9 +504,6 @@ msgstr ""
msgid "Info"
msgstr ""
msgid "Loading user presets..."
msgstr ""
msgid "Rebuild"
msgstr ""
@ -530,6 +547,9 @@ msgstr ""
msgid "Login information expired. Please login again."
msgstr ""
msgid "Privacy Policy Update"
msgstr ""
msgid "Loading"
msgstr ""
@ -560,7 +580,25 @@ msgstr ""
msgid "Select a G-code file:"
msgstr ""
msgid "Bambu Studio GUI initialization failed"
msgid "Import File"
msgstr ""
msgid "Delete"
msgstr ""
msgid "Choose files"
msgstr ""
msgid "New Folder"
msgstr ""
msgid "Open"
msgstr ""
msgid "Rename"
msgstr ""
msgid "Orca Slicer GUI initialization failed"
msgstr ""
#, possible-boost-format
@ -639,12 +677,18 @@ msgstr ""
msgid "Select settings"
msgstr ""
msgid "Delete"
msgid "Hide"
msgstr ""
msgid "Show"
msgstr ""
msgid "Delete the selected object"
msgstr ""
msgid "Edit Text"
msgstr ""
msgid "Load..."
msgstr ""
@ -672,9 +716,6 @@ msgstr ""
msgid "Printable"
msgstr ""
msgid "Rename"
msgstr ""
msgid "Fix model"
msgstr ""
@ -727,6 +768,9 @@ msgstr ""
msgid "Flush into objects' support"
msgstr ""
msgid "Edit in Parameter Table"
msgstr ""
msgid "Convert from inch"
msgstr ""
@ -850,9 +894,6 @@ msgstr ""
msgid "Edit Process Settings"
msgstr ""
msgid "Edit in Parameter Table"
msgstr ""
msgid "Edit print parameters for a single object"
msgstr ""
@ -1105,9 +1146,6 @@ msgstr ""
msgid "Please enter the layer number"
msgstr ""
msgid "Jump to Layer"
msgstr ""
msgid "Add Pause"
msgstr ""
@ -1117,6 +1155,9 @@ msgstr ""
msgid "Add Custom Template"
msgstr ""
msgid "Jump to Layer"
msgstr ""
msgid "Filament "
msgstr ""
@ -1129,19 +1170,7 @@ msgstr ""
msgid "No printer"
msgstr ""
msgid "Heat the nozzle"
msgstr ""
msgid "Cut filament"
msgstr ""
msgid "Pull back current filament"
msgstr ""
msgid "Push new filament into extruder"
msgstr ""
msgid "Purge old filament"
msgid "..."
msgstr ""
msgid "?"
@ -1192,6 +1221,27 @@ msgstr ""
msgid "Cancel calibration"
msgstr ""
msgid "Heat the nozzle"
msgstr ""
msgid "Cut filament"
msgstr ""
msgid "Pull back current filament"
msgstr ""
msgid "Push new filament into extruder"
msgstr ""
msgid "Purge old filament"
msgstr ""
msgid "Feed new filament from external spool"
msgstr ""
msgid "Confirm whether the filament has been extruded"
msgstr ""
msgid ""
"Choose an AMS slot then press \"Load\" or \"Unload\" button to automatically "
"load or unload filiament."
@ -1343,6 +1393,9 @@ msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
msgid "No space left on Printer SD card"
msgstr ""
msgid "Sending gcode file over LAN"
msgstr ""
@ -1365,6 +1418,58 @@ msgstr ""
msgid "Failed uploading print file. Please enter ip address again."
msgstr ""
msgid "Choose SLA archive:"
msgstr ""
msgid "Import file"
msgstr ""
msgid "Import model and profile"
msgstr ""
msgid "Import profile only"
msgstr ""
msgid "Import model only"
msgstr ""
msgid "Accurate"
msgstr ""
msgid "Balanced"
msgstr ""
msgid "Quick"
msgstr ""
msgid "Importing SLA archive"
msgstr ""
msgid ""
"The SLA archive doesn't contain any presets. Please activate some SLA "
"printer preset first before importing that SLA archive."
msgstr ""
msgid "Importing canceled."
msgstr ""
msgid "Importing done."
msgstr ""
msgid ""
"The imported SLA archive did not contain any presets. The current SLA "
"presets were used as fallback."
msgstr ""
msgid "You cannot load SLA project with a multi-part object on the bed"
msgstr ""
msgid "Please check your object list before preset changing."
msgstr ""
msgid "Attention!"
msgstr ""
msgid "Downloading"
msgstr ""
@ -1392,15 +1497,16 @@ msgstr ""
msgid "License"
msgstr ""
msgid "Bambu Studio is licensed under "
msgid "Orca Slicer is licensed under "
msgstr ""
msgid "GNU Affero General Public License, version 3"
msgstr ""
msgid ""
"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r "
"by Alessandro Ranellucci and the RepRap community"
"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"
msgstr ""
msgid "Libraries"
@ -1415,9 +1521,13 @@ msgstr ""
msgid "About %s"
msgstr ""
msgid ""
"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by "
"Merill(supermerill)."
msgid "Orca Slicer "
msgstr ""
msgid "OrcaSlicer is based on BambuStudio, PrusaSlicer, and SuperSlicer."
msgstr ""
msgid "BambuStudio is originally based on PrusaSlicer by PrusaResearch."
msgstr ""
msgid "PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci."
@ -1428,15 +1538,6 @@ msgid ""
"contributors."
msgstr ""
msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker."
msgstr ""
msgid ""
"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."
msgstr ""
msgid "Version"
msgstr ""
@ -1482,6 +1583,9 @@ msgstr ""
msgid "Factor N"
msgstr ""
msgid "Setting Virtual slot information while printing is not supported"
msgstr ""
msgid "Please input a valid value (K in 0~0.5)"
msgstr ""
@ -1583,8 +1687,7 @@ msgstr ""
msgid ""
"Green means that AMS humidity is normal, orange represent humidity is high, "
"red represent humidity is too high.(Hygrometer: lower the better, The bars: "
"higher the better)"
"red represent humidity is too high.(Hygrometer: lower the better.)"
msgstr ""
msgid "Desiccant status"
@ -1592,7 +1695,7 @@ msgstr ""
msgid ""
"A desiccant status lower than two bars indicates that desiccant may be "
"inactive. Please change the desiccant. (Higher is better)"
"inactive. Please change the desiccant.(The bars: higher the better.)"
msgstr ""
msgid ""
@ -1959,6 +2062,11 @@ msgid ""
"No - reset density to default non 100% value automaticlly"
msgstr ""
msgid ""
"While printing by Object, the extruder may collide skirt.\n"
"Thus, reset the skirt layer to 1 to avoid that."
msgstr ""
msgid "Auto bed leveling"
msgstr ""
@ -2152,9 +2260,24 @@ msgstr ""
msgid "Generating geometry index data"
msgstr ""
msgid "Statistics of All Plates"
msgstr ""
msgid "Display"
msgstr ""
msgid "Flushed"
msgstr ""
msgid "Total"
msgstr ""
msgid "Total Time Estimation"
msgstr ""
msgid "Total time"
msgstr ""
msgid "up to"
msgstr ""
@ -2197,12 +2320,6 @@ msgstr ""
msgid "Used filament"
msgstr ""
msgid "Flushed"
msgstr ""
msgid "Total"
msgstr ""
msgid "Travel"
msgstr ""
@ -2266,9 +2383,6 @@ msgstr ""
msgid "Model printing time"
msgstr ""
msgid "Total time"
msgstr ""
msgid "Switch to silent mode"
msgstr ""
@ -2362,6 +2476,9 @@ msgstr ""
msgid "Avoid extrusion calibration region"
msgstr ""
msgid "Add"
msgstr ""
msgid "Add plate"
msgstr ""
@ -2395,6 +2512,10 @@ msgstr ""
msgid "Paint Toolbar"
msgstr ""
#, possible-boost-format
msgid "Shortcut key %1%"
msgstr ""
msgid "Explosion Ratio"
msgstr ""
@ -2529,22 +2650,19 @@ msgstr ""
msgid "No"
msgstr ""
msgid " will be closed before creating a new model. Do you want to continue?"
msgstr ""
msgid "Slice"
msgstr ""
msgid "Slice all"
msgid "will be closed before creating a new model. Do you want to continue?"
msgstr ""
msgid "Slice plate"
msgstr ""
msgid "Export G-code file"
msgid "Print plate"
msgstr ""
msgid "Print plate"
msgid "Slice all"
msgstr ""
msgid "Export G-code file"
msgstr ""
msgid "Send"
@ -2863,6 +2981,14 @@ msgstr ""
msgid "&Help"
msgstr ""
#, possible-c-format, possible-boost-format
msgid "A file exists with the same name: %s, do you want to override it."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "A config exists with the same name: %s, do you want to override it."
msgstr ""
msgid "Overwrite file"
msgstr ""
@ -3124,7 +3250,7 @@ msgstr ""
msgid "Layers: N/A"
msgstr ""
msgid "Clean"
msgid "Clear"
msgstr ""
msgid "Control"
@ -3320,6 +3446,9 @@ msgstr ""
msgid "Open Folder."
msgstr ""
msgid "Safely remove hardware."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "%1$d Object has custom supports."
msgid_plural "%1$d Objects have custom supports."
@ -3347,12 +3476,6 @@ msgstr ""
msgid "Slice ok."
msgstr ""
msgid "Export G-Code."
msgstr ""
msgid "Export."
msgstr ""
msgid "Jump to"
msgstr ""
@ -3525,13 +3648,24 @@ msgid ""
"colors. Do you want to continue?"
msgstr ""
msgid ""
"Already did a synchronization, do you want to sync only changes or resync "
"all?"
msgstr ""
msgid "Sync"
msgstr ""
msgid "Resync"
msgstr ""
msgid "There are no compatible filaments, and sync is not performed."
msgstr ""
msgid ""
"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."
"Orca Slicer or restart Orca Slicer to check if there is an update to system "
"presets."
msgstr ""
msgid "Untitled"
@ -3581,7 +3715,7 @@ msgstr ""
msgid "The Config can not be loaded."
msgstr ""
msgid "The 3mf is generated by old Bambu Studio, load geometry data only."
msgid "The 3mf is generated by old Orca Slicer, load geometry data only."
msgstr ""
#, possible-c-format, possible-boost-format
@ -3602,6 +3736,12 @@ msgid ""
"software."
msgstr ""
msgid "Invalid values found in the 3mf:"
msgstr ""
msgid "Please correct them in the param tabs"
msgstr ""
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3614,9 +3754,6 @@ msgstr ""
msgid "The name may show garbage characters!"
msgstr ""
msgid "Attention!"
msgstr ""
#, possible-boost-format
msgid "Failed loading file \"%1%\". An invalid configuration was found."
msgstr ""
@ -3825,7 +3962,7 @@ msgstr ""
msgid "Invalid number"
msgstr ""
msgid "Select Bed Type"
msgid "Plate Settings"
msgstr ""
#, possible-boost-format
@ -3861,11 +3998,14 @@ msgstr ""
msgid ""
"\"Fix Model\" feature is currently only on Windows. Please repair the model "
"on Bambu Studio(windows) or CAD softwares."
"on Orca Slicer(windows) or CAD softwares."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Plate %d: %s does not support filament %s (%s)."
msgid ""
"Plate% d: %s is not suggested to be used to print filament %s(%s). If you "
"still want to do this printing, please set this filament's bed temperature "
"to non zero."
msgstr ""
msgid "Switching the language requires application restart.\n"
@ -3943,25 +4083,25 @@ msgstr ""
msgid "User Sync"
msgstr ""
msgid "Associate files to BambuStudio"
msgid "Associate files to OrcaSlicer"
msgstr ""
msgid "Associate .3mf files to BambuStudio"
msgid "Associate .3mf files to OrcaSlicer"
msgstr ""
msgid "If enabled, sets BambuStudio as default application to open .3mf files"
msgid "If enabled, sets OrcaSlicer as default application to open .3mf files"
msgstr ""
msgid "Associate .stl files to BambuStudio"
msgid "Associate .stl files to OrcaSlicer"
msgstr ""
msgid "If enabled, sets BambuStudio as default application to open .stl files"
msgid "If enabled, sets OrcaSlicer as default application to open .stl files"
msgstr ""
msgid "Associate .step/.stp files to BambuStudio"
msgid "Associate .step/.stp files to OrcaSlicer"
msgstr ""
msgid "If enabled, sets BambuStudio as default application to open .step files"
msgid "If enabled, sets OrcaSlicer as default application to open .step files"
msgstr ""
msgid "Backup"
@ -4102,6 +4242,39 @@ msgstr ""
msgid "Add/Remove printers"
msgstr ""
msgid "Same as Global Print Sequence"
msgstr ""
msgid "Print sequence"
msgstr ""
msgid "Same as Global Bed Type"
msgstr ""
msgid "Cool Plate"
msgstr ""
msgid "Engineering Plate"
msgstr ""
msgid "High Temp Plate"
msgstr ""
msgid "Textured PEI Plate"
msgstr ""
msgid "By Layer"
msgstr ""
msgid "By Object"
msgstr ""
msgid "Accept"
msgstr ""
msgid "Log Out"
msgstr ""
msgid "Slice all plate to obtain time and filament estimation"
msgstr ""
@ -4213,6 +4386,9 @@ msgstr ""
msgid "Offline"
msgstr ""
msgid "(LAN)"
msgstr ""
msgid "My Device"
msgstr ""
@ -4367,27 +4543,15 @@ msgstr ""
msgid "Cannot send the print task when the upgrade is in progress"
msgstr ""
msgid "The printer is required to be in the same LAN as Bambu Studio."
msgid "An SD card needs to be inserted before send to printer SD card."
msgstr ""
msgid "The printer is required to be in the same LAN as Orca Slicer."
msgstr ""
msgid "The printer does not support sending to printer SD card."
msgstr ""
msgid "Same as Global Bed Type"
msgstr ""
msgid "Cool Plate"
msgstr ""
msgid "Engineering Plate"
msgstr ""
msgid "High Temp Plate"
msgstr ""
msgid "Textured PEI Plate"
msgstr ""
msgid "Log in printer"
msgstr ""
@ -4832,6 +4996,9 @@ msgid ""
"instead."
msgstr ""
msgid "Select presets to compare"
msgstr ""
msgid "Show all presets (including incompatible)"
msgstr ""
@ -4860,9 +5027,6 @@ msgstr ""
msgid "Assembly Guide"
msgstr ""
msgid "Choose files"
msgstr ""
msgid "Author"
msgstr ""
@ -4913,23 +5077,20 @@ msgstr ""
msgid "The configuration is up to date."
msgstr ""
msgid "Flushing volumes for filament change"
msgstr ""
msgid "Auto-Calc"
msgstr ""
msgid "Flushing volume (mm³) for each filament pair."
msgid "Flushing volumes for filament change"
msgstr ""
msgid "Multiplier"
msgstr ""
msgid "Actual Volume = Flushing Volume * Multiplier"
msgid "Flushing volume (mm³) for each filament pair."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Suggestion: Actual Volume in range [%d, %d]"
msgid "Suggestion: Flushing Volume in range [%d, %d]"
msgstr ""
#, possible-c-format, possible-boost-format
@ -4966,7 +5127,7 @@ msgstr ""
msgid "Objects list"
msgstr ""
msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files."
msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files"
msgstr ""
msgid "Copy to clipboard"
@ -5202,24 +5363,27 @@ msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
"Click OK to update the Network plug-in when Orca Slicer launches next time."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgid "New version of Orca Slicer"
msgstr ""
msgid "Don't remind me of this version again"
msgstr ""
msgid "Done"
msgstr ""
msgid "LAN Connection Failed (Sending print file)"
msgstr ""
msgid ""
"Step 1, please confirm Bambu Studio and your printer are in the same LAN."
"Step 1, please confirm Orca Slicer and your printer are in the same LAN."
msgstr ""
msgid ""
@ -5341,10 +5505,6 @@ msgstr ""
msgid "Copying of file %1% to %2% failed: %3%"
msgstr ""
#, possible-boost-format
msgid "Copying directory %1% to %2% failed: %3%"
msgstr ""
msgid "Need to check the unsaved changes before configuration updates."
msgstr ""
@ -5946,9 +6106,8 @@ msgid "Brim type"
msgstr ""
msgid ""
"This controls brim position including outer side of models, inner side of "
"holes or both. Auto means both the brim position and brim width is analysed "
"and calculated automatically"
"This controls the generation of the brim at outer side of models. Auto means "
"the brim width is analysed and calculated automatically."
msgstr ""
msgid "outer_only"
@ -5983,9 +6142,6 @@ msgstr ""
msgid "Compatible process profiles condition"
msgstr ""
msgid "Print sequence"
msgstr ""
msgid "Print sequence, layer by layer or object by object"
msgstr ""
@ -6901,6 +7057,12 @@ msgstr ""
msgid "Volume of nozzle between the cutter and the end of nozzle"
msgstr ""
msgid "Start end points"
msgstr ""
msgid "The start and end points which is from cutter area to garbage can."
msgstr ""
msgid "Reduce infill retraction"
msgstr ""
@ -7024,6 +7186,15 @@ msgid ""
"print when travel move. Using spiral line to lift z can prevent stringing"
msgstr ""
msgid "Z Hop Type"
msgstr ""
msgid "Slope"
msgstr ""
msgid "Spiral"
msgstr ""
msgid "Extra length on restart"
msgstr ""
@ -7120,6 +7291,12 @@ msgstr ""
msgid "Distance from skirt to brim or object"
msgstr ""
msgid "Skirt height"
msgstr ""
msgid "How many layers of skirt. Usually only one layer"
msgstr ""
msgid "Skirt loops"
msgstr ""
@ -7410,6 +7587,14 @@ msgid ""
"This setting determines the distance between neighboring tree support nodes."
msgstr ""
msgid "Adaptive layer height"
msgstr ""
msgid ""
"Enabling this option means the height of tree support layer except the "
"first will be automatically calculated "
msgstr ""
msgid "Tree support branch diameter"
msgstr ""
@ -7679,6 +7864,22 @@ msgid ""
"Otherwise, rectilinear pattern is used defaultly."
msgstr ""
msgid "invalid value "
msgstr ""
#, possible-c-format, possible-boost-format
msgid " doesn't work at 100%% density "
msgstr ""
msgid "Invalid value when spiral vase mode is enabled: "
msgstr ""
msgid "too large line width "
msgstr ""
msgid " not in range "
msgstr ""
msgid "Export 3MF"
msgstr ""
@ -7697,6 +7898,9 @@ msgstr ""
msgid "Load cached slicing data from directory"
msgstr ""
msgid "Slice"
msgstr ""
msgid "Slice the plates: 0-all plates, i-plate i, others-invalid"
msgstr ""
@ -7792,6 +7996,9 @@ msgstr ""
msgid "Generating infill toolpath"
msgstr ""
msgid "Detect overhangs for auto-lift"
msgstr ""
msgid "Generating support"
msgstr ""
@ -7821,6 +8028,17 @@ msgstr ""
msgid "Slicing mesh"
msgstr ""
msgid ""
"No layers were detected. You might want to repair your STL file(s) or check "
"their size or thickness and retry.\n"
msgstr ""
msgid ""
"An object's XY size compensation will not be used because it is also color-"
"painted.\n"
"XY Size compensation can not be combined with color-painting."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "Support: generate toolpath at layer %d"
msgstr ""
@ -8010,11 +8228,11 @@ msgid "Split to Objects/Parts\nDid you know that you can split a big object into
msgstr ""
#: resources/data/hints.ini: [hint:Subtract a Part]
msgid "Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Bambu Studio. Read more in the documentation."
msgid "Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Orca Slicer. Read more in the documentation."
msgstr ""
#: resources/data/hints.ini: [hint:STEP]
msgid "STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nBambu Studio supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!"
msgid "STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nOrca Slicer supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!"
msgstr ""
#: resources/data/hints.ini: [hint:Z seam location]

727
bbl/i18n/de/BambuStudio_de.po → bbl/i18n/de/OrcaSlicer_de.po
View file

File diff suppressed because it is too large Load diff

606
bbl/i18n/en/BambuStudio_en.po → bbl/i18n/en/OrcaSlicer_en.po
View file

File diff suppressed because it is too large Load diff

603
bbl/i18n/es/BambuStudio_es.po → bbl/i18n/es/OrcaSlicer_es.po
View file

File diff suppressed because it is too large Load diff

742
bbl/i18n/fr/BambuStudio_fr.po → bbl/i18n/fr/OrcaSlicer_fr.po
View file

File diff suppressed because it is too large Load diff

620
bbl/i18n/hu/BambuStudio_hu.po → bbl/i18n/hu/OrcaSlicer_hu.po
View file

File diff suppressed because it is too large Load diff

606
bbl/i18n/it/BambuStudio_it.po → bbl/i18n/it/OrcaSlicer_it.po
View file

File diff suppressed because it is too large Load diff

844
bbl/i18n/ja/BambuStudio_ja.po → bbl/i18n/ja/OrcaSlicer_ja.po
View file

File diff suppressed because it is too large Load diff

604
bbl/i18n/nl/BambuStudio_nl.po → bbl/i18n/nl/OrcaSlicer_nl.po
View file

File diff suppressed because it is too large Load diff

604
bbl/i18n/sv/BambuStudio_sv.po → bbl/i18n/sv/OrcaSlicer_sv.po
View file

File diff suppressed because it is too large Load diff

775
bbl/i18n/zh_cn/BambuStudio_zh_CN.po → bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
View file

File diff suppressed because it is too large Load diff

11
build_release_macos.sh
View file

@ -1,10 +1,13 @@
#!/bin/sh
while getopts ":a:sdhn" opt; do
while getopts ":a:sdphn" opt; do
case ${opt} in
d )
export BUILD_TARGET="deps"
;;
p )
export PACK_DEPS="1"
;;
a )
export ARCH="$OPTARG"
;;
@ -49,7 +52,7 @@ WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd $WD/deps
mkdir -p build_$ARCH
cd build_$ARCH
DEPS=$PWD/BambuStudio_dep_$ARCH
DEPS=$PWD/OrcaSlicer_dep_$ARCH
mkdir -p $DEPS
if [ "studio." != $BUILD_TARGET. ];
then
@ -57,6 +60,10 @@ then
echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}"
cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-${ARCH}-cc" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}
cmake --build . --config Release --target all
if [ "1." == "$PACK_DEPS". ];
then
tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%d-%m-%Y").tar.gz OrcaSlicer_dep_$ARCH
fi
fi

14
deps/CMakeLists.txt vendored
View file

@ -1,12 +1,12 @@
#
# This CMake project downloads, configures and builds BambuStudio dependencies on Unix and Windows.
# This CMake project downloads, configures and builds OrcaSlicer dependencies on Unix and Windows.
#
# When using this script, it's recommended to perform an out-of-source build using CMake.
#
# All the dependencies are installed in a `destdir` directory in the root of the build directory,
# in a traditional Unix-style prefix structure. The destdir can be used directly by CMake
# when building BambuStudio - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building BambuStudio.
# when building OrcaSlicer - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building OrcaSlicer.
#
# For better clarity of console output, it's recommended to _not_ use a parallelized build
# for the top-level command, ie. use `make -j 1` or `ninja -j 1` to force single-threaded top-level
@ -20,7 +20,7 @@
# therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
#
project(BambuStudio-deps)
project(OrcaSlicer-deps)
cmake_minimum_required(VERSION 3.2)
if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
@ -69,9 +69,9 @@ endif ()
# Slic3r compiles with a different version which will cause runtime errors.
# option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF)
message(STATUS "BambuStudio deps DESTDIR: ${DESTDIR}")
message(STATUS "BambuStudio dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
message(STATUS "BambuStudio deps debug build: ${DEP_DEBUG}")
message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}")
message(STATUS "OrcaSlicer dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}")
find_package(Git REQUIRED)

2
doc/How to build - Linux et al.md
View file

@ -1,4 +1,4 @@
# Building Bambu Studio on UNIX/Linux
# Building Orca Slicer on UNIX/Linux
Currently Linux version is not verified, you can try it referring to [PrusaSlicer'S linux building guide](https://github.com/prusa3d/PrusaSlicer/blob/master/doc/How%20to%20build%20-%20Linux%20et%20al.md)

6
doc/How to build - Mac OS.md
View file

@ -1,5 +1,5 @@
# Building Bambu Studio on Mac OS
# Building Orca Slicer on Mac OS
## Enviroment setup
Install Following tools:
@ -11,7 +11,7 @@ Install Following tools:
Cmake, git, gettext can be installed from brew(brew install cmake git gettext)
## building the deps
You need to build the dependence of BambuStudio first. (Only needs for the first time)
You need to build the dependence of OrcaSlicer first. (Only needs for the first time)
Suppose you download the codes into /Users/_username_/work/projects/BambuStudio
create a directory to store the dependence built: /Users/_username_/work/projects/OrcaSlicer_dep
@ -26,7 +26,7 @@ for x86 architeccture
`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"`
`make -jN` (N can be a number between 1 and the max cpu number)
## building the Bambu Studio
## building the Orca Slicer
create a directory to store the installed files at /Users/username/work/projects/BambuStudio/install_dir
`cd BambuStudio`
`mkdir install_dir`

8
doc/How to build - Windows.md
View file

@ -1,8 +1,8 @@
# Building Bambu Studio on Windows
# Building Orca Slicer on Windows
## Enviroment setup
Install Following tools:
- Visual Studio Community 2019 from [visualstudio.microsoft.com/vs/](https://visualstudio.microsoft.com/vs/) (Older versions are not supported as Bambu Studio requires support for C++17, and newer versions should also be ok);
- Visual Studio Community 2019 from [visualstudio.microsoft.com/vs/](https://visualstudio.microsoft.com/vs/) (Older versions are not supported as Orca Slicer requires support for C++17, and newer versions should also be ok);
- Cmake from [cmake.org](https://cmake.org/download/)
- Git from [gitforwindows.org](https://gitforwindows.org/)
- Perl from [strawberryperl](https://strawberryperl.com/)
@ -18,7 +18,7 @@ create a directory to store the dependence built: D:/work/Projects/OrcaSlicer_de
It takes "00:14:27.37" to finish it on my machine (11th Gen Intel(R) Core(TM) i9-11900 @2.50GHz 2.50 GHz, with 32.0 GB DDR)
## building the Bambu Studio
## building the Orca Slicer
create a directory to store the installed files at D:/work/Projects/BambuStudio/install_dir
`cd BambuStudio`
`mkdir install_dir`
@ -31,6 +31,6 @@ then build it using command
`cmake --build . --target install --config Release`
or building it under the Visual Studio 2019
(set the BambuStudio_app_gui as start project)
(set the OrcaSlicer_app_gui as start project)
![image](https://user-images.githubusercontent.com/106916061/179185940-06135b47-f2a4-415a-9be4-666680fa0f9a.png)

14
doc/Localization_guide.md
View file

@ -1,6 +1,6 @@
# Localization and translation guide
The purpose of this guide is to describe how to contribute to the Bambu Studio translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
The purpose of this guide is to describe how to contribute to the Orca Slicer translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
Those can be downloaded here:
- https://sourceforge.net/directory/os:windows/?q=gnu+gettext GNUgettext package contains a set of tools to extract strings from the source code and to create the translation Catalog.
@ -32,15 +32,15 @@ Notice. When the translation is complete you need to:
- copy BambuStudio_xx.mo into resources/i18n/xx and rename it to BambuStudio.mo, then push the changed file.
( name of folder "fr" means "French" - the translation language).
### Scenario 3. How do I add a new text resource when implementing a feature to Bambu Studio
Each string resource in Bambu Studio available for translation needs to be explicitly marked using L() macro like this:
### Scenario 3. How do I add a new text resource when implementing a feature to Orca Slicer
Each string resource in Orca Slicer available for translation needs to be explicitly marked using L() macro like this:
```C++
auto msg = L("This message to be localized")
```
To get translated text use one of needed macro/function (`_(s)` or `_CHB(s)` ).
If you add new file resource, add it to the list of files containing macro `L()`
### Scenario 4. How do I use GNUgettext to localize my own application taking Bambu Studio as an example
### Scenario 4. How do I use GNUgettext to localize my own application taking Orca Slicer as an example
1. For convenience create a list of files with this macro `L(s)`. We have
https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt.
@ -75,14 +75,14 @@ https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt.
When you have Catalog to translation open POT or PO file in PoEdit and start translating.
## General guidelines for Bambu Studio translators
## General guidelines for Orca Slicer translators
- We recommend using *PoEdit* application for translation (as described above). It will help you eliminate most punctuation errors and will show you strings with "random" translations (if the fuzzy parameter was used).
- To check how the translated text looks on the UI elements, test it :) If you use *PoEdit*, all you need to do is save the file. At this point, a MO file will be created. Rename it Bambu Studio.mo, and you can run Bambu Studio (see above).
- To check how the translated text looks on the UI elements, test it :) If you use *PoEdit*, all you need to do is save the file. At this point, a MO file will be created. Rename it Orca Slicer.mo, and you can run Orca Slicer (see above).
- If you see an encoding error (garbage characters instead of Unicode) somewhere in Bambu Studio, report it. It is likely not a problem of your translation, but a bug in the software.
- If you see an encoding error (garbage characters instead of Unicode) somewhere in Orca Slicer, report it. It is likely not a problem of your translation, but a bug in the software.
- See on which UI elements the translated phrase will be used. Especially if it's a button, it is very important to decide on the translation and not write alternative translations in parentheses, as this will significantly increase the width of the button, which is sometimes highly undesirable:

2
lib/Slic3r.pm
View file

@ -105,7 +105,7 @@ sub copyright_info
my (%params) = @_;
my %tag = Slic3r::tags($params{format});
my $out =
'Copyright &copy; Bambu Studio.';
'Copyright &copy; Orca Slicer.';
return $out;
}

18
localazy.json
View file

@ -6,42 +6,42 @@
"files": [
{
"type": "po",
"pattern": "bbl/i18n/en/BambuStudio_en.po",
"pattern": "bbl/i18n/en/OrcaSlicer_en.po",
"lang": "en"
},
{
"type": "po",
"pattern": "bbl/i18n/fr/BambuStudio_fr.po",
"pattern": "bbl/i18n/fr/OrcaSlicer_fr.po",
"lang": "fr"
},
{
"type": "po",
"pattern": "bbl/i18n/de/BambuStudio_de.po",
"pattern": "bbl/i18n/de/OrcaSlicer_de.po",
"lang": "de"
},
{
"type": "po",
"pattern": "bbl/i18n/sv/BambuStudio_sv.po",
"pattern": "bbl/i18n/sv/OrcaSlicer_sv.po",
"lang": "sv"
},
{
"type": "po",
"pattern": "bbl/i18n/es/BambuStudio_es.po",
"pattern": "bbl/i18n/es/OrcaSlicer_es.po",
"lang": "es"
},
{
"type": "po",
"pattern": "bbl/i18n/nl/BambuStudio_nl.po",
"pattern": "bbl/i18n/nl/OrcaSlicer_nl.po",
"lang": "nl"
},
{
"type": "po",
"pattern": "bbl/i18n/hu/BambuStudio_hu.po",
"pattern": "bbl/i18n/hu/OrcaSlicer_hu.po",
"lang": "hu"
},
{
"type": "po",
"pattern": "bbl/i18n/ja/BambuStudio_ja.po",
"pattern": "bbl/i18n/ja/OrcaSlicer_ja.po",
"lang": "ja"
}
]
@ -50,7 +50,7 @@
"folder": "bbl/i18n",
"includeSourceLang" : "true",
"files": {
"output": "${lang}/BambuStudio_${lang}.po"
"output": "${lang}/OrcaSlicer_${lang}.po"
}
}
}

6
resources/data/hints.ini
View file

@ -95,7 +95,7 @@ text = Object List\nDid you know that you can view all objects/parts in a list a
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/object-list
#[hint:Search Functionality]
#text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Bambu Studio setting? Or use the familiar shortcut <b>Ctrl+F</b>.
#text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Orca Slicer setting? Or use the familiar shortcut <b>Ctrl+F</b>.
[hint:Simplify Model]
text = Simplify Model\nDid you know that you can reduce the number of triangles in a mesh using the Simplify mesh feature? Right-click the model and select Simplify model. Read more in the documentation.
@ -110,11 +110,11 @@ text = Split to Objects/Parts\nDid you know that you can split a big object into
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/split-to-objects-parts
[hint:Subtract a Part]
text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Bambu Studio. Read more in the documentation.
text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Orca Slicer. Read more in the documentation.
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/subtract-a-part
[hint:STEP]
text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nBambu Studio supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nOrca Slicer supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/step
[hint:Z seam location]

BIN
resources/i18n/de/BambuStudio.mo → resources/i18n/de/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/en/BambuStudio.mo → resources/i18n/en/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/es/BambuStudio.mo → resources/i18n/es/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/fr/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/fr/OrcaSlicer.mo Normal file
View file

Binary file not shown.

BIN
resources/i18n/hu/BambuStudio.mo → resources/i18n/hu/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/it/BambuStudio.mo → resources/i18n/it/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/ja/BambuStudio.mo → resources/i18n/ja/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/nl/BambuStudio.mo → resources/i18n/nl/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/sv/BambuStudio.mo → resources/i18n/sv/OrcaSlicer.mo
View file

Binary file not shown.

BIN
resources/i18n/zh_cn/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/zh_cn/OrcaSlicer.mo Normal file
View file

Binary file not shown.

40
resources/web/data/text.js
View file

@ -1,7 +1,7 @@
var LangText={
"en":{
"t1":"Welcome to Bambu Studio",
"t2":"Bambu Studio will be setup in several steps. Let's start!",
"t1":"Welcome to Orca Slicer",
"t2":"Orca Slicer will be setup in several steps. Let's start!",
"t3":"User Agreement",
"t4":"Disagree",
"t5":"Agree",
@ -46,7 +46,7 @@ var LangText={
"t50":"Log out",
"t52":"Skip",
"t53":"Join",
"t54":"In the 3D Printing community, we learn from each other's successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in ",
"t54":"In the 3D Printing community, we learn from each other's successes and failures to adjust our own slicing parameters and settings. Orca Slicer follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Orca Slicer to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in ",
"t55":"Privacy Policy",
"t56":". We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.",
"t57":"",
@ -75,7 +75,7 @@ var LangText={
"t80":"Try the following steps:",
"t81":"1, Click ",
"t82":" to open the plug-in directory",
"t83":"2, Close all open Bambu Studio",
"t83":"2, Close all open Orca Slicer",
"t84":"3, Delete all files under the plug-in directory",
"t85":"4, Reopen Bambu studio and install the plug-in again",
"t86":"Close",
@ -87,8 +87,8 @@ var LangText={
"t92":"Bambu Christmas Cabin"
},
"de_DE":{
"t1":"Willkommen im Bambu Studio",
"t2":"Das Bambu Studio wird in mehreren Schritten eingerichtet. Lass uns anfangen!",
"t1":"Willkommen im Orca Slicer",
"t2":"Das Orca Slicer wird in mehreren Schritten eingerichtet. Lass uns anfangen!",
"t3":"Nutzervereinbarung",
"t4":"Ablehnen",
"t5":"Zustimmen",
@ -133,7 +133,7 @@ var LangText={
"t50":"Abmelden",
"t52":"Überspringen",
"t53":"Beitreten",
"t54":"In der 3D-Druck-Community lernen wir aus den Erfolgen und Misserfolgen der anderen Benutzer, um unsere eigenen Schneideparameter und Einstellungen anzupassen. Bambu Studio folgt demselben Prinzip und verbessert seine Leistung durch die Erfolge und Misserfolge der Vielzahl von Drucken unserer Benutzer mittels maschinellem Lernen. Wir trainieren Bambu Studio, indem wir ihnen die realen Daten zuführen. Wenn Sie bereit sind, greift dieser Dienst auf Informationen aus Ihren Fehler- und Nutzungsprotokollen zu, die Informationen enthalten können, die in der ",
"t54":"In der 3D-Druck-Community lernen wir aus den Erfolgen und Misserfolgen der anderen Benutzer, um unsere eigenen Schneideparameter und Einstellungen anzupassen. Orca Slicer folgt demselben Prinzip und verbessert seine Leistung durch die Erfolge und Misserfolge der Vielzahl von Drucken unserer Benutzer mittels maschinellem Lernen. Wir trainieren Orca Slicer, indem wir ihnen die realen Daten zuführen. Wenn Sie bereit sind, greift dieser Dienst auf Informationen aus Ihren Fehler- und Nutzungsprotokollen zu, die Informationen enthalten können, die in der ",
"t55":"Datenschutzrichtlinie",
"t56": ". Wir werden keine personenbezogenen Daten sammeln, durch die eine Person direkt oder indirekt identifiziert werden kann, einschließlich, aber nicht beschränkt auf Namen, Adressen, Zahlungsinformationen oder Telefonnummern. Durch Aktivieren dieses Dienstes stimmen Sie diesen Bedingungen und der Erklärung zur Datenschutzrichtlinie zu.",
"t57": "",
@ -162,9 +162,9 @@ var LangText={
"t80": "Versuchen Sie die folgenden Schritte:",
"t81": "1, Klicken Sie auf ",
"t82": ", um das Plug-in-Verzeichnis zu öffnen",
"t83": "2, Schließen Sie alle geöffneten Bambu Studio",
"t83": "2, Schließen Sie alle geöffneten Orca Slicer",
"t84": "3, Löschen Sie alle Dateien im Plug-in-Verzeichnis",
"t85": "4, Öffnen Sie Bambu Studio erneut und installieren Sie das Plug-in erneut",
"t85": "4, Öffnen Sie Orca Slicer erneut und installieren Sie das Plug-in erneut",
"t86": "Schließen",
"t87": "Benutzerhandbuch",
"t88": "Entfernen",
@ -174,8 +174,8 @@ var LangText={
"t92": "Bambu Weihnachtshütte"
},
"fr_FR":{
"t1":"Bienvenue dans Bambu Studio",
"t2":"L'installation de Bambu Studio se fera en plusieurs étapes. C'est parti !",
"t1":"Bienvenue dans Orca Slicer",
"t2":"L'installation de Orca Slicer se fera en plusieurs étapes. C'est parti !",
"t3":"Accord d'utilisation",
"t4":"Pas d'accord",
"t5":"D'accord",
@ -220,7 +220,7 @@ var LangText={
"t50":"Déconnexion",
"t52":"Passer",
"t53":"Rejoindre",
"t54":"Dans la communauté de l'impression 3D, nous apprenons des succès et des échecs des autres pour ajuster nos propres paramètres et réglages de tranchage. Bambu Studio suit le même principe et utilise l'apprentissage automatique pour améliorer ses performances à partir des succès et des échecs du grand nombre d'impressions réalisées par nos utilisateurs. Nous formons Bambu Studio pour qu'il soit plus intelligent en lui fournissant des données du monde réel. Si vous le voulez bien, ce service accèdera aux informations de vos journaux d'erreurs et d'utilisation, qui peuvent inclure des informations décrites dans ",
"t54":"Dans la communauté de l'impression 3D, nous apprenons des succès et des échecs des autres pour ajuster nos propres paramètres et réglages de tranchage. Orca Slicer suit le même principe et utilise l'apprentissage automatique pour améliorer ses performances à partir des succès et des échecs du grand nombre d'impressions réalisées par nos utilisateurs. Nous formons Orca Slicer pour qu'il soit plus intelligent en lui fournissant des données du monde réel. Si vous le voulez bien, ce service accèdera aux informations de vos journaux d'erreurs et d'utilisation, qui peuvent inclure des informations décrites dans ",
"t55":"Politique de confidentialité",
"t56":". Nous ne collecterons pas de données personnelles permettant d'identifier un individu directement ou indirectement, y compris, sans s'y limiter, les noms, adresses, informations de paiement ou numéros de téléphone. En activant ce service, vous acceptez ces conditions et la déclaration sur la politique de confidentialité.",
"t57":"",
@ -249,7 +249,7 @@ var LangText={
"t80":"Essayez les étapes suivantes:",
"t81":"1, Cliquez ",
"t82":" pour ouvrir le répertoire du plug-in",
"t83":"2, Fermer toutes les ouvertures de Bambu Studio",
"t83":"2, Fermer toutes les ouvertures de Orca Slicer",
"t84":"3, Supprimer tous les fichiers sous le répertoire du plug-in",
"t85":"4, Rouvrez Bambu studio et installez à nouveau le plug-in.",
"t86":"Fermer",
@ -260,21 +260,21 @@ var LangText={
"t91":"Télécharger des modèles 3D",
"t92":"Cabane de Noël Bambu",
"wk1":"Guide de démarrage rapide",
"wk2":"Cet article décrit les utilisations les plus basiques de Bambu Studio. Il guide l'utilisateur à travers la configuration du logiciel, la création d'un projet et la réalisation du premier travail d'impression, étape par étape.",
"wk2":"Cet article décrit les utilisations les plus basiques de Orca Slicer. Il guide l'utilisateur à travers la configuration du logiciel, la création d'un projet et la réalisation du premier travail d'impression, étape par étape.",
"wk3":"Flux de travail par projet",
"wk4":"Bambu Studio présente un flux de travail de pointe qui permet véritablement de réaliser des projets 'tout-en-un'. Basé sur le format de projet 3MF, il offre une série de nouvelles fonctionnalités révolutionnaires telles que la prise en charge de plusieurs disques, l'explorateur de projet et les vues d'assemblage/de pièces. Il peut être utilisé beaucoup plus efficacement par les créateurs de modèles et les utilisateurs occasionnels.",
"wk4":"Orca Slicer présente un flux de travail de pointe qui permet véritablement de réaliser des projets 'tout-en-un'. Basé sur le format de projet 3MF, il offre une série de nouvelles fonctionnalités révolutionnaires telles que la prise en charge de plusieurs disques, l'explorateur de projet et les vues d'assemblage/de pièces. Il peut être utilisé beaucoup plus efficacement par les créateurs de modèles et les utilisateurs occasionnels.",
"wk5":"Impression à grande vitesse d'une qualité exceptionnelle",
"wk6":"Bambu Studio permet d'y parvenir. La prise en charge de la fonction 'mouvement circulaire' rend le déplacement de la tête de l'outil plus fluide et réduit efficacement les vibrations de la machine. Des paramètres de contrôle du refroidissement finement calibrés en fonction des différents types de matériaux permettent d'automatiser le processus de refroidissement. La 'décélération automatique' dans la zone de débordement permet d'éviter les défauts esthétiques dans cette zone lors de l'impression à grande vitesse.",
"wk6":"Orca Slicer permet d'y parvenir. La prise en charge de la fonction 'mouvement circulaire' rend le déplacement de la tête de l'outil plus fluide et réduit efficacement les vibrations de la machine. Des paramètres de contrôle du refroidissement finement calibrés en fonction des différents types de matériaux permettent d'automatiser le processus de refroidissement. La 'décélération automatique' dans la zone de débordement permet d'éviter les défauts esthétiques dans cette zone lors de l'impression à grande vitesse.",
"wk7":"Impression en plusieurs couleurs",
"wk8":"Bambu Studio offre une large gamme d'outils de coloration pour créer des modèles colorés. Vous pouvez librement ajouter/supprimer des matériaux d'impression dans votre projet et colorer le modèle à l'aide de différentes brosses. Lorsque vous lancez l'impression, les différents matériaux de la tâche d'impression sont automatiquement mis en correspondance avec les emplacements AMS correspondants, ce qui évite d'avoir à ajuster manuellement la position des rouleaux de matériaux dans l'AMS.",
"wk8":"Orca Slicer offre une large gamme d'outils de coloration pour créer des modèles colorés. Vous pouvez librement ajouter/supprimer des matériaux d'impression dans votre projet et colorer le modèle à l'aide de différentes brosses. Lorsque vous lancez l'impression, les différents matériaux de la tâche d'impression sont automatiquement mis en correspondance avec les emplacements AMS correspondants, ce qui évite d'avoir à ajuster manuellement la position des rouleaux de matériaux dans l'AMS.",
"wk9":"Guide pour le réglage des paramètres de coupe",
"wk10":"Les fonctions de gestion des paramètres de Bambu Studio permettent un contrôle très souple et puissant du processus de tranchage. Cet article décrit l'organisation et la classification des paramètres de tranchage et la manière de les définir, et fournit quelques conseils sur la façon de les utiliser.",
"wk10":"Les fonctions de gestion des paramètres de Orca Slicer permettent un contrôle très souple et puissant du processus de tranchage. Cet article décrit l'organisation et la classification des paramètres de tranchage et la manière de les définir, et fournit quelques conseils sur la façon de les utiliser.",
"wk11":"Contrôle et surveillance à distance",
"wk12":"Bambu Studio permet d'envoyer des travaux d'impression à l'imprimante via un réseau WAN/LAN, de contrôler et de visualiser tous les aspects de l'imprimante 3D et du travail d'impression. Si vous avez plusieurs imprimantes, vous pouvez aussi facilement passer de l'une à l'autre dans la liste des périphériques.",
"wk12":"Orca Slicer permet d'envoyer des travaux d'impression à l'imprimante via un réseau WAN/LAN, de contrôler et de visualiser tous les aspects de l'imprimante 3D et du travail d'impression. Si vous avez plusieurs imprimantes, vous pouvez aussi facilement passer de l'une à l'autre dans la liste des périphériques.",
"wk13":"Format STEP",
"wk14":"STEP apporte plus d'informations valides que STL. Grâce à la grande précision de STEP, davantage de trajectoires circulaires peuvent être générées lors du découpage. STEP inclut également les relations d'assemblage pour chaque partie du modèle, ce qui permet de restaurer la vue d'assemblage après le découpage du modèle.",
"wk15":"Texte en 3D",
"wk16":"En utilisant l'outil Texte 3D, les utilisateurs peuvent facilement créer une variété de formes de texte 3D dans leurs projets, permettant une plus grande personnalisation des modèles. Bambu Studio offre des dizaines de polices et supporte les styles gras et italique, permettant une plus grande flexibilité dans le texte.",
"wk16":"En utilisant l'outil Texte 3D, les utilisateurs peuvent facilement créer une variété de formes de texte 3D dans leurs projets, permettant une plus grande personnalisation des modèles. Orca Slicer offre des dizaines de polices et supporte les styles gras et italique, permettant une plus grande flexibilité dans le texte.",
},
"zh_CN":{
"t1":"欢迎使用Bambu Studio",

4
resources/web/guide/1/index.html
View file

@ -16,8 +16,8 @@
<div id="SlicerIcon" style="text-align: center;">
<img src="../../image/logo.png"/>
</div>
<div id="Title" class="trans" tid="t1">Welcome to Bambu Studio</div>
<div id="STip" class="trans" tid="t2">Bambu Studio will be setup in several steps. Let's start!</div>
<div id="Title" class="trans" tid="t1">Welcome to Orca Slicer</div>
<div id="STip" class="trans" tid="t2">Orca Slicer will be setup in several steps. Let's start!</div>
<div id="BtnArea">
<a id="StartBtn" class="NormalBtn swiper-button-next trans" tid="t24" href="../11/index.html">Get Started</a>
</div>

2
resources/web/guide/11/11.js
View file

@ -62,7 +62,7 @@ function GotoPolicyPage()
SendWXMessage( JSON.stringify(tSend) );
window.location.href="../3/index.html";
window.location.href="../21/index.html";
}

2
resources/web/guide/3/index.html
View file

@ -20,7 +20,7 @@
</div>
<div id="Content">
<div id="PolicyTxt" class="TextS2 TextArea1 ZScrol">
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Orca Slicer follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Orca Slicer to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
</a>
</div>

2
resources/web/guide/31/index.html
View file

@ -19,7 +19,7 @@
</div>
<div id="Content">
<div id="PolicyTxt">
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Orca Slicer follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Orca Slicer to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
</a>
</div>

2
resources/web/guide/6/index.html
View file

@ -31,7 +31,7 @@
<div id="InstallFailedTip">
<div><a class="trans" tid="t79">Failed to install plug-in. </a><a class="trans" tid="t80">Try the following steps:</a></div>
<div><a class="trans" tid="t81">1, Click </a><a class="trans LinkBtn" tid="t77" onClick="OpenPluginFolder()">here</a><a class="trans" tid="t82"> to open the plug-in directory</a> </div>
<div class="trans" tid="t83">2, Close all open Bambu Studio</div>
<div class="trans" tid="t83">2, Close all open Orca Slicer</div>
<div class="trans" tid="t84">3, Delete all files under the plug-in directory</div>
<div class="trans" tid="t85">4, Reopen Bambu studio and install the plug-in again</div>
</div>

14
resources/web/homepage/index.html
View file

@ -177,34 +177,34 @@
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/studio-quick-start')">
<div class="UG_IMG"><img src="img/quick_start.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk1">Quick Start</div>
<div class="UG_DESC trans" tid="wk2">This article introduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step. </div>
<div class="UG_DESC trans" tid="wk2">This article introduces the most basic usage of Orca Slicer. It guides users to configure software, create projects, and complete the first printing task step by step. </div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/project-based-workflow')">
<div class="UG_IMG"><img src="img/project_based_workflow.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk3">Project Based Workflow</div>
<div class="UG_DESC trans" tid="wk4">Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.</div>
<div class="UG_DESC trans" tid="wk4">Orca Slicer has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/high-speed-print-at-quality')">
<div class="UG_IMG"><img src="img/high_speed_print_at_quality.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk5">High Speed Print at Quality</div>
<div class="UG_DESC trans" tid="wk6">It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen.
<div class="UG_DESC trans" tid="wk6">It is challenging to print at high speed while maintaining high quality. Orca Slicer makes this happen.
"Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tuned cooling parameters for each filament type.
"Auto slow down" for overhang walls works to prevent deformation at high speeds.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/multi-color-printing')">
<div class="UG_IMG"><img src="img/multi_color_printing.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk7">Multi-Color Printing</div>
<div class="UG_DESC trans" tid="wk8">Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.</div>
<div class="UG_DESC trans" tid="wk8">Orca Slicer provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/how-to-set-slicing-parameters')">
<div class="UG_IMG"><img src="img/setting_guide_of_slicing_parameters.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk9">Setting Guide of Slicing Parameters</div>
<div class="UG_DESC trans" tid="wk10">The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.</div>
<div class="UG_DESC trans" tid="wk10">The parameter management features in Orca Slicer provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/remote-control')">
<div class="UG_IMG"><img src="img/remote_control_and_monitoring.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk11">Remote Control & Monitoring</div>
<div class="UG_DESC trans" tid="wk12">Bambu Studio support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.</div>
<div class="UG_DESC trans" tid="wk12">Orca Slicer support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/step')">
<div class="UG_IMG"><img src="img/step.png" /></div>
@ -214,7 +214,7 @@
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/3d-text')">
<div class="UG_IMG"><img src="img/3d_text.png" /></div>
<div class="UG_TITLE trans TextS1" tid="wk15">3D Text</div>
<div class="UG_DESC trans" tid="wk16">With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.</div>
<div class="UG_DESC trans" tid="wk16">With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Orca Slicer provides dozens of fonts and supports bold and italic styles to give text greater flexibility.</div>
</div>
</div>
</div>

16
src/BambuStudio.cpp
View file

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

10
src/BambuStudio_app_msvc.cpp
View file

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

80
src/CMakeLists.txt
View file

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

2
src/expat/xmlparse.c
View file

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

2
src/hints/HintsToPot.cpp
View file

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

2
src/libslic3r/Config.cpp
View file

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

4
src/libslic3r/Config.hpp
View file

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

20
src/libslic3r/Format/bbs_3mf.cpp
View file

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

2
src/libslic3r/GCode.cpp
View file

@ -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());

5
src/libslic3r/GCode/GCodeProcessor.cpp
View file

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

2
src/libslic3r/PlaceholderParser.cpp
View file

@ -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();
}

2
src/libslic3r/PrintBase.cpp
View file

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

6
src/libslic3r/PrintConfig.cpp
View file

@ -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.");*/
/*

4
src/libslic3r/Utils.hpp
View file

@ -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
src/libslic3r/libslic3r.h
View file

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

36
src/libslic3r/utils.cpp
View file

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

4
src/platform/unix/BuildLinuxImage.sh.in
View file

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

2
src/platform/unix/BambuStudio.desktop → src/platform/unix/OrcaSlicer.desktop
View file

@ -1,5 +1,5 @@
[Desktop Entry]
Name=BambuStudio
Name=OrcaSlicer
GenericName=3D Printing Software
Icon=BambuStudio
Exec=orca-slicer %F

6
src/slic3r/Config/Snapshot.cpp
View file

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

60
src/slic3r/GUI/AboutDialog.cpp
View file

@ -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());

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

@ -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."));
}
}

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

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

4
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -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();

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

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

85
src/slic3r/GUI/GUI_App.cpp
View file

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

4
src/slic3r/GUI/GUI_Init.cpp
View file

@ -65,10 +65,10 @@ int GUI_Run(GUI_InitParams &params)
}
} 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;

16
src/slic3r/GUI/InstanceCheck.cpp
View file

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

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

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

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

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

8
src/slic3r/GUI/Plater.cpp
View file

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

14
src/slic3r/GUI/Preferences.cpp
View file

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

6
src/slic3r/GUI/ReleaseNote.cpp
View file

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

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

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

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

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

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

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

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

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

11
src/slic3r/GUI/WebGuideDialog.cpp
View file

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

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

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

35
src/slic3r/Utils/PresetUpdater.cpp
View file

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

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

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

2
version.inc
View file

@ -10,5 +10,5 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1")
endif()
set(SoftFever_VERSION "1.5.0_beta")
set(SoftFever_VERSION "1.5.0")
set(SLIC3R_VERSION "01.05.00.60")