替换文件里的名称

This commit is contained in:
于肖辉 2025-04-29 11:17:45 +08:00
parent 7cbd12e423
commit 38f881b83f
21 changed files with 211 additions and 639 deletions

2
.gitignore vendored
View File

@ -15,7 +15,6 @@ xs/assertlib*
.init_bundle.ini
.vs/*
local-lib
/src/TAGS
/.vscode/
build-linux/*
deps/build*/*
@ -23,7 +22,6 @@ deps/build*/*
install_*
build_*/
SVG
src/OrcaSlicer-doc/
.idea/
/.cache/
*.mo

BIN
3MF.ipch Normal file

Binary file not shown.

View File

@ -8,7 +8,7 @@ if (APPLE)
message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif ()
project(OrcaSlicer)
project(CreatWare)
include("version.inc")
include(GNUInstallDirs)
@ -44,11 +44,11 @@ else()
endif()
endif()
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_STATIC "Compile CreatWare with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
option(SLIC3R_GUI "Compile CreatWare with GUI components (OpenGL, wxWidgets)" 1)
option(SLIC3R_FHS "Assume CreatWare 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 OrcaSlicer with an invasive Shiny profiler" 0)
option(SLIC3R_PROFILE "Compile CreatWare 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)
@ -147,7 +147,7 @@ if (MINGW)
endif ()
if (NOT MSVC)
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for OrcaSlicer on all platforms.
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for CreatWare on all platforms.
add_compile_options(-fsigned-char)
endif ()
@ -367,7 +367,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=0x602 -DBOOST_SYSTEM_USE_UTF8 )
# Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
# Force the source code encoding to UTF-8. See CreatWare GH pull request #5583
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
endif(MSVC)
@ -379,7 +379,7 @@ add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV)
if (SLIC3R_PROFILE)
message("OrcaSlicer will be built with a Shiny invasive profiler")
message("CreatWare will be built with a Shiny invasive profiler")
add_definitions(-DSLIC3R_PROFILE)
endif ()
@ -573,7 +573,7 @@ set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/localization/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}/OrcaSlicer.pot"
-o "${BBL_L18N_DIR}/CreatWare.pot"
COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate pot file from strings in the source tree"
@ -582,13 +582,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}/*/OrcaSlicer*.po")
file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/CreatWare*.po")
foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
SET(po_new_file "${po_dir}/OrcaSlicer_.po")
SET(po_new_file "${po_dir}/CreatWare_.po")
add_custom_command(
TARGET gettext_merge_po_with_pot PRE_BUILD
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot"
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/CreatWare.pot"
DEPENDS ${po_file}
)
endforeach()
@ -596,11 +596,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}/*/OrcaSlicer*.po")
file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/CreatWare*.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}/OrcaSlicer.mo")
SET(mo_file "${L10N_DIR}/${po_dir}/CreatWare.mo")
add_custom_command(
TARGET gettext_po_to_mo PRE_BUILD
COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
@ -643,7 +643,7 @@ else()
endif()
set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
function(orcaslicer_copy_dlls target config postfix output_dlls)
function(CreatWare_copy_dlls target config postfix output_dlls)
if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(_bits 64)
elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
@ -738,9 +738,9 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
endfunction()
# libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
# libslic3r, CreatWare GUI and the CreatWare executable.
add_subdirectory(src)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OrcaSlicer_app_gui)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT CreatWare_app_gui)
add_dependencies(gettext_make_pot hintsToPot)
@ -760,7 +760,7 @@ if(SLIC3R_BUILD_TESTS)
endif()
if (NOT WIN32 AND NOT APPLE)
set(SLIC3R_APP_CMD "orca-slicer")
set(SLIC3R_APP_CMD "CreatWare-slicer")
configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
endif()
@ -778,49 +778,49 @@ if (WIN32)
install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".")
elseif (SLIC3R_FHS)
# CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer")
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/CreatWare")
install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
PATTERN "*/udev" EXCLUDE
)
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
install(FILES src/platform/unix/CreatWare.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
foreach(SIZE 32 128 192)
install(FILES ${SLIC3R_RESOURCES_DIR}/images/OrcaSlicer_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME OrcaSlicer.png
install(FILES ${SLIC3R_RESOURCES_DIR}/images/CreatWare_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME CreatWare.png
)
endforeach()
elseif (CMAKE_MACOSX_BUNDLE)
# install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources")
# install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/CreatWare.app/Contents/resources")
else ()
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(FILES src/platform/unix/CreatWare.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif ()
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".")
configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)
set (CPACK_PACKAGE_NAME "OrcaSlicer")
set (CPACK_PACKAGE_NAME "CreatWare")
set (CPACK_PACKAGE_VENDOR "SoftFever")
set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}")
set (CPACK_PACKAGE_FILE_NAME "CreatWare_Windows_Installer_V${SoftFever_VERSION}")
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/CreatWare")
set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\OrcaSlicer.ico")
set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\CreatWare.ico")
set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
set (CPACK_NSIS_MUI_UNIICON "${CPACK_PACKAGE_ICON}")
set (CPACK_NSIS_INSTALLED_ICON_NAME "$INSTDIR\\\\orca-slicer.exe")
set (CPACK_NSIS_INSTALLED_ICON_NAME "$INSTDIR\\\\CreatWare-slicer.exe")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
CreateShortCut \\\"$DESKTOP\\\\OrcaSlicer.lnk\\\" \\\"$INSTDIR\\\\orca-slicer.exe\\\"
CreateShortCut \\\"$DESKTOP\\\\CreatWare.lnk\\\" \\\"$INSTDIR\\\\CreatWare-slicer.exe\\\"
")
set (CPACK_PACKAGE_CHECKSUM SHA256)
set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OrcaSlicer")
set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "CreatWare")
set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
# set (CPACK_NSIS_MODIFY_PATH "ON")
set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer")
set(CPACK_CREATE_DESKTOP_LINKS "orca-slicer")
set(CPACK_PACKAGE_EXECUTABLES "CreatWare-slicer;CreatWare")
set(CPACK_CREATE_DESKTOP_LINKS "CreatWare-slicer")
set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command
set(CPACK_WIX_UPGRADE_GUID "058245e8-20e0-4a95-9ab7-1acfe17ad511")

BIN
localization.zip Normal file

Binary file not shown.

View File

@ -1,7 +1,7 @@
var LangText = {
en: {
t1: "Welcome to Orca Slicer",
t2: "Orca Slicer will be setup in several steps. Let's start!",
t1: "Welcome to CreatBot",
t2: "CreatBot 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. 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 ",
t54: "In the 3D Printing community, we learn from each other's successes and failures to adjust our own slicing parameters and settings. CreatBot 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 CreatBot 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,9 +75,9 @@ var LangText = {
t80: "Try the following steps:",
t81: "1, Click ",
t82: " to open the plug-in directory",
t83: "2, Close all open Orca Slicer",
t83: "2, Close all open CreatBot",
t84: "3, Delete all files under the plug-in directory",
t85: "4, Reopen Orca Slicer and install the plug-in again",
t85: "4, Reopen CreatBot and install the plug-in again",
t86: "Close",
t87: "User Manual",
t88: "Remove",
@ -112,8 +112,8 @@ var LangText = {
orca5: "Enable Stealth Mode.",
},
ca_ES: {
t1: "Benvingut a Orca Slicer",
t2: "Orca Slicer es configurarà en diversos passos. Comencem!",
t1: "Benvingut a CreatBot",
t2: "CreatBot es configurarà en diversos passos. Comencem!",
t3: "Acord de l'Usuari",
t4: "No accepto",
t5: "Accepto",
@ -158,7 +158,7 @@ var LangText = {
t50: "Tancar sessió",
t52: "Saltar",
t53: "Unir-se",
t54: "A la comunitat d'Impressió 3D, aprenem dels èxits i fracassos dels altres per ajustar els nostres propis paràmetres i configuracions de laminació. Orca Slicer segueix el mateix principi i utilitza l'aprenentatge automàtic per millorar el seu rendiment a partir dels èxits i fracassos d'un gran nombre d'impressions dels nostres usuaris. Estem entrenant Orca Slicer per ser més intel·ligent alimentant-lo amb dades del món real. Si estàs disposat, aquest servei accedirà a informació dels teus registres d'errors i registres d'ús, que poden incloure informació descrita a la ",
t54: "A la comunitat d'Impressió 3D, aprenem dels èxits i fracassos dels altres per ajustar els nostres propis paràmetres i configuracions de laminació. CreatBot segueix el mateix principi i utilitza l'aprenentatge automàtic per millorar el seu rendiment a partir dels èxits i fracassos d'un gran nombre d'impressions dels nostres usuaris. Estem entrenant CreatBot per ser més intel·ligent alimentant-lo amb dades del món real. Si estàs disposat, aquest servei accedirà a informació dels teus registres d'errors i registres d'ús, que poden incloure informació descrita a la ",
t55: "Política de Privacitat",
t56: ". No recopilarem cap dada personal que pugui identificar directament o indirectament a un individu, incloent-hi noms, adreces, informació de pagament o números de telèfon. En habilitar aquest servei, acceptes aquests termes i la declaració sobre la Política de Privacitat.",
t57: "",
@ -187,9 +187,9 @@ var LangText = {
t80: "Prova els següents passos:",
t81: "1, Fes clic ",
t82: " per obrir el directori de connectors",
t83: "2, Tanca totes les Orca Slicer obertes",
t83: "2, Tanca totes les CreatBot obertes",
t84: "3, Elimina tots els fitxers del directori de connectors",
t85: "4, Reobre Orca Slicer i instal·la el connector de nou",
t85: "4, Reobre CreatBot i instal·la el connector de nou",
t86: "Tancar",
t87: "Manual de l'Usuari",
t88: "Eliminar",
@ -221,8 +221,8 @@ var LangText = {
orca2: "no hi ha informació del model"
},
es_ES: {
t1: "Bienvenido a Orca Slicer",
t2: "Va a configurar Orca Slicer mediante varios pasos. ¡Vamos a comenzar!",
t1: "Bienvenido a CreatBot",
t2: "Va a configurar CreatBot mediante varios pasos. ¡Vamos a comenzar!",
t3: "Terminos de usuario",
t4: "Estoy en desacuerdo",
t5: "Estoy de deacuerdo",
@ -267,7 +267,7 @@ var LangText = {
t50: "Desconectarse",
t52: "Saltar",
t53: "Ingresar",
t54: "En la comunidad de impresión 3D, pordemos aprender de los logros y los fallos de otros para obtener nuestros propios parametros y configuraciones de 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 ",
t54: "En la comunidad de impresión 3D, pordemos aprender de los logros y los fallos de otros para obtener nuestros propios parametros y configuraciones de CreatBot 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 CreatBot 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: "Política de privacidad",
t56: ". No recolectaremos ningún tipo de dato personal con el que se le pueda identificar directa o indirectamente, incluyendo nombre, direcciones, información de pago, o números de teléfono. Activando este servicio, si está de acuerdo en estos términos y los acuerdos sobre Política y Privacidad.",
t57: "",
@ -296,9 +296,9 @@ var LangText = {
t80: "Intente los siguientes pasos:",
t81: "1, Presionar ",
t82: " para abrir el directorio de complementos",
t83: "2, Cerrar todos los Orca Slicer abiertos",
t83: "2, Cerrar todos los CreatBot abiertos",
t84: "3, Borrar todos los archivos en el directorio de complementos",
t85: "4, Reabrir Orca Slicer e instalar el complemento de nuevo",
t85: "4, Reabrir CreatBot e instalar el complemento de nuevo",
t86: "Cerrar",
t87: "Manual de usuario",
t88: "Borrar",
@ -333,8 +333,8 @@ var LangText = {
orca5: "Activar Modo Invisible.",
},
de_DE: {
t1: "Willkommen im Orca Slicer",
t2: "Das Orca Slicer wird in mehreren Schritten eingerichtet. Lass uns anfangen!",
t1: "Willkommen im CreatBot",
t2: "Das CreatBot wird in mehreren Schritten eingerichtet. Lass uns anfangen!",
t3: "Nutzervereinbarung",
t4: "Ablehnen",
t5: "Zustimmen",
@ -379,7 +379,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. 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 ",
t54: "In der 3D-Druck-Community lernen wir aus den Erfolgen und Misserfolgen der anderen Benutzer, um unsere eigenen Schneideparameter und Einstellungen anzupassen. CreatBot folgt demselben Prinzip und verbessert seine Leistung durch die Erfolge und Misserfolge der Vielzahl von Drucken unserer Benutzer mittels maschinellem Lernen. Wir trainieren CreatBot, 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: "",
@ -408,9 +408,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 Orca Slicer",
t83: "2, Schließen Sie alle geöffneten CreatBot",
t84: "3, Löschen Sie alle Dateien im Plug-in-Verzeichnis",
t85: "4, Öffnen Sie Orca Slicer erneut und installieren Sie das Plug-in erneut",
t85: "4, Öffnen Sie CreatBot erneut und installieren Sie das Plug-in erneut",
t86: "Schließen",
t87: "Benutzerhandbuch",
t88: "Entfernen",
@ -435,8 +435,8 @@ var LangText = {
orca2: "no model information",
},
cs_CZ: {
t1: "Vítejte v Orca Slicer",
t2: "Orca Slicer bude nastaven v několika krocích. Začněme!",
t1: "Vítejte v CreatBot",
t2: "CreatBot bude nastaven v několika krocích. Začněme!",
t3: "Uživatelská smlouva",
t4: "Nesouhlasím",
t5: "Souhlasím",
@ -481,7 +481,7 @@ var LangText = {
t50: "Odhlásit se",
t52: "Přeskočit",
t53: "Připojit se",
t54: "V komunitě 3D tisku se ze vzájemných úspěchů a neúspěchů učíme upravovat vlastní parametry a nastavení krájení. Orca Slicer se řídí stejným principem a využívá strojové učení ke zlepšení svého výkonu na základě úspěchů a neúspěchů počet výtisků našimi uživateli. Orca Slicer školíme, aby byl chytřejší tím, že jim poskytuje data z reálného světa. Pokud budete chtít, bude tato služba přistupovat k informacím z vašich protokolů chyb a protokolů použití, které mohou zahrnovat informace popsané v ",
t54: "V komunitě 3D tisku se ze vzájemných úspěchů a neúspěchů učíme upravovat vlastní parametry a nastavení krájení. CreatBot se řídí stejným principem a využívá strojové učení ke zlepšení svého výkonu na základě úspěchů a neúspěchů počet výtisků našimi uživateli. CreatBot školíme, aby byl chytřejší tím, že jim poskytuje data z reálného světa. Pokud budete chtít, bude tato služba přistupovat k informacím z vašich protokolů chyb a protokolů použití, které mohou zahrnovat informace popsané v ",
t55: "Zásady ochrany osobních údajů",
t56: ". Nebudeme shromažďovat žádné osobní údaje, pomocí kterých lze přímo nebo nepřímo identifikovat jednotlivce, včetně jmen, adres, platebních údajů nebo telefonních čísel. Povolením této služby souhlasíte s těmito podmínkami a prohlášení o zásadách ochrany osobních údajů.",
t57: "",
@ -510,9 +510,9 @@ var LangText = {
t80: "Zkuste následující kroky:",
t81: "1, klikněte",
t82: "otevřete adresář plug-in",
t83: "2, Zavřete všechny otevřené Orca Slicer",
t83: "2, Zavřete všechny otevřené CreatBot",
t84: "3, Smažte všechny soubory v adresáři plug-in",
t85: "4, znovu otevřete Orca Slicer a znovu nainstalujte zásuvný modul",
t85: "4, znovu otevřete CreatBot a znovu nainstalujte zásuvný modul",
t86: "Zavřít",
t87: "Uživatelská příručka",
t88: "Odstranit",
@ -537,8 +537,8 @@ var LangText = {
orca2: "no model information",
},
fr_FR: {
t1: "Bienvenue sur Orca Slicer",
t2: "Orca Slicer sera configuré en plusieurs étapes. Commençons !",
t1: "Bienvenue sur CreatBot",
t2: "CreatBot sera configuré en plusieurs étapes. Commençons !",
t3: "Accord d'utilisation",
t4: "Décliner",
t5: "Accepter",
@ -583,7 +583,7 @@ var LangText = {
t50: "Se déconnecter",
t52: "Passer",
t53: "Rejoindre",
t54: "Dans la communauté de l'impression 3D, nous apprenons des succès et des échecs des uns et des autres pour ajuster nos propres paramètres et paramètres de découpage. 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 de nos utilisateurs. Nous formons Orca Slicer à être plus intelligent en leur fournissant les données du monde réel. Si vous le souhaitez, ce service accédera aux informations de vos journaux d'erreurs et de vos journaux 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 uns et des autres pour ajuster nos propres paramètres et paramètres de découpage. CreatBot 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 de nos utilisateurs. Nous formons CreatBot à être plus intelligent en leur fournissant les données du monde réel. Si vous le souhaitez, ce service accédera aux informations de vos journaux d'erreurs et de vos journaux d'utilisation, qui peuvent inclure des informations décrites dans ",
t55: "Politique de confidentialité",
t56: ". Nous ne collecterons aucune donnée personnelle par laquelle un individu peut être identifié 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: "",
@ -612,9 +612,9 @@ var LangText = {
t80: "Essayez les étapes suivantes :",
t81: "1, Cliquez ",
t82: " pour ouvrir le répertoire des plug-ins",
t83: "2, Fermez toutes les fenêtres de Orca Slicer",
t83: "2, Fermez toutes les fenêtres de CreatBot",
t84: "3, Supprimez tous les fichiers dans le répertoire du plug-in",
t85: "4, Relancez Orca Slicer et réinstallez le plug-in.",
t85: "4, Relancez CreatBot et réinstallez le plug-in.",
t86: "Fermer",
t87: "Manuel d'utilisation",
t88: "Supprimer",
@ -641,29 +641,29 @@ var LangText = {
orca1: "Modifier les informations du projet",
orca2: "pas d'information sur le modèle",
wk1: "Démarrage rapide",
wk2: "Cet article présente l'utilisation la plus basique de Orca Slicer. Il guide les utilisateurs pour configurer le logiciel, créer des projets et effectuer la première tâche d'impression étape par étape.",
wk2: "Cet article présente l'utilisation la plus basique de CreatBot. Il guide les utilisateurs pour configurer le logiciel, créer des projets et effectuer la première tâche d'impression étape par étape.",
wk3: "Workflow basé sur des projets",
wk4: "Orca Slicer met en avant un workflow de pointe pour véritablement réaliser un projet « tout en un ». Basé sur le format de projet 3MF grand public, il fournit une série de nouvelles fonctionnalités révolutionnaires, telles que la prise en charge de plusieurs plaques, un gestionnaire de ressources de projet et une vue d'assemblage/de pièce. Cela améliore considérablement l'efficacité des créateurs et des utilisateurs réguliers",
wk4: "CreatBot met en avant un workflow de pointe pour véritablement réaliser un projet « tout en un ». Basé sur le format de projet 3MF grand public, il fournit une série de nouvelles fonctionnalités révolutionnaires, telles que la prise en charge de plusieurs plaques, un gestionnaire de ressources de projet et une vue d'assemblage/de pièce. Cela améliore considérablement l'efficacité des créateurs et des utilisateurs réguliers",
wk5: "Impression haute vitesse de qualité",
wk6: "Il est difficile d'imprimer à grande vitesse tout en maintenant une qualité élevée. Orca Slicer rend cela possible. « Arch Move » permet à la hotend de se déplacer en douceur et réduit les vibrations de la machine. Le refroidissement intelligent est basé sur des paramètres de refroidissement affinés pour chaque type de filament. Le « ralentissement automatique » pour les paroies en porte-à-faux permet d'éviter la déformation à grande vitesse.",
wk6: "Il est difficile d'imprimer à grande vitesse tout en maintenant une qualité élevée. CreatBot rend cela possible. « Arch Move » permet à la hotend de se déplacer en douceur et réduit les vibrations de la machine. Le refroidissement intelligent est basé sur des paramètres de refroidissement affinés pour chaque type de filament. Le « ralentissement automatique » pour les paroies en porte-à-faux permet d'éviter la déformation à grande vitesse.",
wk7: "Impression multi-couleur",
wk8: "Orca Slicer fournit des outils de colorisation polyvalents pour créer un modèle coloré. Vous pouvez librement ajouter/supprimer des filaments dans un projet et coloriser votre modèle avec différents pinceaux. Avant l'impression, chaque filament sera automatiquement mappé sur un emplacement AMS, sans avoir besoin de modifier manuellement le placement de la bobine dans l'AMS.",
wk8: "CreatBot fournit des outils de colorisation polyvalents pour créer un modèle coloré. Vous pouvez librement ajouter/supprimer des filaments dans un projet et coloriser votre modèle avec différents pinceaux. Avant l'impression, chaque filament sera automatiquement mappé sur un emplacement AMS, sans avoir besoin de modifier manuellement le placement de la bobine dans l'AMS.",
wk9: "Guide de réglage des paramètres de découpage",
wk10: "Les fonctionnalités de gestion des paramètres de Orca Slicer offrent un contrôle très flexible et puissant sur le processus de découpage. Cet article présente l'organisation des paramètres et fournit quelques compétences pour tirer pleinement parti de ces fonctionnalités.",
wk10: "Les fonctionnalités de gestion des paramètres de CreatBot offrent un contrôle très flexible et puissant sur le processus de découpage. Cet article présente l'organisation des paramètres et fournit quelques compétences pour tirer pleinement parti de ces fonctionnalités.",
wk11: "Contrôle et surveillance à distance",
wk12: "Orca Slicer prend en charge l'envoi du travail d'impression à votre imprimante via le réseau WAN/LAN, contrôlant et surveillant chaque aspect de votre imprimante 3D et des travaux d'impression. Si vous avez plusieurs imprimantes, vous pouvez facilement basculer entre elles dans la liste des périphériques.",
wk12: "CreatBot prend en charge l'envoi du travail d'impression à votre imprimante via le réseau WAN/LAN, contrôlant et surveillant chaque aspect de votre imprimante 3D et des travaux d'impression. Si vous avez plusieurs imprimantes, vous pouvez facilement basculer entre elles dans la liste des périphériques.",
wk13: "Format STEP",
wk14: "Par rapport au format STL, le format STEP apporte des informations plus efficaces. Grâce à la grande précision de ce format, de nombreuses trajectoires d'extrusion peuvent être générées sous forme d'arcs. Il inclut également la relation d'assemblage de chaque pièce d'un modèle, qui peut être utilisée pour restaurer la vue d'assemblage après la coupe d'un modèle.",
wk15: "Texte 3D",
wk16: "Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Orca Slicer fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité.",
wk16: "Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. CreatBot fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité.",
},
zh_CN: {
t1: "欢迎使用Orca Slicer",
t2: "Orca Slicer需要几步安装步骤,让我们开始吧!",
t1: "欢迎使用CreatBot",
t2: "CreatBot需要几步安装步骤,让我们开始吧!",
t3: "用户使用协议",
t4: "拒绝",
t5: "同意",
t6: "帮助提升Orca Slicer性能",
t6: "帮助提升CreatBot性能",
t7: "允许发送匿名数据",
t8: "上一步",
t9: "下一步",
@ -704,7 +704,7 @@ var LangText = {
t50: "退出登录",
t52: "忽略",
t53: "同意",
t54: "在3D打印社区我们从彼此的成功和失败中学习调整自己的切片参数和设置。Orca Slicer遵循同样的原则,通过机器学习的方式从大量用户打印的成功和失败中获取经验,从而改善打印性能。我们正在通过向Orca Slicer提供真实世界的数据来训练他们变得更聪明。如果您愿意,此服务将访问您的错误日志和使用日志中的信息,其中可能包括",
t54: "在3D打印社区我们从彼此的成功和失败中学习调整自己的切片参数和设置。CreatBot遵循同样的原则,通过机器学习的方式从大量用户打印的成功和失败中获取经验,从而改善打印性能。我们正在通过向CreatBot提供真实世界的数据来训练他们变得更聪明。如果您愿意,此服务将访问您的错误日志和使用日志中的信息,其中可能包括",
t55: "隐私政策",
t56: "中描述的信息。我们不会收集任何可以直接或间接识别个人的个人数据,包括但不限于姓名、地址、支付信息或电话号码。启用此服务即表示您同意这些条款和有关隐私政策的声明。",
t57: "",
@ -733,9 +733,9 @@ var LangText = {
t80: "请尝试如下步骤:",
t81: "1, 点击",
t82: "打开插件所在目录",
t83: "2, 关闭所有Orca Slicer",
t83: "2, 关闭所有CreatBot",
t84: "3, 删除插件所在目录下的所有文件",
t85: "4, 重新启动Orca Slicer并尝试安装插件",
t85: "4, 重新启动CreatBot并尝试安装插件",
t86: "关闭",
t87: "使用引导",
t88: "移除",
@ -764,31 +764,31 @@ var LangText = {
t112: "加入该计划",
t113: "您可以随时更改您的偏好。",
wk1: "快速入门指南",
wk2: "本文介绍了Orca Slicer的最基本用法。它指导用户配置软件,创建项目,并逐步完成第一个打印任务。",
wk2: "本文介绍了CreatBot的最基本用法。它指导用户配置软件,创建项目,并逐步完成第一个打印任务。",
wk3: "基于项目的工作流",
wk4: "Orca Slicer提出了领先的工作流程真正实现了“一体化”项目。基于主流的3MF项目格式它提供了一系列革命性的新功能如支持多盘、项目资源管理器和装配/零件视图。它可以大幅提高模型创作者及普通用户的使用效率。",
wk4: "CreatBot提出了领先的工作流程真正实现了“一体化”项目。基于主流的3MF项目格式它提供了一系列革命性的新功能如支持多盘、项目资源管理器和装配/零件视图。它可以大幅提高模型创作者及普通用户的使用效率。",
wk5: "质量卓越的高速打印",
wk6: "在保持高质量的前提下进行高速打印是非常具有挑战性的。Orca Slicer让这一切发生。支持“圆弧移动”特性使工具头移动更加顺滑,有效减少机器振动。基于不同材料类型的精细标定过的冷却控制参数,使得冷却过程可以自动开展。在悬垂区域进行“自动减速”,可防止高速打印时在此区域的外观瑕疵。",
wk6: "在保持高质量的前提下进行高速打印是非常具有挑战性的。CreatBot让这一切发生。支持“圆弧移动”特性使工具头移动更加顺滑,有效减少机器振动。基于不同材料类型的精细标定过的冷却控制参数,使得冷却过程可以自动开展。在悬垂区域进行“自动减速”,可防止高速打印时在此区域的外观瑕疵。",
wk7: "多色打印",
wk8: "Orca Slicer提供了多种着色工具来制作彩色模型。您可以在项目中自由添加/移除打印材料并使用不同的笔刷为模型着色。开始打印时打印任务中的各个材料将自动映射到匹配的AMS槽位无需手动调整AMS中的料卷位置。",
wk8: "CreatBot提供了多种着色工具来制作彩色模型。您可以在项目中自由添加/移除打印材料并使用不同的笔刷为模型着色。开始打印时打印任务中的各个材料将自动映射到匹配的AMS槽位无需手动调整AMS中的料卷位置。",
wk9: "切片参数设置指南",
wk10: "Orca Slicer中的参数管理功能为切片过程提供了非常灵活和强大的控制。本文介绍了切片参数的组织分类和设置方法,并提供了一些使用技巧。",
wk10: "CreatBot中的参数管理功能为切片过程提供了非常灵活和强大的控制。本文介绍了切片参数的组织分类和设置方法,并提供了一些使用技巧。",
wk11: "远程控制和监控",
wk12: "Orca Slicer支持通过WAN/LAN网络向打印机发送打印任务控制和查看3D打印机和打印任务的各个方面。如果您有多台打印机还可以在设备列表中轻松切换。",
wk12: "CreatBot支持通过WAN/LAN网络向打印机发送打印任务控制和查看3D打印机和打印任务的各个方面。如果您有多台打印机还可以在设备列表中轻松切换。",
wk13: "STEP格式",
wk14: "与STL相比STEP带来了更多有效的信息。由于STEP的高精度切片时可以生成更多的圆弧路径。STEP还包括模型每个零件的装配关系可分割模型后恢复装配视图。",
wk15: "3D文本",
wk16: "使用3D文本工具用户可以轻松地在项目中创建各种3D文本形状使模型更加个性化。Orca Slicer提供了数十种字体,并支持粗体和斜体样式,使文本具有更大的灵活性。",
wk16: "使用3D文本工具用户可以轻松地在项目中创建各种3D文本形状使模型更加个性化。CreatBot提供了数十种字体,并支持粗体和斜体样式,使文本具有更大的灵活性。",
orca1: "编辑项目信息",
orca2: "该模型没有相关信息",
},
zh_TW: {
t1: "歡迎使用 Orca Slicer",
t2: "Orca Slicer 需要幾步安裝步驟,讓我們開始吧!",
t1: "歡迎使用 CreatBot",
t2: "CreatBot 需要幾步安裝步驟,讓我們開始吧!",
t3: "使用者協議",
t4: "拒絕",
t5: "同意",
t6: "幫助提升 Orca Slicer 性能",
t6: "幫助提升 CreatBot 性能",
t7: "允許傳送匿名數據",
t8: "上一步",
t9: "下一步",
@ -829,7 +829,7 @@ var LangText = {
t50: "登出",
t52: "忽略",
t53: "同意",
t54: "在3D列印社區我們從彼此的成功和失敗中學習調整自己的切片參數和設置。Orca Slicer 遵循同樣的原則,透過機器學習的方式從大量用戶列印的成功和失敗中獲取經驗,從而改善列印性能。我們正在通過向 Orca Slicer 提供真實世界的數據來訓練他們變得更聰明。如果您願意,此服務將訪問您的錯誤日誌和使用日誌中的資訊,其中可能包括",
t54: "在3D列印社區我們從彼此的成功和失敗中學習調整自己的切片參數和設置。CreatBot 遵循同樣的原則,透過機器學習的方式從大量用戶列印的成功和失敗中獲取經驗,從而改善列印性能。我們正在通過向 CreatBot 提供真實世界的數據來訓練他們變得更聰明。如果您願意,此服務將訪問您的錯誤日誌和使用日誌中的資訊,其中可能包括",
t55: "隱私政策",
t56: "中描述的資訊。我們不會收集任何可以直接或間接識別個人的個人數據,包括但不限於姓名、地址、支付資訊或電話號碼。啟用此服務即表示您同意這些條款和有關隱私政策的聲明。",
t57: "",
@ -858,9 +858,9 @@ var LangText = {
t80: "請嘗試如下步驟:",
t81: "1, 點擊",
t82: "打開插件所在目錄",
t83: "2, 關閉所有 Orca Slicer",
t83: "2, 關閉所有 CreatBot",
t84: "3, 刪除插件所在目錄下的所有文件",
t85: "4, 重新啟動 Orca Slicer 並嘗試安裝插件",
t85: "4, 重新啟動 CreatBot 並嘗試安裝插件",
t86: "關閉",
t87: "使用引導",
t88: "移除",
@ -871,25 +871,25 @@ var LangText = {
orca1: "Edit Project Info",
orca2: "no model information",
wk1: "快速入門指南",
wk2: "本文介紹了 Orca Slicer 的最基本用法。它指導用戶配置軟體,創建項目,並逐步完成第一個列印任務。",
wk2: "本文介紹了 CreatBot 的最基本用法。它指導用戶配置軟體,創建項目,並逐步完成第一個列印任務。",
wk3: "基於項目的工作流",
wk4: "Orca Slicer 提出了領先的工作流程真正實現了“一體化”項目。基於主流的3MF項目格式它提供了一系列革命性的新功能如支持多盤、項目資源管理器和裝配/零件視圖。它可以大幅提高模型創作者及普通用戶的使用效率。",
wk4: "CreatBot 提出了領先的工作流程真正實現了“一體化”項目。基於主流的3MF項目格式它提供了一系列革命性的新功能如支持多盤、項目資源管理器和裝配/零件視圖。它可以大幅提高模型創作者及普通用戶的使用效率。",
wk5: "質量卓越的高速列印",
wk6: "在保持高品質的前提下進行高速列印是非常具有挑戰性的。Orca Slicer 讓這一切發生。支持“圓弧移動”特性使工具頭移動更加順滑,有效減少機器振動。基於不同線材類型的精細標定過的冷卻控制參數,使得冷卻過程可以自動開展。在懸垂區域進行“自動減速”,可防止高速列印時在此區域的外觀瑕疵。",
wk6: "在保持高品質的前提下進行高速列印是非常具有挑戰性的。CreatBot 讓這一切發生。支持“圓弧移動”特性使工具頭移動更加順滑,有效減少機器振動。基於不同線材類型的精細標定過的冷卻控制參數,使得冷卻過程可以自動開展。在懸垂區域進行“自動減速”,可防止高速列印時在此區域的外觀瑕疵。",
wk7: "多色列印",
wk8: "Orca Slicer 提供了多種著色工具來製作彩色模型。您可以在項目中自由添加/移除列印材料,並使用不同的筆刷為模型著色。開始列印時,列印任務中的各個線材將自動映射對應到 AMS 槽位,無需手動調整 AMS 中的線材位置。",
wk8: "CreatBot 提供了多種著色工具來製作彩色模型。您可以在項目中自由添加/移除列印材料,並使用不同的筆刷為模型著色。開始列印時,列印任務中的各個線材將自動映射對應到 AMS 槽位,無需手動調整 AMS 中的線材位置。",
wk9: "切片參數設置指南",
wk10: "Orca Slicer 中的參數管理功能為切片過程提供了非常靈活和強大的控制。本文介紹了切片參數的組織分類和設置方法,並提供了一些使用技巧。",
wk10: "CreatBot 中的參數管理功能為切片過程提供了非常靈活和強大的控制。本文介紹了切片參數的組織分類和設置方法,並提供了一些使用技巧。",
wk11: "遠端控制和監控",
wk12: "Orca Slicer 支持透過無線網路/區域網路向3D列印機發送列印任務,控制和查看3D列印機和列印任務的各個方面。如果您有多台3D列印機,還可以在設備清單中輕鬆切換。",
wk12: "CreatBot 支持透過無線網路/區域網路向3D列印機發送列印任務,控制和查看3D列印機和列印任務的各個方面。如果您有多台3D列印機,還可以在設備清單中輕鬆切換。",
wk13: "STEP格式",
wk14: "與 STL 相比STEP 帶來了更多有效的資訊。由於 STEP 的高精度切片時可以生成更多的圓弧路徑。STEP 還包括模型每個零件的組裝關係,可分割模型後恢復裝配視圖。",
wk15: "3D文本",
wk16: "使用3D文字工具,使用者可以輕鬆地在項目中建立各種3D文字形狀,使模型更加個性化。Orca Slicer 提供了數十種字體,並支援粗體和斜體樣式,使文字具有更大的靈活性。",
wk16: "使用3D文字工具,使用者可以輕鬆地在項目中建立各種3D文字形狀,使模型更加個性化。CreatBot 提供了數十種字體,並支援粗體和斜體樣式,使文字具有更大的靈活性。",
},
ru_RU: {
t1: "Приветствуем в Orca Slicer!",
t2: "Для настройка Orca Slicer необходимо пройти несколько этапов. Давайте начнём!",
t1: "Приветствуем в CreatBot!",
t2: "Для настройка CreatBot необходимо пройти несколько этапов. Давайте начнём!",
t3: "Пользовательское соглашение",
t4: "Отказаться",
t5: "Принять",
@ -934,7 +934,7 @@ var LangText = {
t50: "Выйти",
t52: "Пропустить",
t53: "Войти",
t54: "В сообществе 3D-печатников для выявления наилучших параметров нарезки и улучшения печати мы учимся на успехах и неудачах друг друга. Orca Slicer следует тому же принципу и использует машинное обучение для улучшения своей работы на основе успешных и неудачных печатей наших пользователей. Мы обучаем Orca Slicer быть умнее на основе реальных данных. По вашему согласию эта служба получит доступ к вашим журналам ошибок и журналам использования, в которых содержатся сведения, описанные в ",
t54: "В сообществе 3D-печатников для выявления наилучших параметров нарезки и улучшения печати мы учимся на успехах и неудачах друг друга. CreatBot следует тому же принципу и использует машинное обучение для улучшения своей работы на основе успешных и неудачных печатей наших пользователей. Мы обучаем CreatBot быть умнее на основе реальных данных. По вашему согласию эта служба получит доступ к вашим журналам ошибок и журналам использования, в которых содержатся сведения, описанные в ",
t55: "политике конфиденциальности",
t56: ". Мы не собираем никаких личных данных, которые могут прямо или косвенно идентифицировать отдельного человека, включая, помимо прочего, имена, адреса, платежную информацию или номера телефонов. Соглашаясь с включением данной службы, вы соглашаетесь с этими условиями и заявлением о политике конфиденциальности.",
t57: "",
@ -963,9 +963,9 @@ var LangText = {
t80: "Попробуйте выполнить следующие действия:",
t81: "1, Нажмите ",
t82: " чтобы открыть папку плагинов",
t83: "2, Закрыть все открытые Orca Slicer",
t83: "2, Закрыть все открытые CreatBot",
t84: "3, Удалить все файлы в папке плагина",
t85: "4, Откройте Orca Slicer и снова установите подключаемый модуль.",
t85: "4, Откройте CreatBot и снова установите подключаемый модуль.",
t86: "Закрыть",
t87: "Инструкции",
t88: "Удалить",
@ -1000,8 +1000,8 @@ var LangText = {
orca5: "Включить режим конфиденциальности"
},
ko_KR: {
t1: "Orca Slicer에 오신 것을 환영합니다",
t2: "Orca Slicer는 여러 단계로 설정됩니다. 시작!",
t1: "CreatBot에 오신 것을 환영합니다",
t2: "CreatBot는 여러 단계로 설정됩니다. 시작!",
t3: "사용자 약관",
t4: "거부",
t5: "동의",
@ -1046,7 +1046,7 @@ var LangText = {
t50: "로그 아웃",
t52: "건너뛰기",
t53: "가입",
t54: "3D 프린팅 커뮤니티에서 우리는 각자의 슬라이싱 매개변수와 설정을 조정하는 과정에서 서로의 성공과 실패를 통해 배웁니다. Orca Slicer는 동일한 원칙을 따르며 기계 학습을 사용하여 사용자의 방대한 출력물의 성공과 실패를 통해 성능을 향상시킵니다. 우리는 실제 데이터를 제공하여 Orca Slicer가 더욱 똑똑해지도록 교육하고 있습니다. 귀하가 원할 경우 이 서비스는 오류 로그 및 사용 로그의 정보에 액세스합니다. 여기에는 다음에 설명된 정보가 포함될 수 있습니다.",
t54: "3D 프린팅 커뮤니티에서 우리는 각자의 슬라이싱 매개변수와 설정을 조정하는 과정에서 서로의 성공과 실패를 통해 배웁니다. CreatBot는 동일한 원칙을 따르며 기계 학습을 사용하여 사용자의 방대한 출력물의 성공과 실패를 통해 성능을 향상시킵니다. 우리는 실제 데이터를 제공하여 CreatBot가 더욱 똑똑해지도록 교육하고 있습니다. 귀하가 원할 경우 이 서비스는 오류 로그 및 사용 로그의 정보에 액세스합니다. 여기에는 다음에 설명된 정보가 포함될 수 있습니다.",
t55: "개인 정보 정책",
t56: ". 당사는 이름, 주소, 결제 정보 또는 전화번호를 포함하되 이에 국한되지 않고 개인을 직간접적으로 식별할 수 있는 개인 데이터를 수집하지 않습니다. 이 서비스를 활성화함으로써 귀하는 본 약관과 개인정보 보호정책에 대한 설명에 동의하게 됩니다.",
t57: "",
@ -1075,9 +1075,9 @@ var LangText = {
t80: "다음 단계를 시도해 보세요:",
t81: "1, 클릭 ",
t82: " 하여 플러그인 디렉토리를 엽니다.",
t83: "2, 열려 있는 모든 Orca Slicer를 닫습니다.",
t83: "2, 열려 있는 모든 CreatBot를 닫습니다.",
t84: "3, 플러그인 디렉터리 아래의 모든 파일 삭제합니다",
t85: "4, Orca Slicer를 다시 열고 플러그인을 다시 설치하세요.",
t85: "4, CreatBot를 다시 열고 플러그인을 다시 설치하세요.",
t86: "닫기",
t87: "사용자 메뉴얼",
t88: "제거",
@ -1091,7 +1091,7 @@ var LangText = {
orca2: "no model information",
},
tr_TR: {
t1: "Orca Slicer'a hoş geldiniz",
t1: "CreatBot'a hoş geldiniz",
t2: "Orca Dilimleyici birkaç adımda kurulacaktır. Hadi başlayalım!",
t3: "Kullanıcı Sözleşmesi",
t4: "Reddet",
@ -1137,7 +1137,7 @@ var LangText = {
t50: ıkış Yap",
t52: "Atla",
t53: "Katıl",
t54: "3D Baskı topluluğunda, kendi dilimleme parametrelerimizi ve ayarlarımızı düzenlerken birbirimizin başarılarından ve başarısızlıklarından öğreniyoruz. Orca Slicer da aynı prensibi takip ediyor ve kullanıcılarımızın yaptığı çok sayıda baskının başarı ve başarısızlıklarından performansını artırmak için makine öğrenimini kullanıyor. Orca Slicer'ı gerçek dünya verileriyle besleyerek daha akıllı olması için eğitiyoruz. İsterseniz bu hizmet, hata günlüklerinizden ve kullanım günlüklerinizden, burada açıklanan bilgileri de içerebilecek bilgilere erişecektir. ",
t54: "3D Baskı topluluğunda, kendi dilimleme parametrelerimizi ve ayarlarımızı düzenlerken birbirimizin başarılarından ve başarısızlıklarından öğreniyoruz. CreatBot da aynı prensibi takip ediyor ve kullanıcılarımızın yaptığı çok sayıda baskının başarı ve başarısızlıklarından performansını artırmak için makine öğrenimini kullanıyor. CreatBot'ı gerçek dünya verileriyle besleyerek daha akıllı olması için eğitiyoruz. İsterseniz bu hizmet, hata günlüklerinizden ve kullanım günlüklerinizden, burada açıklanan bilgileri de içerebilecek bilgilere erişecektir. ",
t55: "Gizlilik Politikası",
t56: ". İsimler, adresler, ödeme bilgileri veya telefon numaraları dahil ancak bunlarla sınırlı olmamak üzere, bir bireyin doğrudan veya dolaylı olarak tanımlanmasını sağlayacak hiçbir Kişisel Veri toplamayacağız. Bu hizmeti etkinleştirerek bu şartları ve Gizlilik Politikasına ilişkin beyanı kabul etmiş olursunuz.",
t57: "",
@ -1166,9 +1166,9 @@ var LangText = {
t80: "Aşağıdaki adımları deneyin:",
t81: "1, Eklenti ",
t82: " dizinini açmak için tıklayın",
t83: "2, Tüm açık Orca slicerı kapatın",
t83: "2, Tüm açık CreatBotı kapatın",
t84: "3, Eklenti dizini altındaki tüm dosyaları silin",
t85: "4, Orca Slicer'ı yeniden açın ve eklentiyi tekrar yükleyin",
t85: "4, CreatBot'ı yeniden açın ve eklentiyi tekrar yükleyin",
t86: "Kapat",
t87: "Kullanım kılavuzu",
t88: "Kaldır",
@ -1200,8 +1200,8 @@ var LangText = {
orca2: "model bilgisi yok",
},
pl_PL: {
t1: "Witamy w Orca Slicer",
t2: "Orca Slicer zostanie skonfigurowany w kilku krokach. Zacznijmy!",
t1: "Witamy w CreatBot",
t2: "CreatBot zostanie skonfigurowany w kilku krokach. Zacznijmy!",
t3: "Umowa użytkownika",
t4: "Nie zgadzam się",
t5: "Zgadzam się",
@ -1246,7 +1246,7 @@ var LangText = {
t50: "Wyloguj",
t52: "Pomiń",
t53: "Dołącz",
t54: "W społeczności druku 3D uczymy się od sukcesów i porażek innych, aby dostosować nasze własne parametry i ustawienia krojenia. Orca Slicer podąża tą samą zasadą i wykorzystuje uczenie maszynowe do poprawy swojej wydajności na podstawie sukcesów i porażek dużej liczby wydruków naszych użytkowników. Szkolimy Orca Slicer, aby był mądrzejszy, dostarczając mu danych z rzeczywistego świata. Jeśli chcesz, ta usługa uzyska dostęp do informacji z Twoich logów błędów i logów użytkowania, które mogą zawierać informacje opisane w ",
t54: "W społeczności druku 3D uczymy się od sukcesów i porażek innych, aby dostosować nasze własne parametry i ustawienia krojenia. CreatBot podąża tą samą zasadą i wykorzystuje uczenie maszynowe do poprawy swojej wydajności na podstawie sukcesów i porażek dużej liczby wydruków naszych użytkowników. Szkolimy CreatBot, aby był mądrzejszy, dostarczając mu danych z rzeczywistego świata. Jeśli chcesz, ta usługa uzyska dostęp do informacji z Twoich logów błędów i logów użytkowania, które mogą zawierać informacje opisane w ",
t55: "Polityka Prywatności",
t56: ". Nie będziemy zbierać żadnych Danych Osobowych, przez które można bezpośrednio lub pośrednio zidentyfikować osobę, w tym bez ograniczeń nazwisk, adresów, informacji o płatnościach lub numerów telefonów. Aktywując tę usługę, zgadzasz się na te warunki i oświadczenie dotyczące Polityki Prywatności.",
t57: "",
@ -1275,9 +1275,9 @@ var LangText = {
t80: "Spróbuj następujących kroków:",
t81: "1, Kliknij ",
t82: " aby otworzyć katalog wtyczek",
t83: "2, Zamknij wszystkie otwarte Orca Slicer",
t83: "2, Zamknij wszystkie otwarte CreatBot",
t84: "3, Usuń wszystkie pliki z katalogu wtyczek",
t85: "4, Ponownie otwórz Orca Slicer i zainstaluj wtyczkę ponownie",
t85: "4, Ponownie otwórz CreatBot i zainstaluj wtyczkę ponownie",
t86: "Zamknij",
t87: "Instrukcja użytkownika",
t88: "Usuń",
@ -1312,8 +1312,8 @@ var LangText = {
orca5: "Włącz tryb «Niewidzialny»",
},
pt_BR: {
t1: "Bem-vindo ao Orca Slicer",
t2: "Orca Slicer será configurado em algumas etapas. Vamos começar!",
t1: "Bem-vindo ao CreatBot",
t2: "CreatBot será configurado em algumas etapas. Vamos começar!",
t3: "Termos de Uso",
t4: "Discordo",
t5: "Concordo",
@ -1358,7 +1358,7 @@ var LangText = {
t50: "Desconectar",
t52: "Pular",
t53: "Juntar",
t54: "Na comunidade de Impressão 3D, aprendemos com os sucessos e falhas uns dos outros para ajustar nossos próprios parâmetros e configurações de fatiamento. O Orca Slicer segue o mesmo princípio e utiliza aprendizado de máquina para melhorar seu desempenho com base nos sucessos e falhas de um grande número de impressões realizadas por nossos usuários. Estamos treinando o Orca Slicer para ser mais inteligente, alimentando-o com dados do mundo real. Se você concordar, este serviço acessará informações de seus registros de erros e registros de uso, que podem incluir informações descritas em…",
t54: "Na comunidade de Impressão 3D, aprendemos com os sucessos e falhas uns dos outros para ajustar nossos próprios parâmetros e configurações de fatiamento. O CreatBot segue o mesmo princípio e utiliza aprendizado de máquina para melhorar seu desempenho com base nos sucessos e falhas de um grande número de impressões realizadas por nossos usuários. Estamos treinando o CreatBot para ser mais inteligente, alimentando-o com dados do mundo real. Se você concordar, este serviço acessará informações de seus registros de erros e registros de uso, que podem incluir informações descritas em…",
t55: "Política de Privacidade",
t56: ". Não coletaremos nenhum dado pessoal pelo qual um indivíduo possa ser identificado diretamente ou indiretamente, incluindo, sem limitação, nomes, endereços, informações de pagamento ou números de telefone. Ao habilitar este serviço, você concorda com estes termos e com a declaração sobre a Política de Privacidade.",
t57: "",
@ -1387,9 +1387,9 @@ var LangText = {
t80: "Tente os seguintes passos:",
t81: "1, Clique ",
t82: " para abrir a pasta do plug-in",
t83: "2, Feche totalmente o Orca Slicer",
t83: "2, Feche totalmente o CreatBot",
t84: "3, Delete todos os arquivos na pasta do plug-in",
t85: "4, Reabra o Orca Slicer e instale o plug-in novamente",
t85: "4, Reabra o CreatBot e instale o plug-in novamente",
t86: "Fechar",
t87: "Manual de Usuário",
t88: "Remover",

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 Orca Slicer</div>
<div id="STip" class="trans" tid="t2">Orca Slicer will be setup in several steps. Let's start!</div>
<div id="Title" class="trans" tid="t1">Welcome to CreatBot</div>
<div id="STip" class="trans" tid="t2">CreatBot 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>

View File

@ -22,7 +22,7 @@
<div id="FeatureText">
<div><a tid="t75" class="trans TextS1">Some printer vendors require proprietary plugins for communication with their printers. Please select the corresponding plugin if you use such printers.</a></div>
<div><a tid="t65" class="trans TextS1">Please be aware that these plugins are not developed or maintained by OrcaSlicer. They should be used at your own discretion and risk.</a></div>
<div><a tid="t65" class="trans TextS1">Please be aware that these plugins are not developed or maintained by CreatBot. They should be used at your own discretion and risk.</a></div>
<!-- <div><span class="TextPoint">●</span>&nbsp;&nbsp;<a tid="t65" class="trans" ></a></div>
<div><span class="TextPoint"></span>&nbsp;&nbsp;<a tid="t66" class="trans" ></a></div>

View File

@ -9,12 +9,12 @@ for %%a in (%*) do (
)
if %FULL_MODE%==1 (
.\tools\xgettext.exe --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 ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot
.\tools\xgettext.exe --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 ./localization/i18n/list.txt -o ./localization/i18n/CreatWare.pot
python scripts/HintsToPot.py ./resources ./localization/i18n
)
REM Print the current directory
echo %cd%
set pot_file="./localization/i18n/OrcaSlicer.pot"
set pot_file="./localization/i18n/CreatWare.pot"
REM Run the script for each .po file
for /r "./localization/i18n/" %%f in (*.po) do (
@ -26,10 +26,10 @@ goto :eof
set "file=%~1"
set "dir=%~dp1"
set "name=%~n1"
set "lang=%name:OrcaSlicer_=%"
set "lang=%name:=%"
if %FULL_MODE%==1 (
.\tools\msgmerge.exe -N -o "%file%" "%file%" "%pot_file%"
)
if not exist "./resources/i18n/%lang%" mkdir "./resources/i18n/%lang%"
.\tools\msgfmt.exe --check-format -o "./resources/i18n/%lang%/OrcaSlicer.mo" "%file%"
.\tools\msgfmt.exe --check-format -o "./resources/i18n/%lang%/CreatWare.mo" "%file%"
goto :eof

63
src/.gitattributes vendored
View File

@ -1,63 +0,0 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

363
src/.gitignore vendored
View File

@ -1,363 +0,0 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Mono auto generated files
mono_crash.*
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Oo]ut/
[Ll]og/
[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.13)
project(OrcaSlicer-native)
project(CreatWare-native)
add_subdirectory(build-utils)
add_subdirectory(admesh)
@ -103,70 +103,70 @@ if (SLIC3R_GUI)
endif()
if(ORCA_TOOLS)
# OrcaSlicer_profile_validator
add_executable(OrcaSlicer_profile_validator OrcaSlicer_profile_validator.cpp)
target_link_libraries(OrcaSlicer_profile_validator libslic3r boost_headeronly libcurl OpenSSL::SSL OpenSSL::Crypto)
target_compile_definitions(OrcaSlicer_profile_validator PRIVATE -DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8)
# CreatWare_profile_validator
add_executable(CreatWare_profile_validator CreatWare_profile_validator.cpp)
target_link_libraries(CreatWare_profile_validator libslic3r boost_headeronly libcurl OpenSSL::SSL OpenSSL::Crypto)
target_compile_definitions(CreatWare_profile_validator PRIVATE -DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8)
if(WIN32)
target_link_libraries(OrcaSlicer_profile_validator bcrypt.lib)
target_link_libraries(CreatWare_profile_validator bcrypt.lib)
endif()
endif()
# Create a slic3r executable
# Process mainfests for various platforms.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/OrcaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/OrcaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.manifest @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/CreatWare.rc.in ${CMAKE_CURRENT_BINARY_DIR}/CreatWare.rc @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/CreatWare.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/CreatWare.manifest @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
if (WIN32)
add_library(OrcaSlicer SHARED OrcaSlicer.cpp OrcaSlicer.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h)
add_library(CreatWare SHARED CreatWare.cpp CreatWare.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h)
else ()
add_executable(OrcaSlicer OrcaSlicer.cpp OrcaSlicer.hpp)
add_executable(CreatWare CreatWare.cpp CreatWare.hpp)
endif ()
if (MINGW)
target_link_options(OrcaSlicer PUBLIC "-Wl,-allow-multiple-definition")
set_target_properties(OrcaSlicer PROPERTIES PREFIX "")
target_link_options(CreatWare PUBLIC "-Wl,-allow-multiple-definition")
set_target_properties(CreatWare PROPERTIES PREFIX "")
endif (MINGW)
if (NOT WIN32 AND NOT APPLE)
# Binary name on unix like systems (Linux, Unix)
set_target_properties(OrcaSlicer PROPERTIES OUTPUT_NAME "orca-slicer")
set(SLIC3R_APP_CMD "orca-slicer")
set_target_properties(CreatWare PROPERTIES OUTPUT_NAME "CreatWare-slicer")
set(SLIC3R_APP_CMD "CreatWare-slicer")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
endif ()
target_link_libraries(OrcaSlicer libslic3r cereal::cereal)
target_link_libraries(CreatWare libslic3r cereal::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(OrcaSlicer "-liconv -framework IOKit" "-framework CoreFoundation" "-framework AVFoundation" "-framework AVKit" "-framework CoreMedia" "-framework VideoToolbox" -lc++)
target_link_libraries(CreatWare "-liconv -framework IOKit" "-framework CoreFoundation" "-framework AVFoundation" "-framework AVKit" "-framework CoreMedia" "-framework VideoToolbox" -lc++)
elseif (MSVC)
# Manifest is provided through OrcaSlicer.rc, don't generate your own.
# Manifest is provided through CreatWare.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(OrcaSlicer ${CMAKE_DL_LIBS} -lstdc++ Threads::Threads pangoft2-1.0)
target_link_libraries(CreatWare ${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(OrcaSlicer ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
target_link_libraries(OrcaSlicer libslic3r_gui)
# target_link_libraries(CreatWare ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
target_link_libraries(CreatWare libslic3r_gui)
if (MSVC)
# Generate debug symbols even in release mode.
target_link_options(OrcaSlicer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
target_link_libraries(OrcaSlicer user32.lib Setupapi.lib)
target_link_options(CreatWare PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
target_link_libraries(CreatWare user32.lib Setupapi.lib)
elseif (MINGW)
target_link_libraries(OrcaSlicer ws2_32 uxtheme setupapi)
target_link_libraries(CreatWare ws2_32 uxtheme setupapi)
elseif (APPLE)
target_link_libraries(OrcaSlicer "-framework OpenGL")
target_link_libraries(CreatWare "-framework OpenGL")
else ()
target_link_libraries(OrcaSlicer -ldl)
target_link_libraries(CreatWare -ldl)
endif ()
#if (WIN32)
# find_library(PSAPI_LIB NAMES Psapi)
# target_link_libraries(OrcaSlicer ${PSAPI_LIB})
# target_link_libraries(CreatWare ${PSAPI_LIB})
#endif ()
endif ()
@ -177,15 +177,15 @@ if (WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
endif()
add_executable(OrcaSlicer_app_gui WIN32 OrcaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc)
add_executable(CreatWare_app_gui WIN32 CreatWare_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/CreatWare.rc)
# Generate debug symbols even in release mode.
if(MSVC)
target_link_options(OrcaSlicer_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
target_link_options(CreatWare_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
endif()
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)
target_compile_definitions(CreatWare_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
add_dependencies(CreatWare_app_gui CreatWare)
set_target_properties(CreatWare_app_gui PROPERTIES OUTPUT_NAME "CreatWare-slicer")
target_link_libraries(CreatWare_app_gui PRIVATE boost_headeronly)
endif ()
# Link the resources dir to where Slic3r GUI expects it
@ -194,13 +194,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(COPY_DLLS ALL DEPENDS OrcaSlicer)
add_custom_target(COPY_DLLS ALL DEPENDS CreatWare)
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 OrcaSlicer POST_BUILD
add_custom_command(TARGET CreatWare POST_BUILD
COMMAND if exist "${WIN_CONF_OUTPUT_DIR}" "("
if not exist "${WIN_RESOURCES_SYMLINK}" "("
mklink /J "${WIN_RESOURCES_SYMLINK}" "${SLIC3R_RESOURCES_DIR_WIN}"
@ -212,15 +212,15 @@ if (WIN32)
endforeach ()
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
orcaslicer_copy_dlls(COPY_DLLS "Debug" "d" output_dlls_Debug)
CreatWare_copy_dlls(COPY_DLLS "Debug" "d" output_dlls_Debug)
elseif("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
orcaslicer_copy_dlls(COPY_DLLS "RelWithDebInfo" "" output_dlls_Release)
CreatWare_copy_dlls(COPY_DLLS "RelWithDebInfo" "" output_dlls_Release)
else()
orcaslicer_copy_dlls(COPY_DLLS "Release" "" output_dlls_Release)
CreatWare_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 OrcaSlicer POST_BUILD
add_custom_command(TARGET CreatWare 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
@ -231,13 +231,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 OrcaSlicer POST_BUILD
COMMAND ln -sf OrcaSlicer orca-slicer
WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
add_custom_command(TARGET CreatWare POST_BUILD
COMMAND ln -sf CreatWare CreatWare-slicer
WORKING_DIRECTORY "$<TARGET_FILE_DIR:CreatWare>"
VERBATIM)
else ()
add_custom_command(TARGET OrcaSlicer POST_BUILD
WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
add_custom_command(TARGET CreatWare POST_BUILD
WORKING_DIRECTORY "$<TARGET_FILE_DIR:CreatWare>"
VERBATIM)
endif ()
if (XCODE)
@ -249,16 +249,16 @@ else ()
endif ()
if (CMAKE_MACOSX_BUNDLE)
if (CMAKE_CONFIGURATION_TYPES)
set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/OrcaSlicer.app/Contents/Resources")
set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/CreatWare.app/Contents/Resources")
else()
set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.app/Contents/Resources")
set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/CreatWare.app/Contents/Resources")
endif()
set(MACOSX_BUNDLE_ICON_FILE Icon.icns)
set(MACOSX_BUNDLE_BUNDLE_NAME "OrcaSlicer")
set(MACOSX_BUNDLE_BUNDLE_NAME "CreatWare")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${SoftFever_VERSION})
set(MACOSX_BUNDLE_COPYRIGHT "Copyright(C) 2022-2024 Li Jiang All Rights Reserved")
endif()
add_custom_command(TARGET OrcaSlicer POST_BUILD
add_custom_command(TARGET CreatWare POST_BUILD
COMMAND ln -sfn "${SLIC3R_RESOURCES_DIR}" "${BIN_RESOURCES_DIR}"
COMMENT "Symlinking the resources directory into the build tree"
VERBATIM)
@ -278,11 +278,11 @@ endif()
message(STATUS "libslic3r-CMAKE_BUILD_TYPE: ${build_type}")
message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
if (WIN32)
install(TARGETS OrcaSlicer RUNTIME DESTINATION ".")
install(TARGETS CreatWare RUNTIME DESTINATION ".")
if (MSVC)
install(TARGETS OrcaSlicer_app_gui RUNTIME DESTINATION ".")
install(TARGETS CreatWare_app_gui RUNTIME DESTINATION ".")
endif ()
install(FILES ${output_dlls_${build_type}} DESTINATION ".")
else ()
install(TARGETS OrcaSlicer RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
install(TARGETS CreatWare RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
endif ()

View File

@ -69,7 +69,7 @@ using namespace nlohmann;
#include "libslic3r/Orient.hpp"
#include "libslic3r/PNGReadWrite.hpp"
#include "OrcaSlicer.hpp"
#include "CreatWare.hpp"
//BBS: add exception handler for win32
#include <wx/stdpaths.h>
#ifdef WIN32
@ -126,8 +126,8 @@ std::map<int, std::string> cli_errors = {
{CLI_OBJECT_ORIENT_FAILED, "An error occurred when auto-orienting object(s)."},
{CLI_MODIFIED_PARAMS_TO_PRINTER, "Found modified parameter in printer preset in the 3mf file, which should not be changed."},
{CLI_FILE_VERSION_NOT_SUPPORTED, "Unsupported 3MF version. Please make sure the 3MF file was created with the official version of Bambu Studio, not a beta version."},
{CLI_NO_SUITABLE_OBJECTS, "One of the plate is empty or has no object fully inside it. Please check that the 3mf contains no empty plate in Orca Slicer before uploading."},
{CLI_VALIDATE_ERROR, "There are some incorrect slicing parameters in the 3mf. Please verify the slicing of all plates in Orca Slicer before uploading."},
{CLI_NO_SUITABLE_OBJECTS, "One of the plate is empty or has no object fully inside it. Please check that the 3mf contains no empty plate in CreatWare before uploading."},
{CLI_VALIDATE_ERROR, "There are some incorrect slicing parameters in the 3mf. Please verify the slicing of all plates in CreatWare before uploading."},
{CLI_OBJECTS_PARTLY_INSIDE, "Some objects are located over the boundary of the heated bed."},
{CLI_EXPORT_CACHE_DIRECTORY_CREATE_FAILED, "Failed creating directory when exporting cache data."},
{CLI_EXPORT_CACHE_WRITE_FAILED, "Failed exporting cache data."},
@ -137,13 +137,13 @@ std::map<int, std::string> cli_errors = {
{CLI_SLICING_TIME_EXCEEDS_LIMIT, "Slicing time of a certain plate exceeds the limit. Please simplify the model or use a larger slicing layer height."},
{CLI_TRIANGLE_COUNT_EXCEEDS_LIMIT, "Triangle count of single plate exceeds the limit. Please simplify the model and try to upload again."},
{CLI_NO_SUITABLE_OBJECTS_AFTER_SKIP, "No printable objects to slice after skipping."},
{CLI_FILAMENT_NOT_MATCH_BED_TYPE, "Filaments are not compatible with the plate type. Please verify the slicing of all plates in Orca Slicer before uploading."},
{CLI_FILAMENTS_DIFFERENT_TEMP, "The temperature difference of the filaments used is too large. Please verify the slicing of all plates in Orca Slicer before uploading."},
{CLI_OBJECT_COLLISION_IN_SEQ_PRINT, "Object conflicts were detected when using print-by-object mode. Please verify the slicing of all plates in Orca Slicer before uploading."},
{CLI_OBJECT_COLLISION_IN_LAYER_PRINT, "Object conflicts were detected. Please verify the slicing of all plates in Orca Slicer before uploading."},
{CLI_SPIRAL_MODE_INVALID_PARAMS, "Some slicing parameters cannot work with Spiral Vase mode. Please solve the issue in Orca Slicer before uploading."},
{CLI_SLICING_ERROR, "Failed slicing the model. Please verify the slicing of all plates on Orca Slicer before uploading."},
{CLI_GCODE_PATH_CONFLICTS, " G-code conflicts detected after slicing. Please make sure the 3mf file can be successfully sliced in the latest Orca Slicer."}
{CLI_FILAMENT_NOT_MATCH_BED_TYPE, "Filaments are not compatible with the plate type. Please verify the slicing of all plates in CreatWare before uploading."},
{CLI_FILAMENTS_DIFFERENT_TEMP, "The temperature difference of the filaments used is too large. Please verify the slicing of all plates in CreatWare before uploading."},
{CLI_OBJECT_COLLISION_IN_SEQ_PRINT, "Object conflicts were detected when using print-by-object mode. Please verify the slicing of all plates in CreatWare before uploading."},
{CLI_OBJECT_COLLISION_IN_LAYER_PRINT, "Object conflicts were detected. Please verify the slicing of all plates in CreatWare before uploading."},
{CLI_SPIRAL_MODE_INVALID_PARAMS, "Some slicing parameters cannot work with Spiral Vase mode. Please solve the issue in CreatWare before uploading."},
{CLI_SLICING_ERROR, "Failed slicing the model. Please verify the slicing of all plates on CreatWare before uploading."},
{CLI_GCODE_PATH_CONFLICTS, " G-code conflicts detected after slicing. Please make sure the 3mf file can be successfully sliced in the latest CreatWare."}
};
typedef struct _sliced_plate_info{
@ -1038,7 +1038,7 @@ static void load_downward_settings_list_from_config(std::string config_file, std
int CLI::run(int argc, char **argv)
{
// Mark the main thread for the debugger and for runtime checks.
set_current_thread_name("orcaslicer_main");
set_current_thread_name("creatware_main");
// Save the thread ID of the main thread.
save_main_thread_id();
@ -1164,7 +1164,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 OrcaSlicer GUI soon";
BOOST_LOG_TRIVIAL(info) << "begin to launch CreatWare GUI soon";
return Slic3r::GUI::GUI_Run(params);
#else // SLIC3R_GUI
// No GUI support. Just print out a help.
@ -1184,7 +1184,7 @@ int CLI::run(int argc, char **argv)
}
global_begin_time = (long long)Slic3r::Utils::get_current_time_utc();
BOOST_LOG_TRIVIAL(warning) << boost::format("cli mode, Current OrcaSlicer Version %1%")%SLIC3R_VERSION;
BOOST_LOG_TRIVIAL(warning) << boost::format("cli mode, Current CreatWare Version %1%")%SLIC3R_VERSION;
//BBS: add plate data related logic
PlateDataPtrs plate_data_src;
@ -5947,17 +5947,17 @@ bool CLI::setup(int argc, char **argv)
detect_platform();
#ifdef WIN32
// 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,
// Notify user that a blacklisted DLL was injected into CreatWare process (for example Nahimic, see GH #5573).
// We hope that if a DLL is being injected into a CreatWare 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 OrcaSlicer process:\n\n";
std::wstring text = L"Following DLLs have been injected into the CreatWare process:\n\n";
text += BlacklistedLibraryCheck::get_instance().get_blacklisted_string();
text += L"\n\n"
L"OrcaSlicer is known to not run correctly with these DLLs injected. "
L"CreatWare 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 OrcaSlicer.\n"
L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes OrcaSlicer "
L"crashes or unexpected behaviour while using CreatWare.\n"
L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes CreatWare "
L"to crash on a secondary monitor";
MessageBoxW(NULL, text.c_str(), L"Warning"/*L"Incopatible library found"*/, MB_OK);
}
@ -6274,7 +6274,7 @@ LONG WINAPI VectoredExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo)
#if defined(_MSC_VER) || defined(__MINGW32__)
extern "C" {
__declspec(dllexport) int __stdcall orcaslicer_main(int argc, wchar_t **argv)
__declspec(dllexport) int __stdcall creatware_main(int argc, wchar_t **argv)
{
// Convert wchar_t arguments to UTF8.
std::vector<std::string> argv_narrow;

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"OrcaSlicer_opengl_version_check";
wc.lpszClassName = L"CreatWare_opengl_version_check";
wc.style = CS_OWNDC;
if (RegisterClass(&wc)) {
HWND hwnd = CreateWindowW(wc.lpszClassName, L"OrcaSlicer_opengl_version_check", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, wc.hInstance, (LPVOID)this);
HWND hwnd = CreateWindowW(wc.lpszClassName, L"CreatWare_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)
@ -204,7 +204,7 @@ bool OpenGLVersionCheck::message_pump_exit = false;
extern "C" {
typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv);
Slic3rMainFunc orcaslicer_main = nullptr;
Slic3rMainFunc creatware_main = nullptr;
}
extern "C" {
@ -283,28 +283,28 @@ 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"OrcaSlicer.dll");
wcscat(path_to_slic3r, L"CreatWare.dll");
// printf("Loading Slic3r library: %S\n", path_to_slic3r);
HINSTANCE hInstance_Slic3r = LoadLibraryExW(path_to_slic3r, nullptr, 0);
if (hInstance_Slic3r == nullptr) {
printf("OrcaSlicer.dll was not loaded, error=%d\n", GetLastError());
printf("CreatWare.dll was not loaded, error=%d\n", GetLastError());
return -1;
}
// resolve function address here
orcaslicer_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
creatware_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
#ifdef _WIN64
// there is just a single calling conversion, therefore no mangling of the function name.
"orcaslicer_main"
"creatware_main"
#else // stdcall calling convention declaration
"_bambustu_main@8"
#endif
);
if (orcaslicer_main == nullptr) {
printf("could not locate the function orcaslicer_main in OrcaSlicer.dll\n");
if (creatware_main == nullptr) {
printf("could not locate the function creatware_main in CreatWare.dll\n");
return -1;
}
// argc minus the trailing nullptr of the argv
return orcaslicer_main((int)argv_extended.size() - 1, argv_extended.data());
return creatware_main((int)argv_extended.size() - 1, argv_extended.data());
}
}

View File

@ -2,7 +2,7 @@
#define _libslic3r_h_
#include "libslic3r_version.h"
#define SLIC3R_APP_FULL_NAME "Creat Bot"
#define SLIC3R_APP_FULL_NAME "Creat Ware"
#define GCODEVIEWER_APP_NAME "OrcaSlicer G-code Viewer"
#define GCODEVIEWER_APP_KEY "OrcaSlicerGcodeViewer"
#define GCODEVIEWER_BUILD_ID std::string("OrcaSlicer G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-RC")

View File

@ -13,7 +13,7 @@ PRODUCTVERSION @SLIC3R_VERSION@
VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
VALUE "InternalName", "@SLIC3R_APP_NAME@"
VALUE "LegalCopyright", ""
VALUE "OriginalFilename", "orca-slicer.exe"
VALUE "OriginalFilename", "CreatWare-slicer.exe"
}
}
BLOCK "VarFileInfo"

View File

@ -1,8 +1,8 @@
# Included by CMakeLists, edited by the build script
# (the version numbers are generated by the build script from the git current label)
set(SLIC3R_APP_NAME "OrcaSlicer")
set(SLIC3R_APP_KEY "OrcaSlicer")
set(SLIC3R_APP_NAME "CreatWare")
set(SLIC3R_APP_KEY "CreatWare")
if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
set(BBL_RELEASE_TO_PUBLIC "1")