diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c69052c85..52be8e8473 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,13 +328,21 @@ find_package(TBB REQUIRED)
# add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0)
find_package(CURL REQUIRED)
-include_directories(${CURL_INCLUDE_DIRS})
+
+add_library(libcurl INTERFACE)
+target_link_libraries(libcurl INTERFACE CURL::libcurl)
+
+if (NOT WIN32)
+ # Required by libcurl
+ find_package(ZLIB REQUIRED)
+ target_link_libraries(libcurl INTERFACE ZLIB::ZLIB)
+endif()
if (SLIC3R_STATIC)
if (NOT APPLE)
# libcurl is always linked dynamically to the system libcurl on OSX.
# On other systems, libcurl is linked statically if SLIC3R_STATIC is set.
- add_definitions(-DCURL_STATICLIB)
+ target_compile_definitions(libcurl INTERFACE CURL_STATICLIB)
endif()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
# As of now, our build system produces a statically linked libcurl,
@@ -342,7 +350,8 @@ if (SLIC3R_STATIC)
find_package(OpenSSL REQUIRED)
message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
- include_directories(${OPENSSL_INCLUDE_DIR})
+ target_include_directories(libcurl INTERFACE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(libcurl INTERFACE ${OPENSSL_LIBRARIES})
endif()
endif()
@@ -400,7 +409,7 @@ find_package(cereal REQUIRED)
# l10n
set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
add_custom_target(gettext_make_pot
- COMMAND xgettext --keyword=L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --debug
+ 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 --debug
-f "${L10N_DIR}/list.txt"
-o "${L10N_DIR}/PrusaSlicer.pot"
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake
index 4e8228cbac..08b2868911 100644
--- a/deps/GMP/GMP.cmake
+++ b/deps/GMP/GMP.cmake
@@ -17,11 +17,27 @@ if (MSVC)
add_custom_target(dep_GMP SOURCES ${_output})
else ()
+ set(_gmp_ccflags "-O2 -DNDEBUG -fPIC -DPIC -Wall -Wmissing-prototypes -Wpointer-arith -pedantic -fomit-frame-pointer -fno-common")
+ set(_gmp_build_tgt "${CMAKE_SYSTEM_PROCESSOR}")
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+ set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4
+ set(_gmp_build_tgt armv7)
+ endif()
+
+ if (APPLE)
+ set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}")
+ set(_gmp_build_tgt "--build=${_gmp_build_tgt}-apple-darwin")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ set(_gmp_build_tgt "--build=${_gmp_build_tgt}-pc-linux-gnu")
+ else ()
+ set(_gmp_build_tgt "") # let it guess
+ endif()
+
ExternalProject_Add(dep_GMP
# URL https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2
URL https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz
BUILD_IN_SOURCE ON
- CONFIGURE_COMMAND ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" --with-pic
+ CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt}
BUILD_COMMAND make -j
INSTALL_COMMAND make install
)
diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake
index cda7eeea93..ddbb178d8d 100644
--- a/deps/MPFR/MPFR.cmake
+++ b/deps/MPFR/MPFR.cmake
@@ -21,9 +21,9 @@ else ()
ExternalProject_Add(dep_MPFR
URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2 # mirrors are allowed
BUILD_IN_SOURCE ON
- CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local --with-pic
+ CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
BUILD_COMMAND make -j
INSTALL_COMMAND make install
DEPENDS dep_GMP
)
-endif ()
\ No newline at end of file
+endif ()
diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake
index 368ea1fc14..3727eba7b1 100644
--- a/deps/deps-linux.cmake
+++ b/deps/deps-linux.cmake
@@ -31,6 +31,7 @@ ExternalProject_Add(dep_libopenssl
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./config
"--prefix=${DESTDIR}/usr/local"
+ "--libdir=lib"
no-shared
no-ssl3-method
no-dynamic-engine
@@ -54,7 +55,12 @@ ExternalProject_Add(dep_libcurl
--enable-versioned-symbols
--enable-threaded-resolver
--with-random=/dev/urandom
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+ # CA root certificate paths will be set for openssl at runtime.
+ --without-ca-bundle
+ --without-ca-path
+ --with-ca-fallback # to look for the ssl backend's ca store
+
--disable-ldap
--disable-ldaps
--disable-manual
diff --git a/resources/icons/lock_open_sys.svg b/resources/icons/lock_open_sys.svg
new file mode 100644
index 0000000000..e0aef4ad2a
--- /dev/null
+++ b/resources/icons/lock_open_sys.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/resources/icons/printers/Creality_ENDER3.png b/resources/icons/printers/Creality_ENDER3.png
deleted file mode 100644
index 52861197c7..0000000000
Binary files a/resources/icons/printers/Creality_ENDER3.png and /dev/null differ
diff --git a/resources/icons/white/lock_open_sys.svg b/resources/icons/white/lock_open_sys.svg
new file mode 100644
index 0000000000..c1aa64aec2
--- /dev/null
+++ b/resources/icons/white/lock_open_sys.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot
index 41c5577132..6e72e438cf 100644
--- a/resources/localization/PrusaSlicer.pot
+++ b/resources/localization/PrusaSlicer.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-27 14:12+0100\n"
+"POT-Creation-Date: 2020-03-16 13:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,46 +18,46 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: src/slic3r/GUI/AboutDialog.cpp:39 src/slic3r/GUI/AboutDialog.cpp:291
+#: src/slic3r/GUI/AboutDialog.cpp:41 src/slic3r/GUI/AboutDialog.cpp:294
msgid "Portions copyright"
msgstr ""
-#: src/slic3r/GUI/AboutDialog.cpp:127 src/slic3r/GUI/AboutDialog.cpp:256
+#: src/slic3r/GUI/AboutDialog.cpp:129 src/slic3r/GUI/AboutDialog.cpp:258
msgid "Copyright"
msgstr ""
#. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:129
+#: src/slic3r/GUI/AboutDialog.cpp:131
msgid ""
"License agreements of all following programs (libraries) are part of "
"application license agreement"
msgstr ""
-#: src/slic3r/GUI/AboutDialog.cpp:199
+#: src/slic3r/GUI/AboutDialog.cpp:201
#, possible-c-format
msgid "About %s"
msgstr ""
-#: src/slic3r/GUI/AboutDialog.cpp:231 src/slic3r/GUI/MainFrame.cpp:64
+#: src/slic3r/GUI/AboutDialog.cpp:233 src/slic3r/GUI/MainFrame.cpp:69
msgid "Version"
msgstr ""
#. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:258
+#: src/slic3r/GUI/AboutDialog.cpp:260
msgid "is licensed under the"
msgstr ""
-#: src/slic3r/GUI/AboutDialog.cpp:259
+#: src/slic3r/GUI/AboutDialog.cpp:261
msgid "GNU Affero General Public License, version 3"
msgstr ""
-#: src/slic3r/GUI/AboutDialog.cpp:260
+#: src/slic3r/GUI/AboutDialog.cpp:262
msgid ""
"PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap "
"community."
msgstr ""
-#: src/slic3r/GUI/AboutDialog.cpp:261
+#: src/slic3r/GUI/AboutDialog.cpp:263
msgid ""
"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, "
"Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and "
@@ -71,56 +71,56 @@ msgid ""
"not be affected."
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:109
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:108
msgid ""
"Copying of the temporary G-code to the output G-code failed. Maybe the SD "
"card is write locked?"
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:112
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:111
msgid ""
"Copying of the temporary G-code to the output G-code failed. There might be "
"problem with target device, please try exporting again or using different "
"device. The corrupted output G-code is at %1%.tmp."
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:115
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:114
msgid ""
"Renaming of the G-code after copying to the selected destination folder has "
"failed. Current path is %1%.tmp. Please try exporting again."
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:118
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:117
msgid ""
"Copying of the temporary G-code has finished but the original code at %1% "
"couldn't be opened during copy check. The output G-code is at %2%.tmp."
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:121
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:120
msgid ""
"Copying of the temporary G-code has finished but the exported code couldn't "
"be opened during copy check. The output G-code is at %1%.tmp."
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:128
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:478
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:127
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:479
msgid "Running post-processing scripts"
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:130
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:129
msgid "G-code file exported to %1%"
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:134
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:184
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:133
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:183
msgid "Slicing complete"
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:180
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:179
msgid "Masked SLA file exported to %1%"
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:222
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:221
#, possible-c-format
msgid ""
"%s has encountered an error. It was likely caused by running out of memory. "
@@ -128,15 +128,15 @@ msgid ""
"and we would be glad if you reported it."
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:480
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:481
msgid "Copying of the temporary G-code to the output G-code failed"
msgstr ""
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:505
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:506
msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue"
msgstr ""
-#: src/slic3r/GUI/BedShapeDialog.cpp:66 src/slic3r/GUI/GUI_ObjectList.cpp:2059
+#: src/slic3r/GUI/BedShapeDialog.cpp:66 src/slic3r/GUI/GUI_ObjectList.cpp:2067
msgid "Shape"
msgstr ""
@@ -146,7 +146,7 @@ msgstr ""
#: src/slic3r/GUI/BedShapeDialog.cpp:77
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:232 src/slic3r/GUI/Plater.cpp:160
-#: src/slic3r/GUI/Tab.cpp:2324
+#: src/slic3r/GUI/Tab.cpp:2309
msgid "Size"
msgstr ""
@@ -168,10 +168,10 @@ msgstr ""
msgid "Circular"
msgstr ""
-#: src/slic3r/GUI/BedShapeDialog.cpp:92 src/slic3r/GUI/ConfigWizard.cpp:218
-#: src/slic3r/GUI/ConfigWizard.cpp:970 src/slic3r/GUI/ConfigWizard.cpp:984
+#: src/slic3r/GUI/BedShapeDialog.cpp:92 src/slic3r/GUI/ConfigWizard.cpp:233
+#: src/slic3r/GUI/ConfigWizard.cpp:985 src/slic3r/GUI/ConfigWizard.cpp:999
#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:87
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:135
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:142
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:333
#: src/slic3r/GUI/ObjectDataViewModel.cpp:94
#: src/slic3r/GUI/WipeTowerDialog.cpp:85 src/libslic3r/PrintConfig.cpp:75
@@ -188,23 +188,23 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:1565 src/libslic3r/PrintConfig.cpp:1573
#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1591
#: src/libslic3r/PrintConfig.cpp:1599 src/libslic3r/PrintConfig.cpp:1682
-#: src/libslic3r/PrintConfig.cpp:1914 src/libslic3r/PrintConfig.cpp:1985
-#: src/libslic3r/PrintConfig.cpp:2019 src/libslic3r/PrintConfig.cpp:2147
-#: src/libslic3r/PrintConfig.cpp:2226 src/libslic3r/PrintConfig.cpp:2233
-#: src/libslic3r/PrintConfig.cpp:2240 src/libslic3r/PrintConfig.cpp:2270
-#: src/libslic3r/PrintConfig.cpp:2280 src/libslic3r/PrintConfig.cpp:2290
-#: src/libslic3r/PrintConfig.cpp:2450 src/libslic3r/PrintConfig.cpp:2484
-#: src/libslic3r/PrintConfig.cpp:2623 src/libslic3r/PrintConfig.cpp:2632
-#: src/libslic3r/PrintConfig.cpp:2641 src/libslic3r/PrintConfig.cpp:2651
-#: src/libslic3r/PrintConfig.cpp:2695 src/libslic3r/PrintConfig.cpp:2705
-#: src/libslic3r/PrintConfig.cpp:2717 src/libslic3r/PrintConfig.cpp:2737
-#: src/libslic3r/PrintConfig.cpp:2747 src/libslic3r/PrintConfig.cpp:2757
-#: src/libslic3r/PrintConfig.cpp:2775 src/libslic3r/PrintConfig.cpp:2790
-#: src/libslic3r/PrintConfig.cpp:2804 src/libslic3r/PrintConfig.cpp:2815
-#: src/libslic3r/PrintConfig.cpp:2828 src/libslic3r/PrintConfig.cpp:2873
-#: src/libslic3r/PrintConfig.cpp:2883 src/libslic3r/PrintConfig.cpp:2892
-#: src/libslic3r/PrintConfig.cpp:2902 src/libslic3r/PrintConfig.cpp:2918
-#: src/libslic3r/PrintConfig.cpp:2942
+#: src/libslic3r/PrintConfig.cpp:1921 src/libslic3r/PrintConfig.cpp:1992
+#: src/libslic3r/PrintConfig.cpp:2026 src/libslic3r/PrintConfig.cpp:2154
+#: src/libslic3r/PrintConfig.cpp:2233 src/libslic3r/PrintConfig.cpp:2240
+#: src/libslic3r/PrintConfig.cpp:2247 src/libslic3r/PrintConfig.cpp:2277
+#: src/libslic3r/PrintConfig.cpp:2287 src/libslic3r/PrintConfig.cpp:2297
+#: src/libslic3r/PrintConfig.cpp:2457 src/libslic3r/PrintConfig.cpp:2491
+#: src/libslic3r/PrintConfig.cpp:2630 src/libslic3r/PrintConfig.cpp:2639
+#: src/libslic3r/PrintConfig.cpp:2648 src/libslic3r/PrintConfig.cpp:2658
+#: src/libslic3r/PrintConfig.cpp:2712 src/libslic3r/PrintConfig.cpp:2722
+#: src/libslic3r/PrintConfig.cpp:2734 src/libslic3r/PrintConfig.cpp:2754
+#: src/libslic3r/PrintConfig.cpp:2764 src/libslic3r/PrintConfig.cpp:2774
+#: src/libslic3r/PrintConfig.cpp:2792 src/libslic3r/PrintConfig.cpp:2807
+#: src/libslic3r/PrintConfig.cpp:2821 src/libslic3r/PrintConfig.cpp:2832
+#: src/libslic3r/PrintConfig.cpp:2845 src/libslic3r/PrintConfig.cpp:2890
+#: src/libslic3r/PrintConfig.cpp:2900 src/libslic3r/PrintConfig.cpp:2909
+#: src/libslic3r/PrintConfig.cpp:2919 src/libslic3r/PrintConfig.cpp:2935
+#: src/libslic3r/PrintConfig.cpp:2959
msgid "mm"
msgstr ""
@@ -240,7 +240,7 @@ msgid "Load..."
msgstr ""
#: src/slic3r/GUI/BedShapeDialog.cpp:190 src/slic3r/GUI/BedShapeDialog.cpp:269
-#: src/slic3r/GUI/Tab.cpp:3124
+#: src/slic3r/GUI/Tab.cpp:3145
msgid "Remove"
msgstr ""
@@ -282,7 +282,7 @@ msgstr ""
msgid "Choose an STL file to import bed model from:"
msgstr ""
-#: src/slic3r/GUI/BedShapeDialog.hpp:59 src/slic3r/GUI/ConfigWizard.cpp:929
+#: src/slic3r/GUI/BedShapeDialog.hpp:59 src/slic3r/GUI/ConfigWizard.cpp:944
msgid "Bed Shape"
msgstr ""
@@ -336,7 +336,7 @@ msgid ""
msgstr ""
#: src/slic3r/GUI/ConfigManipulation.cpp:49
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27 src/slic3r/GUI/Tab.cpp:1049
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27 src/slic3r/GUI/Tab.cpp:1109
#: src/libslic3r/PrintConfig.cpp:71
msgid "Layer height"
msgstr ""
@@ -424,31 +424,31 @@ msgstr ""
#: src/slic3r/GUI/ConfigManipulation.cpp:211
#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
-#: src/slic3r/GUI/GUI_ObjectList.cpp:614 src/slic3r/GUI/Plater.cpp:527
-#: src/slic3r/GUI/Tab.cpp:1091 src/slic3r/GUI/Tab.cpp:1092
+#: src/slic3r/GUI/GUI_ObjectList.cpp:612 src/slic3r/GUI/Plater.cpp:532
+#: src/slic3r/GUI/Tab.cpp:1151 src/slic3r/GUI/Tab.cpp:1152
#: src/libslic3r/PrintConfig.cpp:203 src/libslic3r/PrintConfig.cpp:416
#: src/libslic3r/PrintConfig.cpp:436 src/libslic3r/PrintConfig.cpp:776
#: src/libslic3r/PrintConfig.cpp:790 src/libslic3r/PrintConfig.cpp:827
#: src/libslic3r/PrintConfig.cpp:981 src/libslic3r/PrintConfig.cpp:991
#: src/libslic3r/PrintConfig.cpp:1009 src/libslic3r/PrintConfig.cpp:1028
-#: src/libslic3r/PrintConfig.cpp:1047 src/libslic3r/PrintConfig.cpp:1728
-#: src/libslic3r/PrintConfig.cpp:1745
+#: src/libslic3r/PrintConfig.cpp:1047 src/libslic3r/PrintConfig.cpp:1735
+#: src/libslic3r/PrintConfig.cpp:1752
msgid "Infill"
msgstr ""
-#: src/slic3r/GUI/ConfigManipulation.cpp:317
+#: src/slic3r/GUI/ConfigManipulation.cpp:318
msgid "Head penetration should not be greater than the head width."
msgstr ""
-#: src/slic3r/GUI/ConfigManipulation.cpp:319
+#: src/slic3r/GUI/ConfigManipulation.cpp:320
msgid "Invalid Head penetration"
msgstr ""
-#: src/slic3r/GUI/ConfigManipulation.cpp:330
+#: src/slic3r/GUI/ConfigManipulation.cpp:331
msgid "Pinhead diameter should be smaller than the pillar diameter."
msgstr ""
-#: src/slic3r/GUI/ConfigManipulation.cpp:332
+#: src/slic3r/GUI/ConfigManipulation.cpp:333
msgid "Invalid pinhead diameter"
msgstr ""
@@ -480,7 +480,7 @@ msgstr ""
msgid "PrusaSlicer version"
msgstr ""
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Preset.cpp:1521
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Preset.cpp:1562
msgid "print"
msgstr ""
@@ -488,11 +488,11 @@ msgstr ""
msgid "filaments"
msgstr ""
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53 src/slic3r/GUI/Preset.cpp:1525
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53 src/slic3r/GUI/Preset.cpp:1566
msgid "printer"
msgstr ""
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57 src/slic3r/GUI/Tab.cpp:971
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57 src/slic3r/GUI/Tab.cpp:1027
msgid "vendor"
msgstr ""
@@ -529,106 +529,104 @@ msgstr ""
msgid "Configuration Snapshots"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:218
+#: src/slic3r/GUI/ConfigWizard.cpp:233
msgid "nozzle"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:222
+#: src/slic3r/GUI/ConfigWizard.cpp:237
msgid "Alternate nozzles:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:304
msgid "All standard"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:304
msgid "Standard"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:290 src/slic3r/GUI/ConfigWizard.cpp:573
-#: src/slic3r/GUI/Tab.cpp:3174
+#: src/slic3r/GUI/ConfigWizard.cpp:305 src/slic3r/GUI/ConfigWizard.cpp:588
+#: src/slic3r/GUI/Tab.cpp:3204
msgid "All"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:291 src/slic3r/GUI/ConfigWizard.cpp:574
-#: src/slic3r/GUI/Plater.cpp:499 src/slic3r/GUI/Plater.cpp:639
+#: src/slic3r/GUI/ConfigWizard.cpp:306 src/slic3r/GUI/ConfigWizard.cpp:589
+#: src/slic3r/GUI/Plater.cpp:504 src/slic3r/GUI/Plater.cpp:644
#: src/libslic3r/ExtrusionEntity.cpp:309
msgid "None"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:427
+#: src/slic3r/GUI/ConfigWizard.cpp:442
#, possible-c-format
msgid "Welcome to the %s Configuration Assistant"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:429
+#: src/slic3r/GUI/ConfigWizard.cpp:444
#, possible-c-format
msgid "Welcome to the %s Configuration Wizard"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:431
+#: src/slic3r/GUI/ConfigWizard.cpp:446
msgid "Welcome"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:433
+#: src/slic3r/GUI/ConfigWizard.cpp:448
#, possible-c-format
msgid ""
"Hello, welcome to %s! This %s helps you with the initial configuration; just "
"a few settings and you will be ready to print."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid ""
-"Remove user profiles - install from scratch (a snapshot will be taken "
-"beforehand)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:481
+#: src/slic3r/GUI/ConfigWizard.cpp:496
#, possible-c-format
msgid "%s Family"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:565
+#: src/slic3r/GUI/ConfigWizard.cpp:580
msgid "Vendor:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:566
+#: src/slic3r/GUI/ConfigWizard.cpp:581
msgid "Profile:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:603 src/slic3r/GUI/ConfigWizard.cpp:631
+#: src/slic3r/GUI/ConfigWizard.cpp:618 src/slic3r/GUI/ConfigWizard.cpp:646
msgid "(All)"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:732
+#: src/slic3r/GUI/ConfigWizard.cpp:747
msgid "Custom Printer Setup"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:732
+#: src/slic3r/GUI/ConfigWizard.cpp:747
msgid "Custom Printer"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:734
+#: src/slic3r/GUI/ConfigWizard.cpp:749
msgid "Define a custom printer profile"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:736
+#: src/slic3r/GUI/ConfigWizard.cpp:751
msgid "Custom profile name:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:761
+#: src/slic3r/GUI/ConfigWizard.cpp:776
msgid "Automatic updates"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:761
+#: src/slic3r/GUI/ConfigWizard.cpp:776
msgid "Updates"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:769 src/slic3r/GUI/Preferences.cpp:64
+#: src/slic3r/GUI/ConfigWizard.cpp:784 src/slic3r/GUI/Preferences.cpp:64
msgid "Check for application updates"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:773
+#: src/slic3r/GUI/ConfigWizard.cpp:788
#, possible-c-format
msgid ""
"If enabled, %s checks for new application versions online. When a new "
@@ -637,11 +635,11 @@ msgid ""
"notification mechanisms, no automatic installation is done."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:779 src/slic3r/GUI/Preferences.cpp:80
+#: src/slic3r/GUI/ConfigWizard.cpp:794 src/slic3r/GUI/Preferences.cpp:80
msgid "Update built-in Presets automatically"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:783
+#: src/slic3r/GUI/ConfigWizard.cpp:798
#, possible-c-format
msgid ""
"If enabled, %s downloads updates of built-in system presets in the "
@@ -650,30 +648,30 @@ msgid ""
"startup."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:786
+#: src/slic3r/GUI/ConfigWizard.cpp:801
msgid ""
"Updates are never applied without user's consent and never overwrite user's "
"customized settings."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:791
+#: src/slic3r/GUI/ConfigWizard.cpp:806
msgid ""
"Additionally a backup snapshot of the whole configuration is created before "
"an update is applied."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:798 src/slic3r/GUI/GUI_ObjectList.cpp:1664
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3956 src/slic3r/GUI/Plater.cpp:3225
-#: src/slic3r/GUI/Plater.cpp:3934 src/slic3r/GUI/Plater.cpp:3963
+#: src/slic3r/GUI/ConfigWizard.cpp:813 src/slic3r/GUI/GUI_ObjectList.cpp:1672
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4025 src/slic3r/GUI/Plater.cpp:3292
+#: src/slic3r/GUI/Plater.cpp:4001 src/slic3r/GUI/Plater.cpp:4030
msgid "Reload from disk"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:801
+#: src/slic3r/GUI/ConfigWizard.cpp:816
msgid ""
"Export full pathnames of models and parts sources into 3mf and amf files"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:805
+#: src/slic3r/GUI/ConfigWizard.cpp:820
msgid ""
"If enabled, allows the Reload from disk command to automatically find and "
"load the files when invoked.\n"
@@ -681,11 +679,11 @@ msgid ""
"using an open file dialog."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:813
+#: src/slic3r/GUI/ConfigWizard.cpp:828
msgid "View mode"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:815
+#: src/slic3r/GUI/ConfigWizard.cpp:830
msgid ""
"PrusaSlicer's user interfaces comes in three variants:\n"
"Simple, Advanced, and Expert.\n"
@@ -694,212 +692,212 @@ msgid ""
"fine-tuning, they are suitable for advanced and expert users, respectively."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:820
+#: src/slic3r/GUI/ConfigWizard.cpp:835
msgid "Simple mode"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:821
+#: src/slic3r/GUI/ConfigWizard.cpp:836
msgid "Advanced mode"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:822
+#: src/slic3r/GUI/ConfigWizard.cpp:837
msgid "Expert mode"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:856
+#: src/slic3r/GUI/ConfigWizard.cpp:871
msgid "Other Vendors"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:860
+#: src/slic3r/GUI/ConfigWizard.cpp:875
#, possible-c-format
msgid "Pick another vendor supported by %s"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:891
+#: src/slic3r/GUI/ConfigWizard.cpp:906
msgid "Firmware Type"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:891 src/slic3r/GUI/Tab.cpp:1947
+#: src/slic3r/GUI/ConfigWizard.cpp:906 src/slic3r/GUI/Tab.cpp:1970
msgid "Firmware"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:895
+#: src/slic3r/GUI/ConfigWizard.cpp:910
msgid "Choose the type of firmware used by your printer."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:929
+#: src/slic3r/GUI/ConfigWizard.cpp:944
msgid "Bed Shape and Size"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:932
+#: src/slic3r/GUI/ConfigWizard.cpp:947
msgid "Set the shape of your printer's bed."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:952
+#: src/slic3r/GUI/ConfigWizard.cpp:967
msgid "Filament and Nozzle Diameters"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:952
+#: src/slic3r/GUI/ConfigWizard.cpp:967
msgid "Print Diameters"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:966
+#: src/slic3r/GUI/ConfigWizard.cpp:981
msgid "Enter the diameter of your printer's hot end nozzle."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:969
+#: src/slic3r/GUI/ConfigWizard.cpp:984
msgid "Nozzle Diameter:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:979
+#: src/slic3r/GUI/ConfigWizard.cpp:994
msgid "Enter the diameter of your filament."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:980
+#: src/slic3r/GUI/ConfigWizard.cpp:995
msgid ""
"Good precision is required, so use a caliper and do multiple measurements "
"along the filament, then compute the average."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:983
+#: src/slic3r/GUI/ConfigWizard.cpp:998
msgid "Filament Diameter:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1017
+#: src/slic3r/GUI/ConfigWizard.cpp:1032
msgid "Extruder and Bed Temperatures"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1017
+#: src/slic3r/GUI/ConfigWizard.cpp:1032
msgid "Temperatures"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1033
+#: src/slic3r/GUI/ConfigWizard.cpp:1048
msgid "Enter the temperature needed for extruding your filament."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1034
+#: src/slic3r/GUI/ConfigWizard.cpp:1049
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1037
+#: src/slic3r/GUI/ConfigWizard.cpp:1052
msgid "Extrusion Temperature:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1038 src/slic3r/GUI/ConfigWizard.cpp:1052
+#: src/slic3r/GUI/ConfigWizard.cpp:1053 src/slic3r/GUI/ConfigWizard.cpp:1067
msgid "°C"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1047
+#: src/slic3r/GUI/ConfigWizard.cpp:1062
msgid ""
"Enter the bed temperature needed for getting your filament to stick to your "
"heated bed."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1048
+#: src/slic3r/GUI/ConfigWizard.cpp:1063
msgid ""
"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
"no heated bed."
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1051
+#: src/slic3r/GUI/ConfigWizard.cpp:1066
msgid "Bed Temperature:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1471 src/slic3r/GUI/ConfigWizard.cpp:2013
+#: src/slic3r/GUI/ConfigWizard.cpp:1515 src/slic3r/GUI/ConfigWizard.cpp:2097
msgid "Filaments"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1471 src/slic3r/GUI/ConfigWizard.cpp:2015
+#: src/slic3r/GUI/ConfigWizard.cpp:1515 src/slic3r/GUI/ConfigWizard.cpp:2099
msgid "SLA Materials"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1525
+#: src/slic3r/GUI/ConfigWizard.cpp:1569
msgid "FFF Technology Printers"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1530
+#: src/slic3r/GUI/ConfigWizard.cpp:1574
msgid "SLA Technology Printers"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1751 src/slic3r/GUI/DoubleSlider.cpp:1905
-#: src/slic3r/GUI/DoubleSlider.cpp:1926 src/slic3r/GUI/GUI.cpp:245
+#: src/slic3r/GUI/ConfigWizard.cpp:1810 src/slic3r/GUI/DoubleSlider.cpp:1905
+#: src/slic3r/GUI/DoubleSlider.cpp:1926 src/slic3r/GUI/GUI.cpp:246
msgid "Notice"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1976
+#: src/slic3r/GUI/ConfigWizard.cpp:2060
msgid "Select all standard printers"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1979
+#: src/slic3r/GUI/ConfigWizard.cpp:2063
msgid "< &Back"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1980
+#: src/slic3r/GUI/ConfigWizard.cpp:2064
msgid "&Next >"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1981
+#: src/slic3r/GUI/ConfigWizard.cpp:2065
msgid "&Finish"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1982 src/slic3r/GUI/FirmwareDialog.cpp:151
+#: src/slic3r/GUI/ConfigWizard.cpp:2066 src/slic3r/GUI/FirmwareDialog.cpp:151
#: src/slic3r/GUI/ProgressStatusBar.cpp:26
msgid "Cancel"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1995
+#: src/slic3r/GUI/ConfigWizard.cpp:2079
msgid "Prusa FFF Technology Printers"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:1998
+#: src/slic3r/GUI/ConfigWizard.cpp:2082
msgid "Prusa MSLA Technology Printers"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2013
+#: src/slic3r/GUI/ConfigWizard.cpp:2097
msgid "Filament Profiles Selection"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2013 src/slic3r/GUI/GUI_ObjectList.cpp:3553
+#: src/slic3r/GUI/ConfigWizard.cpp:2097 src/slic3r/GUI/GUI_ObjectList.cpp:3622
msgid "Type:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2015
+#: src/slic3r/GUI/ConfigWizard.cpp:2099
msgid "SLA Material Profiles Selection"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2015
+#: src/slic3r/GUI/ConfigWizard.cpp:2099
msgid "Layer height:"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2109
+#: src/slic3r/GUI/ConfigWizard.cpp:2196
msgid "Configuration Assistant"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2110
+#: src/slic3r/GUI/ConfigWizard.cpp:2197
msgid "Configuration &Assistant"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2112
+#: src/slic3r/GUI/ConfigWizard.cpp:2199
msgid "Configuration Wizard"
msgstr ""
-#: src/slic3r/GUI/ConfigWizard.cpp:2113
+#: src/slic3r/GUI/ConfigWizard.cpp:2200
msgid "Configuration &Wizard"
msgstr ""
@@ -1025,13 +1023,13 @@ msgid "Edit tick mark - Right click"
msgstr ""
#: src/slic3r/GUI/DoubleSlider.cpp:1134 src/slic3r/GUI/DoubleSlider.cpp:1170
-#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1704
-#: src/slic3r/GUI/Tab.cpp:2320 src/libslic3r/GCode/PreviewData.cpp:445
+#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1712
+#: src/slic3r/GUI/Tab.cpp:2305 src/libslic3r/GCode/PreviewData.cpp:445
#, possible-c-format
msgid "Extruder %d"
msgstr ""
-#: src/slic3r/GUI/DoubleSlider.cpp:1135 src/slic3r/GUI/GUI_ObjectList.cpp:1705
+#: src/slic3r/GUI/DoubleSlider.cpp:1135 src/slic3r/GUI/GUI_ObjectList.cpp:1713
msgid "active"
msgstr ""
@@ -1039,7 +1037,7 @@ msgstr ""
msgid "Switch code to Change extruder"
msgstr ""
-#: src/slic3r/GUI/DoubleSlider.cpp:1144 src/slic3r/GUI/GUI_ObjectList.cpp:1671
+#: src/slic3r/GUI/DoubleSlider.cpp:1144 src/slic3r/GUI/GUI_ObjectList.cpp:1679
msgid "Change extruder"
msgstr ""
@@ -1146,8 +1144,8 @@ msgstr ""
#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
#: src/slic3r/GUI/DoubleSlider.cpp:1920
@@ -1175,8 +1173,8 @@ msgstr ""
#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:52
#: src/libslic3r/PrintConfig.cpp:362 src/libslic3r/PrintConfig.cpp:994
#: src/libslic3r/PrintConfig.cpp:1505 src/libslic3r/PrintConfig.cpp:1690
-#: src/libslic3r/PrintConfig.cpp:1750 src/libslic3r/PrintConfig.cpp:1930
-#: src/libslic3r/PrintConfig.cpp:1976
+#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1983
msgid "layers"
msgstr ""
@@ -1200,7 +1198,7 @@ msgstr ""
msgid "parameter name"
msgstr ""
-#: src/slic3r/GUI/Field.cpp:150 src/slic3r/GUI/OptionsGroup.cpp:580
+#: src/slic3r/GUI/Field.cpp:150 src/slic3r/GUI/OptionsGroup.cpp:598
msgid "N/A"
msgstr ""
@@ -1210,7 +1208,7 @@ msgid "%s doesn't support percentage"
msgstr ""
#: src/slic3r/GUI/Field.cpp:195 src/slic3r/GUI/Field.cpp:226
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:376
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:383
msgid "Invalid numeric input."
msgstr ""
@@ -1302,8 +1300,8 @@ msgstr ""
msgid "Firmware image:"
msgstr ""
-#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/Tab.cpp:1658
-#: src/slic3r/GUI/Tab.cpp:1721
+#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/Tab.cpp:1706
+#: src/slic3r/GUI/Tab.cpp:1768
msgid "Browse"
msgstr ""
@@ -1336,7 +1334,7 @@ msgid "Advanced: Output log"
msgstr ""
#: src/slic3r/GUI/FirmwareDialog.cpp:852
-#: src/slic3r/GUI/Mouse3DController.cpp:364
+#: src/slic3r/GUI/Mouse3DController.cpp:355
#: src/slic3r/GUI/PrintHostDialogs.cpp:161
msgid "Close"
msgstr ""
@@ -1355,7 +1353,7 @@ msgstr ""
msgid "Cancelling..."
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:234 src/slic3r/GUI/GLCanvas3D.cpp:4573
+#: src/slic3r/GUI/GLCanvas3D.cpp:234 src/slic3r/GUI/GLCanvas3D.cpp:4596
msgid "Variable layer height"
msgstr ""
@@ -1503,143 +1501,143 @@ msgid "Mirror Object"
msgstr ""
#: src/slic3r/GUI/GLCanvas3D.cpp:2921
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:562
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:570
msgid "Gizmo-Move"
msgstr ""
#: src/slic3r/GUI/GLCanvas3D.cpp:3001
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:564
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:572
msgid "Gizmo-Rotate"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:3505
+#: src/slic3r/GUI/GLCanvas3D.cpp:3529
msgid "Move Object"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4047
+#: src/slic3r/GUI/GLCanvas3D.cpp:4070
msgid "Undo History"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4047
+#: src/slic3r/GUI/GLCanvas3D.cpp:4070
msgid "Redo History"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4065
+#: src/slic3r/GUI/GLCanvas3D.cpp:4088
#, possible-c-format
msgid "Undo %1$d Action"
msgid_plural "Undo %1$d Actions"
msgstr[0] ""
msgstr[1] ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4065
+#: src/slic3r/GUI/GLCanvas3D.cpp:4088
#, possible-c-format
msgid "Redo %1$d Action"
msgid_plural "Redo %1$d Actions"
msgstr[0] ""
msgstr[1] ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4467
+#: src/slic3r/GUI/GLCanvas3D.cpp:4490
msgid "Add..."
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4475 src/slic3r/GUI/GUI_ObjectList.cpp:1718
-#: src/slic3r/GUI/Plater.cpp:3931 src/slic3r/GUI/Plater.cpp:3953
-#: src/slic3r/GUI/Tab.cpp:3124
+#: src/slic3r/GUI/GLCanvas3D.cpp:4498 src/slic3r/GUI/GUI_ObjectList.cpp:1726
+#: src/slic3r/GUI/Plater.cpp:3998 src/slic3r/GUI/Plater.cpp:4020
+#: src/slic3r/GUI/Tab.cpp:3145
msgid "Delete"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4484 src/slic3r/GUI/KBShortcutsDialog.cpp:129
-#: src/slic3r/GUI/Plater.cpp:4669
+#: src/slic3r/GUI/GLCanvas3D.cpp:4507 src/slic3r/GUI/KBShortcutsDialog.cpp:131
+#: src/slic3r/GUI/Plater.cpp:4740
msgid "Delete all"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4493 src/slic3r/GUI/KBShortcutsDialog.cpp:157
-#: src/slic3r/GUI/Plater.cpp:2754
+#: src/slic3r/GUI/GLCanvas3D.cpp:4516 src/slic3r/GUI/KBShortcutsDialog.cpp:157
+#: src/slic3r/GUI/Plater.cpp:2816
msgid "Arrange"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4493 src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/GLCanvas3D.cpp:4516 src/slic3r/GUI/KBShortcutsDialog.cpp:158
msgid "Arrange selection"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4505
+#: src/slic3r/GUI/GLCanvas3D.cpp:4528
msgid "Copy"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4514
+#: src/slic3r/GUI/GLCanvas3D.cpp:4537
msgid "Paste"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4526 src/slic3r/GUI/Plater.cpp:3788
-#: src/slic3r/GUI/Plater.cpp:3800 src/slic3r/GUI/Plater.cpp:3940
+#: src/slic3r/GUI/GLCanvas3D.cpp:4549 src/slic3r/GUI/Plater.cpp:3855
+#: src/slic3r/GUI/Plater.cpp:3867 src/slic3r/GUI/Plater.cpp:4007
msgid "Add instance"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4537 src/slic3r/GUI/Plater.cpp:3942
+#: src/slic3r/GUI/GLCanvas3D.cpp:4560 src/slic3r/GUI/Plater.cpp:4009
msgid "Remove instance"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4550
+#: src/slic3r/GUI/GLCanvas3D.cpp:4573
msgid "Split to objects"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4560 src/slic3r/GUI/GUI_ObjectList.cpp:1487
+#: src/slic3r/GUI/GLCanvas3D.cpp:4583 src/slic3r/GUI/GUI_ObjectList.cpp:1495
msgid "Split to parts"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4624 src/slic3r/GUI/KBShortcutsDialog.cpp:130
-#: src/slic3r/GUI/MainFrame.cpp:581
+#: src/slic3r/GUI/GLCanvas3D.cpp:4647 src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/MainFrame.cpp:662
msgid "Undo"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4624 src/slic3r/GUI/GLCanvas3D.cpp:4657
+#: src/slic3r/GUI/GLCanvas3D.cpp:4647 src/slic3r/GUI/GLCanvas3D.cpp:4680
msgid "Click right mouse button to open History"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4641
+#: src/slic3r/GUI/GLCanvas3D.cpp:4664
msgid "Next Undo action: %1%"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4657 src/slic3r/GUI/KBShortcutsDialog.cpp:131
-#: src/slic3r/GUI/MainFrame.cpp:584
+#: src/slic3r/GUI/GLCanvas3D.cpp:4680 src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/MainFrame.cpp:665
msgid "Redo"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:4673
+#: src/slic3r/GUI/GLCanvas3D.cpp:4696
msgid "Next Redo action: %1%"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:6598
+#: src/slic3r/GUI/GLCanvas3D.cpp:6609
msgid "Selection-Add from rectangle"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3D.cpp:6617
+#: src/slic3r/GUI/GLCanvas3D.cpp:6628
msgid "Selection-Remove from rectangle"
msgstr ""
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:284
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:306
#, possible-c-format
msgid ""
"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
"while OpenGL version %s, render %s, vendor %s was detected."
msgstr ""
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:309
msgid "You may need to update your graphics card driver."
msgstr ""
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:290
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:312
msgid ""
"As a workaround, you may run PrusaSlicer with a software rendered 3D "
"graphics by running prusa-slicer.exe with the --sw_renderer parameter."
msgstr ""
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:292
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:314
msgid "Unsupported OpenGL version"
msgstr ""
#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:42
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:144 src/libslic3r/PrintConfig.cpp:3402
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:144 src/libslic3r/PrintConfig.cpp:3424
msgid "Cut"
msgstr ""
@@ -1663,78 +1661,78 @@ msgstr ""
msgid "Place on face"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40
msgid "Hollow this object"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
msgid "Preview hollowed and drilled model"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
msgid "Offset"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
msgid "Quality"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45
-#: src/libslic3r/PrintConfig.cpp:2934
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44
+#: src/libslic3r/PrintConfig.cpp:2951
msgid "Closing distance"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45
msgid "Hole diameter"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46
msgid "Hole depth"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47
msgid "Remove selected holes"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48
msgid "Remove all holes"
msgstr ""
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
+msgid "Clipping of view"
+msgstr ""
+
#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58
-msgid "Clipping of view"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:59
msgid "Reset direction"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:52
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51
msgid "Show supports"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:421
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:423
msgid "Add drainage hole"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:539
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:541
msgid "Delete drainage hole"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:813
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:815
msgid "Hollowing parameter change"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:885
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:887
msgid "Change drainage hole diameter"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:977
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:979
msgid "Hollow and drill"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:1059
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:1061
msgid "Move drainage hole"
msgstr ""
@@ -1746,7 +1744,7 @@ msgstr ""
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:480
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:499
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:517
-#: src/libslic3r/PrintConfig.cpp:3451
+#: src/libslic3r/PrintConfig.cpp:3473
msgid "Rotate"
msgstr ""
@@ -1754,198 +1752,198 @@ msgstr ""
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:230
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:500
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:518
-#: src/libslic3r/PrintConfig.cpp:3466
+#: src/libslic3r/PrintConfig.cpp:3488
msgid "Scale"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47
msgid "Head diameter"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
msgid "Lock supports under new islands"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1371
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1361
msgid "Remove selected points"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
msgid "Remove all points"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1374
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1364
msgid "Apply changes"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1375
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
msgid "Discard changes"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
msgid "Minimal points distance"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
-#: src/libslic3r/PrintConfig.cpp:2764
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
+#: src/libslic3r/PrintConfig.cpp:2781
msgid "Support points density"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1377
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1367
msgid "Auto-generate points"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56
msgid "Manual editing"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:494
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:484
msgid "Add support point"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:631
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:621
msgid "Delete support point"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:820
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:810
msgid "Change point head diameter"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:888
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:878
msgid "Support parameter change"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:996
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:986
msgid "SLA Support Points"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1017
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1007
msgid "SLA gizmo turned on"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1045
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1035
msgid "Do you want to save your manually edited support points?"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1046
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1036
msgid "Save changes?"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1058
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1048
msgid "SLA gizmo turned off"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1097
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1087
msgid "Move support point"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1196
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1186
msgid "Support points edit"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1268
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1258
msgid "Autogeneration will erase all manually edited points."
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1269
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1259
msgid "Are you sure you want to do it?"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1270 src/slic3r/GUI/GUI.cpp:251
-#: src/slic3r/GUI/Tab.cpp:3084 src/slic3r/GUI/WipeTowerDialog.cpp:45
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1260 src/slic3r/GUI/GUI.cpp:258
+#: src/slic3r/GUI/Tab.cpp:3075 src/slic3r/GUI/WipeTowerDialog.cpp:45
#: src/slic3r/GUI/WipeTowerDialog.cpp:366
msgid "Warning"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1273
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1263
msgid "Autogenerate support points"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1334
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1324
msgid "SLA gizmo keyboard shortcuts"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1345
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1335
msgid "Note: some shortcuts work in (non)editing mode only."
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1363
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1366
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1367
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357
msgid "Left click"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1363
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
msgid "Add point"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1364
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
msgid "Right click"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1364
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
msgid "Remove point"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1358
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1359
msgid "Drag"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
msgid "Move point"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1366
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
msgid "Add point to selection"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1367
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357
msgid "Remove point from selection"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1358
msgid "Select by rectangle"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1359
msgid "Deselect by rectangle"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1370
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1360
msgid "Select all points"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1372
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1362
msgid "Mouse wheel"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1372
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1362
msgid "Move clipping plane"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1373
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1363
msgid "Reset clipping plane"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1376
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1366
msgid "Switch to editing mode"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:489
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:497
msgid "Gizmo-Place on Face"
msgstr ""
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:563
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:571
msgid "Gizmo-Scale"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:138
+#: src/slic3r/GUI/GUI_App.cpp:184
#, possible-c-format
msgid ""
"%s has encountered an error. It was likely caused by running out of memory. "
@@ -1955,184 +1953,184 @@ msgid ""
"The application will now terminate."
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:141
+#: src/slic3r/GUI/GUI_App.cpp:187
msgid "Fatal error"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:442
+#: src/slic3r/GUI/GUI_App.cpp:487
msgid "Changing of an application language"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:450 src/slic3r/GUI/GUI_App.cpp:459
+#: src/slic3r/GUI/GUI_App.cpp:490 src/slic3r/GUI/GUI_App.cpp:498
msgid "Recreating"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:466
+#: src/slic3r/GUI/GUI_App.cpp:503
msgid "Loading of current presets"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:474
+#: src/slic3r/GUI/GUI_App.cpp:508
msgid "Loading of a mode view"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:555
+#: src/slic3r/GUI/GUI_App.cpp:587
msgid "Choose one file (3MF/AMF):"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:567
+#: src/slic3r/GUI/GUI_App.cpp:599
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:629
+#: src/slic3r/GUI/GUI_App.cpp:660
msgid "Select the language"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:629
+#: src/slic3r/GUI/GUI_App.cpp:660
msgid "Language"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:797
+#: src/slic3r/GUI/GUI_App.cpp:828
#, possible-c-format
msgid "Run %s"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:800
+#: src/slic3r/GUI/GUI_App.cpp:831
msgid "&Configuration Snapshots"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:800
+#: src/slic3r/GUI/GUI_App.cpp:831
msgid "Inspect / activate configuration snapshots"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:801
+#: src/slic3r/GUI/GUI_App.cpp:832
msgid "Take Configuration &Snapshot"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:801
+#: src/slic3r/GUI/GUI_App.cpp:832
msgid "Capture a configuration snapshot"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:802
+#: src/slic3r/GUI/GUI_App.cpp:833
msgid "Check for updates"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:802
+#: src/slic3r/GUI/GUI_App.cpp:833
msgid "Check for configuration updates"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:804
+#: src/slic3r/GUI/GUI_App.cpp:835
msgid "&Preferences"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:810
+#: src/slic3r/GUI/GUI_App.cpp:841
msgid "Application preferences"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:813 src/slic3r/GUI/wxExtensions.cpp:753
+#: src/slic3r/GUI/GUI_App.cpp:844 src/slic3r/GUI/wxExtensions.cpp:756
msgid "Simple"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:813
+#: src/slic3r/GUI/GUI_App.cpp:844
msgid "Simple View Mode"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:814 src/slic3r/GUI/GUI_ObjectList.cpp:104
-#: src/slic3r/GUI/GUI_ObjectList.cpp:622 src/slic3r/GUI/Tab.cpp:1087
-#: src/slic3r/GUI/Tab.cpp:1102 src/slic3r/GUI/Tab.cpp:1201
-#: src/slic3r/GUI/Tab.cpp:1204 src/slic3r/GUI/Tab.cpp:1470
-#: src/slic3r/GUI/Tab.cpp:1967 src/slic3r/GUI/Tab.cpp:3661
-#: src/slic3r/GUI/wxExtensions.cpp:754 src/libslic3r/PrintConfig.cpp:88
+#: src/slic3r/GUI/GUI_App.cpp:845 src/slic3r/GUI/GUI_ObjectList.cpp:104
+#: src/slic3r/GUI/GUI_ObjectList.cpp:620 src/slic3r/GUI/Tab.cpp:1147
+#: src/slic3r/GUI/Tab.cpp:1162 src/slic3r/GUI/Tab.cpp:1262
+#: src/slic3r/GUI/Tab.cpp:1265 src/slic3r/GUI/Tab.cpp:1526
+#: src/slic3r/GUI/Tab.cpp:1990 src/slic3r/GUI/Tab.cpp:3720
+#: src/slic3r/GUI/wxExtensions.cpp:757 src/libslic3r/PrintConfig.cpp:88
#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:223
-#: src/libslic3r/PrintConfig.cpp:1037 src/libslic3r/PrintConfig.cpp:2276
-#: src/libslic3r/PrintConfig.cpp:2448
+#: src/libslic3r/PrintConfig.cpp:1037 src/libslic3r/PrintConfig.cpp:2283
+#: src/libslic3r/PrintConfig.cpp:2455
msgid "Advanced"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:814
+#: src/slic3r/GUI/GUI_App.cpp:845
msgid "Advanced View Mode"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:815 src/slic3r/GUI/wxExtensions.cpp:755
+#: src/slic3r/GUI/GUI_App.cpp:846 src/slic3r/GUI/wxExtensions.cpp:758
msgid "Expert"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:815
+#: src/slic3r/GUI/GUI_App.cpp:846
msgid "Expert View Mode"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:820
+#: src/slic3r/GUI/GUI_App.cpp:851
msgid "Mode"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:820
+#: src/slic3r/GUI/GUI_App.cpp:851
#, possible-c-format
msgid "%s View Mode"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:822
+#: src/slic3r/GUI/GUI_App.cpp:853
msgid "&Language"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:824
+#: src/slic3r/GUI/GUI_App.cpp:855
msgid "Flash printer &firmware"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:824
+#: src/slic3r/GUI/GUI_App.cpp:855
msgid "Upload a firmware image into an Arduino based printer"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:839
+#: src/slic3r/GUI/GUI_App.cpp:870
msgid "Taking configuration snapshot"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:839
+#: src/slic3r/GUI/GUI_App.cpp:870
msgid "Snapshot name"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:882
+#: src/slic3r/GUI/GUI_App.cpp:917
msgid ""
"Switching the language will trigger application restart.\n"
"You will lose content of the plater."
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:884
+#: src/slic3r/GUI/GUI_App.cpp:919
msgid "Do you want to proceed?"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:885
+#: src/slic3r/GUI/GUI_App.cpp:920
msgid "Language selection"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:908
+#: src/slic3r/GUI/GUI_App.cpp:944
msgid "&Configuration"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:932
+#: src/slic3r/GUI/GUI_App.cpp:968
msgid "The presets on the following tabs were modified"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:932 src/slic3r/GUI/Tab.cpp:2946
+#: src/slic3r/GUI/GUI_App.cpp:968 src/slic3r/GUI/Tab.cpp:2935
msgid "Discard changes and continue anyway?"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:935
+#: src/slic3r/GUI/GUI_App.cpp:971
msgid "Unsaved Presets"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:1084 src/slic3r/GUI/Tab.cpp:2958
+#: src/slic3r/GUI/GUI_App.cpp:1120 src/slic3r/GUI/Tab.cpp:2947
msgid "It's impossible to print multi-part object(s) with SLA technology."
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:1085
+#: src/slic3r/GUI/GUI_App.cpp:1121
msgid "Please check and fix your object list."
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:1086 src/slic3r/GUI/Plater.cpp:2313
-#: src/slic3r/GUI/Tab.cpp:2960
+#: src/slic3r/GUI/GUI_App.cpp:1122 src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Tab.cpp:2949
msgid "Attention!"
msgstr ""
-#: src/slic3r/GUI/GUI_App.cpp:1103
+#: src/slic3r/GUI/GUI_App.cpp:1139
msgid "Select a gcode file:"
msgstr ""
@@ -2144,7 +2142,7 @@ msgstr ""
msgid "Stop at height"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:153
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:158
msgid "Remove layer range"
msgstr ""
@@ -2153,37 +2151,37 @@ msgid "Add layer range"
msgstr ""
#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:95
-#: src/slic3r/GUI/GUI_ObjectList.cpp:613 src/libslic3r/PrintConfig.cpp:72
+#: src/slic3r/GUI/GUI_ObjectList.cpp:611 src/libslic3r/PrintConfig.cpp:72
#: src/libslic3r/PrintConfig.cpp:175 src/libslic3r/PrintConfig.cpp:184
#: src/libslic3r/PrintConfig.cpp:408 src/libslic3r/PrintConfig.cpp:470
#: src/libslic3r/PrintConfig.cpp:478 src/libslic3r/PrintConfig.cpp:890
#: src/libslic3r/PrintConfig.cpp:1075 src/libslic3r/PrintConfig.cpp:1374
#: src/libslic3r/PrintConfig.cpp:1441 src/libslic3r/PrintConfig.cpp:1622
-#: src/libslic3r/PrintConfig.cpp:2074 src/libslic3r/PrintConfig.cpp:2133
-#: src/libslic3r/PrintConfig.cpp:2142
+#: src/libslic3r/PrintConfig.cpp:2081 src/libslic3r/PrintConfig.cpp:2140
+#: src/libslic3r/PrintConfig.cpp:2149
msgid "Layers and Perimeters"
msgstr ""
#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:97
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615 src/slic3r/GUI/GUI_Preview.cpp:246
-#: src/slic3r/GUI/Tab.cpp:1120 src/slic3r/GUI/Tab.cpp:1121
+#: src/slic3r/GUI/GUI_ObjectList.cpp:613 src/slic3r/GUI/GUI_Preview.cpp:246
+#: src/slic3r/GUI/Tab.cpp:1181 src/slic3r/GUI/Tab.cpp:1182
#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/PrintConfig.cpp:370
-#: src/libslic3r/PrintConfig.cpp:1502 src/libslic3r/PrintConfig.cpp:1866
-#: src/libslic3r/PrintConfig.cpp:1872 src/libslic3r/PrintConfig.cpp:1880
-#: src/libslic3r/PrintConfig.cpp:1892 src/libslic3r/PrintConfig.cpp:1902
-#: src/libslic3r/PrintConfig.cpp:1910 src/libslic3r/PrintConfig.cpp:1925
-#: src/libslic3r/PrintConfig.cpp:1946 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:1974 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1992 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2017 src/libslic3r/PrintConfig.cpp:2025
-#: src/libslic3r/PrintConfig.cpp:2026 src/libslic3r/PrintConfig.cpp:2035
-#: src/libslic3r/PrintConfig.cpp:2043 src/libslic3r/PrintConfig.cpp:2057
+#: src/libslic3r/PrintConfig.cpp:1502 src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1879 src/libslic3r/PrintConfig.cpp:1887
+#: src/libslic3r/PrintConfig.cpp:1899 src/libslic3r/PrintConfig.cpp:1909
+#: src/libslic3r/PrintConfig.cpp:1917 src/libslic3r/PrintConfig.cpp:1932
+#: src/libslic3r/PrintConfig.cpp:1953 src/libslic3r/PrintConfig.cpp:1965
+#: src/libslic3r/PrintConfig.cpp:1981 src/libslic3r/PrintConfig.cpp:1990
+#: src/libslic3r/PrintConfig.cpp:1999 src/libslic3r/PrintConfig.cpp:2010
+#: src/libslic3r/PrintConfig.cpp:2024 src/libslic3r/PrintConfig.cpp:2032
+#: src/libslic3r/PrintConfig.cpp:2033 src/libslic3r/PrintConfig.cpp:2042
+#: src/libslic3r/PrintConfig.cpp:2050 src/libslic3r/PrintConfig.cpp:2064
msgid "Support material"
msgstr ""
#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:101
-#: src/slic3r/GUI/GUI_ObjectList.cpp:619 src/libslic3r/PrintConfig.cpp:2252
-#: src/libslic3r/PrintConfig.cpp:2260
+#: src/slic3r/GUI/GUI_ObjectList.cpp:617 src/libslic3r/PrintConfig.cpp:2259
+#: src/libslic3r/PrintConfig.cpp:2267
msgid "Wipe options"
msgstr ""
@@ -2207,134 +2205,134 @@ msgstr ""
msgid "Add support blocker"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:616
-#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/Tab.cpp:1145
+#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:614
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/Tab.cpp:1206
#: src/libslic3r/PrintConfig.cpp:235 src/libslic3r/PrintConfig.cpp:458
#: src/libslic3r/PrintConfig.cpp:919 src/libslic3r/PrintConfig.cpp:1048
#: src/libslic3r/PrintConfig.cpp:1431 src/libslic3r/PrintConfig.cpp:1668
-#: src/libslic3r/PrintConfig.cpp:1716 src/libslic3r/PrintConfig.cpp:1768
-#: src/libslic3r/PrintConfig.cpp:2118
+#: src/libslic3r/PrintConfig.cpp:1723 src/libslic3r/PrintConfig.cpp:1775
+#: src/libslic3r/PrintConfig.cpp:2125
msgid "Speed"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:99 src/slic3r/GUI/GUI_ObjectList.cpp:617
-#: src/slic3r/GUI/Tab.cpp:1180 src/slic3r/GUI/Tab.cpp:1838
+#: src/slic3r/GUI/GUI_ObjectList.cpp:99 src/slic3r/GUI/GUI_ObjectList.cpp:615
+#: src/slic3r/GUI/Tab.cpp:1241 src/slic3r/GUI/Tab.cpp:1861
#: src/libslic3r/PrintConfig.cpp:488 src/libslic3r/PrintConfig.cpp:1002
-#: src/libslic3r/PrintConfig.cpp:1409 src/libslic3r/PrintConfig.cpp:1737
-#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1965
+#: src/libslic3r/PrintConfig.cpp:1409 src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1945 src/libslic3r/PrintConfig.cpp:1972
msgid "Extruders"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:100 src/slic3r/GUI/GUI_ObjectList.cpp:618
+#: src/slic3r/GUI/GUI_ObjectList.cpp:100 src/slic3r/GUI/GUI_ObjectList.cpp:616
#: src/libslic3r/PrintConfig.cpp:447 src/libslic3r/PrintConfig.cpp:555
#: src/libslic3r/PrintConfig.cpp:877 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1418 src/libslic3r/PrintConfig.cpp:1757
-#: src/libslic3r/PrintConfig.cpp:1947 src/libslic3r/PrintConfig.cpp:2106
+#: src/libslic3r/PrintConfig.cpp:1418 src/libslic3r/PrintConfig.cpp:1764
+#: src/libslic3r/PrintConfig.cpp:1954 src/libslic3r/PrintConfig.cpp:2113
msgid "Extrusion Width"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/GUI_ObjectList.cpp:624
-#: src/slic3r/GUI/Plater.cpp:495 src/slic3r/GUI/Tab.cpp:3604
-#: src/slic3r/GUI/Tab.cpp:3605 src/libslic3r/PrintConfig.cpp:2614
-#: src/libslic3r/PrintConfig.cpp:2621 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2649
-#: src/libslic3r/PrintConfig.cpp:2675 src/libslic3r/PrintConfig.cpp:2682
-#: src/libslic3r/PrintConfig.cpp:2693 src/libslic3r/PrintConfig.cpp:2703
-#: src/libslic3r/PrintConfig.cpp:2712 src/libslic3r/PrintConfig.cpp:2725
-#: src/libslic3r/PrintConfig.cpp:2735 src/libslic3r/PrintConfig.cpp:2744
-#: src/libslic3r/PrintConfig.cpp:2754 src/libslic3r/PrintConfig.cpp:2765
-#: src/libslic3r/PrintConfig.cpp:2773
+#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/GUI_ObjectList.cpp:622
+#: src/slic3r/GUI/Plater.cpp:500 src/slic3r/GUI/Tab.cpp:3661
+#: src/slic3r/GUI/Tab.cpp:3662 src/libslic3r/PrintConfig.cpp:2621
+#: src/libslic3r/PrintConfig.cpp:2628 src/libslic3r/PrintConfig.cpp:2637
+#: src/libslic3r/PrintConfig.cpp:2646 src/libslic3r/PrintConfig.cpp:2656
+#: src/libslic3r/PrintConfig.cpp:2692 src/libslic3r/PrintConfig.cpp:2699
+#: src/libslic3r/PrintConfig.cpp:2710 src/libslic3r/PrintConfig.cpp:2720
+#: src/libslic3r/PrintConfig.cpp:2729 src/libslic3r/PrintConfig.cpp:2742
+#: src/libslic3r/PrintConfig.cpp:2752 src/libslic3r/PrintConfig.cpp:2761
+#: src/libslic3r/PrintConfig.cpp:2771 src/libslic3r/PrintConfig.cpp:2782
+#: src/libslic3r/PrintConfig.cpp:2790
msgid "Supports"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:107 src/slic3r/GUI/GUI_ObjectList.cpp:625
-#: src/slic3r/GUI/Plater.cpp:635 src/slic3r/GUI/Tab.cpp:3636
-#: src/slic3r/GUI/Tab.cpp:3637 src/libslic3r/PrintConfig.cpp:2781
-#: src/libslic3r/PrintConfig.cpp:2788 src/libslic3r/PrintConfig.cpp:2802
-#: src/libslic3r/PrintConfig.cpp:2813 src/libslic3r/PrintConfig.cpp:2823
-#: src/libslic3r/PrintConfig.cpp:2845 src/libslic3r/PrintConfig.cpp:2856
-#: src/libslic3r/PrintConfig.cpp:2863 src/libslic3r/PrintConfig.cpp:2870
-#: src/libslic3r/PrintConfig.cpp:2881 src/libslic3r/PrintConfig.cpp:2890
-#: src/libslic3r/PrintConfig.cpp:2899
+#: src/slic3r/GUI/GUI_ObjectList.cpp:107 src/slic3r/GUI/GUI_ObjectList.cpp:623
+#: src/slic3r/GUI/Plater.cpp:640 src/slic3r/GUI/Tab.cpp:3695
+#: src/slic3r/GUI/Tab.cpp:3696 src/libslic3r/PrintConfig.cpp:2798
+#: src/libslic3r/PrintConfig.cpp:2805 src/libslic3r/PrintConfig.cpp:2819
+#: src/libslic3r/PrintConfig.cpp:2830 src/libslic3r/PrintConfig.cpp:2840
+#: src/libslic3r/PrintConfig.cpp:2862 src/libslic3r/PrintConfig.cpp:2873
+#: src/libslic3r/PrintConfig.cpp:2880 src/libslic3r/PrintConfig.cpp:2887
+#: src/libslic3r/PrintConfig.cpp:2898 src/libslic3r/PrintConfig.cpp:2907
+#: src/libslic3r/PrintConfig.cpp:2916
msgid "Pad"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:108 src/slic3r/GUI/Tab.cpp:3654
-#: src/slic3r/GUI/Tab.cpp:3655 src/libslic3r/SLA/Hollowing.cpp:46
+#: src/slic3r/GUI/GUI_ObjectList.cpp:108 src/slic3r/GUI/Tab.cpp:3713
+#: src/slic3r/GUI/Tab.cpp:3714 src/libslic3r/SLA/Hollowing.cpp:46
#: src/libslic3r/SLA/Hollowing.cpp:58 src/libslic3r/SLA/Hollowing.cpp:67
-#: src/libslic3r/SLA/Hollowing.cpp:76 src/libslic3r/PrintConfig.cpp:2909
-#: src/libslic3r/PrintConfig.cpp:2916 src/libslic3r/PrintConfig.cpp:2926
-#: src/libslic3r/PrintConfig.cpp:2935
+#: src/libslic3r/SLA/Hollowing.cpp:76 src/libslic3r/PrintConfig.cpp:2926
+#: src/libslic3r/PrintConfig.cpp:2933 src/libslic3r/PrintConfig.cpp:2943
+#: src/libslic3r/PrintConfig.cpp:2952
msgid "Hollowing"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:270
+#: src/slic3r/GUI/GUI_ObjectList.cpp:275
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:153
msgid "Name"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:278 src/slic3r/GUI/Tab.cpp:1434
+#: src/slic3r/GUI/GUI_ObjectList.cpp:283 src/slic3r/GUI/Tab.cpp:1490
#: src/slic3r/GUI/wxExtensions.cpp:598 src/libslic3r/PrintConfig.cpp:487
msgid "Extruder"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:282 src/slic3r/GUI/GUI_ObjectList.cpp:394
+#: src/slic3r/GUI/GUI_ObjectList.cpp:287 src/slic3r/GUI/GUI_ObjectList.cpp:400
msgid "Editing"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:339
+#: src/slic3r/GUI/GUI_ObjectList.cpp:345
#, possible-c-format
msgid "Auto-repaired (%d errors):"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:346
+#: src/slic3r/GUI/GUI_ObjectList.cpp:352
msgid "degenerate facets"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:347
+#: src/slic3r/GUI/GUI_ObjectList.cpp:353
msgid "edges fixed"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:348
+#: src/slic3r/GUI/GUI_ObjectList.cpp:354
msgid "facets removed"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:349
+#: src/slic3r/GUI/GUI_ObjectList.cpp:355
msgid "facets added"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:350
+#: src/slic3r/GUI/GUI_ObjectList.cpp:356
msgid "facets reversed"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:351
+#: src/slic3r/GUI/GUI_ObjectList.cpp:357
msgid "backwards edges"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:359
+#: src/slic3r/GUI/GUI_ObjectList.cpp:365
msgid "Right button click the icon to fix STL through Netfabb"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:396
+#: src/slic3r/GUI/GUI_ObjectList.cpp:402
msgid "Right button click the icon to change the object settings"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:398
+#: src/slic3r/GUI/GUI_ObjectList.cpp:404
msgid "Click the icon to change the object settings"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:402
+#: src/slic3r/GUI/GUI_ObjectList.cpp:408
msgid "Right button click the icon to change the object printable property"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:404
+#: src/slic3r/GUI/GUI_ObjectList.cpp:410
msgid "Click the icon to change the object printable property"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:457 src/slic3r/GUI/GUI_ObjectList.cpp:469
-#: src/slic3r/GUI/GUI_ObjectList.cpp:917 src/slic3r/GUI/GUI_ObjectList.cpp:3967
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3977
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4012
+#: src/slic3r/GUI/GUI_ObjectList.cpp:455 src/slic3r/GUI/GUI_ObjectList.cpp:467
+#: src/slic3r/GUI/GUI_ObjectList.cpp:925 src/slic3r/GUI/GUI_ObjectList.cpp:4036
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4046
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4081
#: src/slic3r/GUI/ObjectDataViewModel.cpp:200
#: src/slic3r/GUI/ObjectDataViewModel.cpp:257
#: src/slic3r/GUI/ObjectDataViewModel.cpp:282
@@ -2343,368 +2341,389 @@ msgstr ""
msgid "default"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:536
+#: src/slic3r/GUI/GUI_ObjectList.cpp:534
msgid "Change Extruder"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:551
+#: src/slic3r/GUI/GUI_ObjectList.cpp:549
msgid "Rename Object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:551
+#: src/slic3r/GUI/GUI_ObjectList.cpp:549
msgid "Rename Sub-object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1091
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3781
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1099
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3850
msgid "Instances to Separated Objects"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1106
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1114
msgid "Volumes in Object reordered"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1106
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1114
msgid "Object reordered"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1182
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1530
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1536
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1849
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1190
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1538
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1544
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1857
#, possible-c-format
msgid "Quick Add Settings (%s)"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1265
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1273
msgid "Select showing settings"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1314
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1322
msgid "Add Settings for Layers"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1315
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1323
msgid "Add Settings for Sub-object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1316
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1324
msgid "Add Settings for Object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1386
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1394
msgid "Add Settings Bundle for Height range"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1387
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1395
msgid "Add Settings Bundle for Sub-object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1388
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1396
msgid "Add Settings Bundle for Object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1427
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1435
msgid "Load"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1432
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1464
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1468
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1440
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1472
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1476
msgid "Box"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1432
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1440
msgid "Cylinder"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1432
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1440
msgid "Sphere"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1432
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1440
msgid "Slab"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1500
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1508
msgid "Height range Modifier"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1509
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1517
msgid "Add settings"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1589
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1597
msgid "Change type"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1599
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1611
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1607
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1619
msgid "Set as a Separated Object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1611
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1619
msgid "Set as a Separated Objects"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1621
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1629
msgid "Printable"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1644
msgid "Rename"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1647
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
msgid "Fix through the Netfabb"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1657 src/slic3r/GUI/Plater.cpp:3966
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1665 src/slic3r/GUI/Plater.cpp:4033
msgid "Export as STL"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1664
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3956 src/slic3r/GUI/Plater.cpp:3934
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1672
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4025 src/slic3r/GUI/Plater.cpp:4001
msgid "Reload the selected volumes from disk"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1671
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1679
msgid "Set extruder for selected items"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1704 src/libslic3r/PrintConfig.cpp:335
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1712 src/libslic3r/PrintConfig.cpp:335
msgid "Default"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1724
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1732
msgid "Scale to print volume"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1724
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1732
msgid "Scale the selected object to fit the print volume"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1793
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2051
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1801
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2059
msgid "Add Shape"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1879
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1887
msgid "Load Part"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1918
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1926
msgid "Error!"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1993
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2001
msgid "Add Generic Subobject"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2022
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2030
msgid "Generic"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2140
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2242
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2148
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2250
msgid "Last instance of an object cannot be deleted."
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2152
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2160
msgid "Delete Settings"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2176
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2184
msgid "Delete All Instances from Object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2192
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2200
msgid "Delete Height Range"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2223
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2231
msgid "From Object List You can't delete the last solid part from object."
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2227
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2235
msgid "Delete Subobject"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2246
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2254
msgid "Delete Instance"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2270 src/slic3r/GUI/Plater.cpp:2978
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2278 src/slic3r/GUI/Plater.cpp:3045
msgid ""
"The selected object couldn't be split because it contains only one part."
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2274
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2282
msgid "Split to Parts"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2328
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2336
msgid "Add Layers"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2454
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2462
msgid "Group manipulation"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2466
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2474
msgid "Object manipulation"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2479
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2487
msgid "Object Settings to modify"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2483
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2491
msgid "Part Settings to modify"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2488
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2496
msgid "Layer range Settings to modify"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2494
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2502
msgid "Part manipulation"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2500
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2508
msgid "Instance manipulation"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2507
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2515
msgid "Height ranges"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2507
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2515
msgid "Settings for height range"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2693
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2701
msgid "Delete Selected Item"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2830
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2838
msgid "Delete Selected"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2896
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2925
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2943
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2914
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2942
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2962
msgid "Add Height Range"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3003
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"The next layer range is too thin to be split to two\n"
+"without violating the minimum layer height."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid ""
+"Cannot insert a new layer range between the current and the next layer "
+"range.\n"
+"The gap between the current layer range and the next layer range\n"
+"is thinner than the minimum layer height allowed."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"Current layer range overlaps with the next layer range."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3070
msgid "Edit Height Range"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3291
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3360
msgid "Selection-Remove from list"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3299
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3368
msgid "Selection-Add from list"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3417
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3486
msgid "Object or Instance"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3418
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3551
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3487
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3620
msgid "Part"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3418
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3487
msgid "Layer"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3420
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3489
msgid "Unsupported selection"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3421
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3490
#, possible-c-format
msgid "You started your selection with %s Item."
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3422
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3491
#, possible-c-format
msgid "In this mode you can select only other %s Items%s"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3425
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3494
msgid "of a current Object"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3430
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3505 src/slic3r/GUI/Plater.cpp:141
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3499
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3574 src/slic3r/GUI/Plater.cpp:141
msgid "Info"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3546
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3615
msgid "You can't change a type of the last solid part of the object."
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3551
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3620
msgid "Modifier"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3551
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3620
msgid "Support Enforcer"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3551
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3620
msgid "Support Blocker"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3553
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3622
msgid "Select type of part"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3558
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3627
msgid "Change Part Type"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3803
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3872
msgid "Enter new name"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3803
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3872
msgid "Renaming"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3819
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3926 src/slic3r/GUI/Tab.cpp:3456
-#: src/slic3r/GUI/Tab.cpp:3460
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3888
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3995 src/slic3r/GUI/Tab.cpp:3519
+#: src/slic3r/GUI/Tab.cpp:3523
msgid "The supplied name is not valid;"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3820
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3927 src/slic3r/GUI/Tab.cpp:3457
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3889
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3996 src/slic3r/GUI/Tab.cpp:3520
msgid "the following characters are not allowed:"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3971
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4040
msgid "Select extruder number:"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3972
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4041
msgid "This extruder will be set for selected items"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3997
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4066
msgid "Change Extruders"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4094 src/slic3r/GUI/Selection.cpp:1474
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4163 src/slic3r/GUI/Selection.cpp:1475
msgid "Set Printable"
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4094 src/slic3r/GUI/Selection.cpp:1474
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4163 src/slic3r/GUI/Selection.cpp:1475
msgid "Set Unprintable"
msgstr ""
@@ -2722,7 +2741,7 @@ msgstr ""
msgid "Select coordinate space, in which the transformation will be performed."
msgstr ""
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:155 src/libslic3r/GCode.cpp:638
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:155 src/libslic3r/GCode.cpp:641
msgid "Object name"
msgstr ""
@@ -2733,8 +2752,8 @@ msgstr ""
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:216
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:458
-#: src/slic3r/GUI/Mouse3DController.cpp:304
-#: src/slic3r/GUI/Mouse3DController.cpp:321
+#: src/slic3r/GUI/Mouse3DController.cpp:290
+#: src/slic3r/GUI/Mouse3DController.cpp:313
msgid "Rotation"
msgstr ""
@@ -2836,11 +2855,11 @@ msgstr ""
msgid "Height"
msgstr ""
-#: src/slic3r/GUI/GUI_Preview.cpp:223 src/libslic3r/PrintConfig.cpp:2238
+#: src/slic3r/GUI/GUI_Preview.cpp:223 src/libslic3r/PrintConfig.cpp:2245
msgid "Width"
msgstr ""
-#: src/slic3r/GUI/GUI_Preview.cpp:225 src/slic3r/GUI/Tab.cpp:1457
+#: src/slic3r/GUI/GUI_Preview.cpp:225 src/slic3r/GUI/Tab.cpp:1513
msgid "Fan speed"
msgstr ""
@@ -2884,12 +2903,12 @@ msgid "Internal infill"
msgstr ""
#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/ExtrusionEntity.cpp:314
-#: src/libslic3r/PrintConfig.cpp:1756 src/libslic3r/PrintConfig.cpp:1767
+#: src/libslic3r/PrintConfig.cpp:1763 src/libslic3r/PrintConfig.cpp:1774
msgid "Solid infill"
msgstr ""
#: src/slic3r/GUI/GUI_Preview.cpp:242 src/libslic3r/ExtrusionEntity.cpp:315
-#: src/libslic3r/PrintConfig.cpp:2105 src/libslic3r/PrintConfig.cpp:2117
+#: src/libslic3r/PrintConfig.cpp:2112 src/libslic3r/PrintConfig.cpp:2124
msgid "Top solid infill"
msgstr ""
@@ -2902,22 +2921,22 @@ msgstr ""
msgid "Gap fill"
msgstr ""
-#: src/slic3r/GUI/GUI_Preview.cpp:245 src/slic3r/GUI/Tab.cpp:1111
+#: src/slic3r/GUI/GUI_Preview.cpp:245 src/slic3r/GUI/Tab.cpp:1171
#: src/libslic3r/ExtrusionEntity.cpp:318
msgid "Skirt"
msgstr ""
#: src/slic3r/GUI/GUI_Preview.cpp:247 src/libslic3r/ExtrusionEntity.cpp:320
-#: src/libslic3r/PrintConfig.cpp:1991
+#: src/libslic3r/PrintConfig.cpp:1998
msgid "Support material interface"
msgstr ""
-#: src/slic3r/GUI/GUI_Preview.cpp:248 src/slic3r/GUI/Tab.cpp:1191
+#: src/slic3r/GUI/GUI_Preview.cpp:248 src/slic3r/GUI/Tab.cpp:1252
#: src/libslic3r/ExtrusionEntity.cpp:321
msgid "Wipe tower"
msgstr ""
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/PrintConfig.cpp:2152
+#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/PrintConfig.cpp:2159
msgid "Travel"
msgstr ""
@@ -2941,7 +2960,7 @@ msgstr ""
msgid "ERROR: not enough resources to execute a new job."
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:41 src/slic3r/GUI/MainFrame.cpp:708
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:41 src/slic3r/GUI/MainFrame.cpp:789
msgid "Keyboard Shortcuts"
msgstr ""
@@ -2977,12 +2996,12 @@ msgstr ""
msgid "Load Config from ini/amf/3mf/gcode and merge"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 src/slic3r/GUI/Plater.cpp:891
-#: src/slic3r/GUI/Plater.cpp:5521 src/libslic3r/PrintConfig.cpp:3353
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 src/slic3r/GUI/Plater.cpp:896
+#: src/slic3r/GUI/Plater.cpp:5562 src/libslic3r/PrintConfig.cpp:3375
msgid "Export G-code"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Plater.cpp:5522
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Plater.cpp:5563
msgid "Send G-code"
msgstr ""
@@ -2990,64 +3009,72 @@ msgstr ""
msgid "Export config"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Select all objects"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:125 src/slic3r/GUI/Plater.cpp:885
+msgid "Export to SD card / Flash drive"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
-msgid "Deselect all"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
msgstr ""
#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
+msgid "Select all objects"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
+msgid "Deselect all"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
msgid "Delete selected"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
msgid "Copy to clipboard"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
msgid "Paste from clipboard"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
msgid "Reload plater from disk"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
msgid "Select Plater Tab"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
msgid "Select Print Settings Tab"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
msgid "Select Filament Settings Tab"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
msgid "Select Printer Settings Tab"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
msgid "Switch to 3D"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
msgid "Switch to Preview"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
#: src/slic3r/GUI/PrintHostDialogs.cpp:136
msgid "Print host upload queue"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
msgid "Camera view"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
msgid "Show/Hide object/instance labels"
msgstr ""
@@ -3210,7 +3237,7 @@ msgstr ""
msgid "Show/Hide 3Dconnexion devices settings dialog"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:192 src/slic3r/GUI/MainFrame.cpp:204
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:192 src/slic3r/GUI/MainFrame.cpp:256
msgid "Plater"
msgstr ""
@@ -3255,8 +3282,8 @@ msgstr ""
msgid "Show/Hide Legend"
msgstr ""
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 src/slic3r/GUI/Plater.cpp:4105
-#: src/slic3r/GUI/Tab.cpp:2390
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 src/slic3r/GUI/Plater.cpp:4172
+#: src/slic3r/GUI/Tab.cpp:2375
msgid "Preview"
msgstr ""
@@ -3292,614 +3319,632 @@ msgstr ""
msgid "Keyboard shortcuts"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:66
+#: src/slic3r/GUI/MainFrame.cpp:71
msgid ""
" - Remember to check for updates at http://github.com/prusa3d/PrusaSlicer/"
"releases"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:174
+#: src/slic3r/GUI/MainFrame.cpp:226
msgid "based on Slic3r"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:405
+#: src/slic3r/GUI/MainFrame.cpp:478
msgid "&New Project"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:405
+#: src/slic3r/GUI/MainFrame.cpp:478
msgid "Start a new project"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:408
+#: src/slic3r/GUI/MainFrame.cpp:481
msgid "&Open Project"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:408
+#: src/slic3r/GUI/MainFrame.cpp:481
msgid "Open a project file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:413
+#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Recent projects"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
+#: src/slic3r/GUI/MainFrame.cpp:495
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:422 src/slic3r/GUI/MainFrame.cpp:785
+#: src/slic3r/GUI/MainFrame.cpp:495 src/slic3r/GUI/MainFrame.cpp:866
#: src/slic3r/GUI/PrintHostDialogs.cpp:231
msgid "Error"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:446
+#: src/slic3r/GUI/MainFrame.cpp:520
msgid "&Save Project"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:446
+#: src/slic3r/GUI/MainFrame.cpp:520
msgid "Save current project file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:450 src/slic3r/GUI/MainFrame.cpp:452
+#: src/slic3r/GUI/MainFrame.cpp:524 src/slic3r/GUI/MainFrame.cpp:526
msgid "Save Project &as"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:450 src/slic3r/GUI/MainFrame.cpp:452
+#: src/slic3r/GUI/MainFrame.cpp:524 src/slic3r/GUI/MainFrame.cpp:526
msgid "Save current project file as"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:460
+#: src/slic3r/GUI/MainFrame.cpp:534
msgid "Import STL/OBJ/AM&F/3MF"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:460
+#: src/slic3r/GUI/MainFrame.cpp:534
msgid "Load a model"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:464
+#: src/slic3r/GUI/MainFrame.cpp:538
msgid "Import &Config"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:464
+#: src/slic3r/GUI/MainFrame.cpp:538
msgid "Load exported configuration file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:467
+#: src/slic3r/GUI/MainFrame.cpp:541
msgid "Import Config from &project"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:467
+#: src/slic3r/GUI/MainFrame.cpp:541
msgid "Load configuration from project file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:471
+#: src/slic3r/GUI/MainFrame.cpp:545
msgid "Import Config &Bundle"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:471
+#: src/slic3r/GUI/MainFrame.cpp:545
msgid "Load presets from a bundle"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:474
+#: src/slic3r/GUI/MainFrame.cpp:548
msgid "&Import"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:477 src/slic3r/GUI/MainFrame.cpp:749
+#: src/slic3r/GUI/MainFrame.cpp:551 src/slic3r/GUI/MainFrame.cpp:830
msgid "Export &G-code"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:477
+#: src/slic3r/GUI/MainFrame.cpp:551
msgid "Export current plate as G-code"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:481 src/slic3r/GUI/MainFrame.cpp:750
+#: src/slic3r/GUI/MainFrame.cpp:555 src/slic3r/GUI/MainFrame.cpp:831
msgid "S&end G-code"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:481
+#: src/slic3r/GUI/MainFrame.cpp:555
msgid "Send to print current plate as G-code"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:559
+msgid "Export G-code to SD card / Flash drive"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:559
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:563
msgid "Export plate as &STL"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:563
msgid "Export current plate as STL"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:489
+#: src/slic3r/GUI/MainFrame.cpp:566
msgid "Export plate as STL &including supports"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:489
+#: src/slic3r/GUI/MainFrame.cpp:566
msgid "Export current plate as STL including supports"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:569
msgid "Export plate as &AMF"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:569
msgid "Export current plate as AMF"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:496
+#: src/slic3r/GUI/MainFrame.cpp:573
msgid "Export &toolpaths as OBJ"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:496
+#: src/slic3r/GUI/MainFrame.cpp:573
msgid "Export toolpaths as OBJ"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:500
+#: src/slic3r/GUI/MainFrame.cpp:577
msgid "Export &Config"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:500
+#: src/slic3r/GUI/MainFrame.cpp:577
msgid "Export current configuration to file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:503
+#: src/slic3r/GUI/MainFrame.cpp:580
msgid "Export Config &Bundle"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:503
+#: src/slic3r/GUI/MainFrame.cpp:580
msgid "Export all presets to file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:506
+#: src/slic3r/GUI/MainFrame.cpp:583
msgid "&Export"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:512
+#: src/slic3r/GUI/MainFrame.cpp:585
+msgid "Ejec&t SD card / Flash drive"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:585
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:593
msgid "Quick Slice"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:512
+#: src/slic3r/GUI/MainFrame.cpp:593
msgid "Slice a file into a G-code"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:518
+#: src/slic3r/GUI/MainFrame.cpp:599
msgid "Quick Slice and Save As"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:518
+#: src/slic3r/GUI/MainFrame.cpp:599
msgid "Slice a file into a G-code, save as"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:524
+#: src/slic3r/GUI/MainFrame.cpp:605
msgid "Repeat Last Quick Slice"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:524
+#: src/slic3r/GUI/MainFrame.cpp:605
msgid "Repeat last quick slice"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:532
+#: src/slic3r/GUI/MainFrame.cpp:613
msgid "(Re)Slice No&w"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:532
+#: src/slic3r/GUI/MainFrame.cpp:613
msgid "Start new slicing process"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:536
+#: src/slic3r/GUI/MainFrame.cpp:617
msgid "&Repair STL file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:536
+#: src/slic3r/GUI/MainFrame.cpp:617
msgid "Automatically repair an STL file"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:540
+#: src/slic3r/GUI/MainFrame.cpp:621
msgid "&Quit"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:540
+#: src/slic3r/GUI/MainFrame.cpp:621
#, possible-c-format
msgid "Quit %s"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:565
+#: src/slic3r/GUI/MainFrame.cpp:646
msgid "&Select all"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:566
+#: src/slic3r/GUI/MainFrame.cpp:647
msgid "Selects all objects"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:568
+#: src/slic3r/GUI/MainFrame.cpp:649
msgid "D&eselect all"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:569
+#: src/slic3r/GUI/MainFrame.cpp:650
msgid "Deselects all objects"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:572
+#: src/slic3r/GUI/MainFrame.cpp:653
msgid "&Delete selected"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:573
+#: src/slic3r/GUI/MainFrame.cpp:654
msgid "Deletes the current selection"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:575
+#: src/slic3r/GUI/MainFrame.cpp:656
msgid "Delete &all"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:576
+#: src/slic3r/GUI/MainFrame.cpp:657
msgid "Deletes all objects"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:580
+#: src/slic3r/GUI/MainFrame.cpp:661
msgid "&Undo"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:583
+#: src/slic3r/GUI/MainFrame.cpp:664
msgid "&Redo"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:588
+#: src/slic3r/GUI/MainFrame.cpp:669
msgid "&Copy"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:589
+#: src/slic3r/GUI/MainFrame.cpp:670
msgid "Copy selection to clipboard"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:591
+#: src/slic3r/GUI/MainFrame.cpp:672
msgid "&Paste"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:592
+#: src/slic3r/GUI/MainFrame.cpp:673
msgid "Paste clipboard"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:596
+#: src/slic3r/GUI/MainFrame.cpp:677
msgid "Re&load from disk"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:597
+#: src/slic3r/GUI/MainFrame.cpp:678
msgid "Reload the plater from disk"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:606
+#: src/slic3r/GUI/MainFrame.cpp:687
msgid "&Plater Tab"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:606
+#: src/slic3r/GUI/MainFrame.cpp:687
msgid "Show the plater"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:695
msgid "P&rint Settings Tab"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:695
msgid "Show the print settings"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:617 src/slic3r/GUI/MainFrame.cpp:752
+#: src/slic3r/GUI/MainFrame.cpp:698 src/slic3r/GUI/MainFrame.cpp:833
msgid "&Filament Settings Tab"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:617
+#: src/slic3r/GUI/MainFrame.cpp:698
msgid "Show the filament settings"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:621
+#: src/slic3r/GUI/MainFrame.cpp:702
msgid "Print&er Settings Tab"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:621
+#: src/slic3r/GUI/MainFrame.cpp:702
msgid "Show the printer settings"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:626
+#: src/slic3r/GUI/MainFrame.cpp:707
msgid "3&D"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:626
+#: src/slic3r/GUI/MainFrame.cpp:707
msgid "Show the 3D editing view"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:710
msgid "Pre&view"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:710
msgid "Show the 3D slices preview"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:648
+#: src/slic3r/GUI/MainFrame.cpp:729
msgid "Print &Host Upload Queue"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:648
+#: src/slic3r/GUI/MainFrame.cpp:729
msgid "Display the Print Host Upload Queue window"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:658
+#: src/slic3r/GUI/MainFrame.cpp:739
msgid "Iso"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:658
+#: src/slic3r/GUI/MainFrame.cpp:739
msgid "Iso View"
msgstr ""
#. TRN To be shown in the main menu View->Top
#. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:662 src/libslic3r/PrintConfig.cpp:2132
-#: src/libslic3r/PrintConfig.cpp:2141
+#: src/slic3r/GUI/MainFrame.cpp:743 src/libslic3r/PrintConfig.cpp:2139
+#: src/libslic3r/PrintConfig.cpp:2148
msgid "Top"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:662
+#: src/slic3r/GUI/MainFrame.cpp:743
msgid "Top View"
msgstr ""
#. TRN To be shown in the main menu View->Bottom
#. TRN To be shown in Print Settings "Bottom solid layers"
#. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:665 src/libslic3r/PrintConfig.cpp:174
+#: src/slic3r/GUI/MainFrame.cpp:746 src/libslic3r/PrintConfig.cpp:174
#: src/libslic3r/PrintConfig.cpp:183
msgid "Bottom"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:665
+#: src/slic3r/GUI/MainFrame.cpp:746
msgid "Bottom View"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:667
+#: src/slic3r/GUI/MainFrame.cpp:748
msgid "Front"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:667
+#: src/slic3r/GUI/MainFrame.cpp:748
msgid "Front View"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:669 src/libslic3r/PrintConfig.cpp:1632
+#: src/slic3r/GUI/MainFrame.cpp:750 src/libslic3r/PrintConfig.cpp:1632
msgid "Rear"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:669
+#: src/slic3r/GUI/MainFrame.cpp:750
msgid "Rear View"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:671
+#: src/slic3r/GUI/MainFrame.cpp:752
msgid "Left"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:671
+#: src/slic3r/GUI/MainFrame.cpp:752
msgid "Left View"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:673
+#: src/slic3r/GUI/MainFrame.cpp:754
msgid "Right"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:673
+#: src/slic3r/GUI/MainFrame.cpp:754
msgid "Right View"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:676
+#: src/slic3r/GUI/MainFrame.cpp:757
msgid "Show &labels"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:676
+#: src/slic3r/GUI/MainFrame.cpp:757
msgid "Show object/instance labels in 3D scene"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:684
+#: src/slic3r/GUI/MainFrame.cpp:765
msgid "Prusa 3D &Drivers"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:684
+#: src/slic3r/GUI/MainFrame.cpp:765
msgid "Open the Prusa3D drivers download page in your browser"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:686
+#: src/slic3r/GUI/MainFrame.cpp:767
msgid "Software &Releases"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:686
+#: src/slic3r/GUI/MainFrame.cpp:767
msgid "Open the software releases page in your browser"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:692
+#: src/slic3r/GUI/MainFrame.cpp:773
#, possible-c-format
msgid "%s &Website"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:693
+#: src/slic3r/GUI/MainFrame.cpp:774
#, possible-c-format
msgid "Open the %s website in your browser"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:699
+#: src/slic3r/GUI/MainFrame.cpp:780
msgid "System &Info"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:699
+#: src/slic3r/GUI/MainFrame.cpp:780
msgid "Show system information"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:701
+#: src/slic3r/GUI/MainFrame.cpp:782
msgid "Show &Configuration Folder"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:701
+#: src/slic3r/GUI/MainFrame.cpp:782
msgid "Show user configuration folder (datadir)"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:703
+#: src/slic3r/GUI/MainFrame.cpp:784
msgid "Report an I&ssue"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:703
+#: src/slic3r/GUI/MainFrame.cpp:784
#, possible-c-format
msgid "Report an issue on %s"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:705
+#: src/slic3r/GUI/MainFrame.cpp:786
#, possible-c-format
msgid "&About %s"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:705
+#: src/slic3r/GUI/MainFrame.cpp:786
msgid "Show about dialog"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:708
+#: src/slic3r/GUI/MainFrame.cpp:789
msgid "Show the list of the keyboard shortcuts"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:721
+#: src/slic3r/GUI/MainFrame.cpp:802
msgid "&File"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:722
+#: src/slic3r/GUI/MainFrame.cpp:803
msgid "&Edit"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:723
+#: src/slic3r/GUI/MainFrame.cpp:804
msgid "&Window"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:724
+#: src/slic3r/GUI/MainFrame.cpp:805
msgid "&View"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:727
+#: src/slic3r/GUI/MainFrame.cpp:808
msgid "&Help"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:749
+#: src/slic3r/GUI/MainFrame.cpp:830
msgid "E&xport"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:750
+#: src/slic3r/GUI/MainFrame.cpp:831
msgid "S&end to print"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:752
+#: src/slic3r/GUI/MainFrame.cpp:833
msgid "Mate&rial Settings Tab"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:773
+#: src/slic3r/GUI/MainFrame.cpp:854
msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:784
+#: src/slic3r/GUI/MainFrame.cpp:865
msgid "No previously sliced file."
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:790
+#: src/slic3r/GUI/MainFrame.cpp:871
msgid "Previously sliced file ("
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:790
+#: src/slic3r/GUI/MainFrame.cpp:871
msgid ") not found."
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:791
+#: src/slic3r/GUI/MainFrame.cpp:872
msgid "File Not Found"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:826
+#: src/slic3r/GUI/MainFrame.cpp:907
#, possible-c-format
msgid "Save %s file as:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:826
+#: src/slic3r/GUI/MainFrame.cpp:907
msgid "SVG"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:826
+#: src/slic3r/GUI/MainFrame.cpp:907
msgid "G-code"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:838
+#: src/slic3r/GUI/MainFrame.cpp:919
msgid "Save zip file as:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:847 src/slic3r/GUI/Plater.cpp:3121
-#: src/slic3r/GUI/Plater.cpp:5107 src/slic3r/GUI/Tab.cpp:1221
-#: src/slic3r/GUI/Tab.cpp:3662
+#: src/slic3r/GUI/MainFrame.cpp:928 src/slic3r/GUI/Plater.cpp:3188
+#: src/slic3r/GUI/Plater.cpp:5165 src/slic3r/GUI/Tab.cpp:1282
+#: src/slic3r/GUI/Tab.cpp:3721
msgid "Slicing"
msgstr ""
#. TRN "Processing input_file_basename"
-#: src/slic3r/GUI/MainFrame.cpp:849
+#: src/slic3r/GUI/MainFrame.cpp:930
#, possible-c-format
msgid "Processing %s"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:872
+#: src/slic3r/GUI/MainFrame.cpp:953
msgid " was successfully sliced."
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:874
+#: src/slic3r/GUI/MainFrame.cpp:955
msgid "Slicing Done!"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:889
+#: src/slic3r/GUI/MainFrame.cpp:970
msgid "Select the STL file to repair:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:899
+#: src/slic3r/GUI/MainFrame.cpp:980
msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:911
+#: src/slic3r/GUI/MainFrame.cpp:992
msgid "Your file was repaired."
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:911 src/libslic3r/PrintConfig.cpp:3447
+#: src/slic3r/GUI/MainFrame.cpp:992 src/libslic3r/PrintConfig.cpp:3469
msgid "Repair"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:925
+#: src/slic3r/GUI/MainFrame.cpp:1006
msgid "Save configuration as:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:944 src/slic3r/GUI/MainFrame.cpp:1006
+#: src/slic3r/GUI/MainFrame.cpp:1025 src/slic3r/GUI/MainFrame.cpp:1087
msgid "Select configuration to load:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:980
+#: src/slic3r/GUI/MainFrame.cpp:1061
msgid "Save presets bundle as:"
msgstr ""
-#: src/slic3r/GUI/MainFrame.cpp:1027
+#: src/slic3r/GUI/MainFrame.cpp:1108
#, possible-c-format
msgid "%d presets successfully imported."
msgstr ""
-#: src/slic3r/GUI/Mouse3DController.cpp:274
+#: src/slic3r/GUI/Mouse3DController.cpp:258
msgid "3Dconnexion settings"
msgstr ""
-#: src/slic3r/GUI/Mouse3DController.cpp:289
+#: src/slic3r/GUI/Mouse3DController.cpp:273
msgid "Device:"
msgstr ""
-#: src/slic3r/GUI/Mouse3DController.cpp:296
+#: src/slic3r/GUI/Mouse3DController.cpp:280
msgid "Speed:"
msgstr ""
-#: src/slic3r/GUI/Mouse3DController.cpp:300
-#: src/slic3r/GUI/Mouse3DController.cpp:317
+#: src/slic3r/GUI/Mouse3DController.cpp:284
+#: src/slic3r/GUI/Mouse3DController.cpp:307
msgid "Translation"
msgstr ""
-#: src/slic3r/GUI/Mouse3DController.cpp:308
-#: src/slic3r/GUI/Mouse3DController.cpp:317
+#: src/slic3r/GUI/Mouse3DController.cpp:296
+#: src/slic3r/GUI/Mouse3DController.cpp:307
msgid "Zoom"
msgstr ""
-#: src/slic3r/GUI/Mouse3DController.cpp:313
+#: src/slic3r/GUI/Mouse3DController.cpp:303
msgid "Deadzone:"
msgstr ""
@@ -3923,8 +3968,8 @@ msgstr ""
msgid "Instance %d"
msgstr ""
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:67 src/slic3r/GUI/Tab.cpp:3512
-#: src/slic3r/GUI/Tab.cpp:3600
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:67 src/slic3r/GUI/Tab.cpp:3575
+#: src/slic3r/GUI/Tab.cpp:3657
msgid "Layers"
msgstr ""
@@ -3932,12 +3977,12 @@ msgstr ""
msgid "Range"
msgstr ""
-#: src/slic3r/GUI/OptionsGroup.cpp:258
+#: src/slic3r/GUI/OptionsGroup.cpp:274
msgctxt "Layers"
msgid "Top"
msgstr ""
-#: src/slic3r/GUI/OptionsGroup.cpp:258
+#: src/slic3r/GUI/OptionsGroup.cpp:274
msgctxt "Layers"
msgid "Bottom"
msgstr ""
@@ -3962,7 +4007,7 @@ msgstr ""
msgid "Sliced Info"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:235 src/slic3r/GUI/Plater.cpp:1229
+#: src/slic3r/GUI/Plater.cpp:235 src/slic3r/GUI/Plater.cpp:1234
msgid "Used Filament (m)"
msgstr ""
@@ -3982,8 +4027,8 @@ msgstr ""
msgid "Cost (money)"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1216
-#: src/slic3r/GUI/Plater.cpp:1258
+#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1221
+#: src/slic3r/GUI/Plater.cpp:1263
msgid "Estimated printing time"
msgstr ""
@@ -3991,575 +4036,576 @@ msgstr ""
msgid "Number of tool changes"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:343
+#: src/slic3r/GUI/Plater.cpp:348
msgid "Click to edit preset"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:498
+#: src/slic3r/GUI/Plater.cpp:503
msgid "Select what kind of support do you need"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:500 src/libslic3r/PrintConfig.cpp:1901
-#: src/libslic3r/PrintConfig.cpp:2674
+#: src/slic3r/GUI/Plater.cpp:505 src/libslic3r/PrintConfig.cpp:1908
+#: src/libslic3r/PrintConfig.cpp:2691
msgid "Support on build plate only"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:501 src/slic3r/GUI/Plater.cpp:624
+#: src/slic3r/GUI/Plater.cpp:506 src/slic3r/GUI/Plater.cpp:629
msgid "For support enforcers only"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:502
+#: src/slic3r/GUI/Plater.cpp:507
msgid "Everywhere"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:534 src/slic3r/GUI/Tab.cpp:1117
+#: src/slic3r/GUI/Plater.cpp:539 src/slic3r/GUI/Tab.cpp:1178
msgid "Brim"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:536
+#: src/slic3r/GUI/Plater.cpp:541
msgid ""
"This flag enables the brim that will be printed around each object on the "
"first layer."
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:544
+#: src/slic3r/GUI/Plater.cpp:549
msgid "Purging volumes"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:638
+#: src/slic3r/GUI/Plater.cpp:643
msgid "Select what kind of pad do you need"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:640
+#: src/slic3r/GUI/Plater.cpp:645
msgid "Below object"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:641
+#: src/slic3r/GUI/Plater.cpp:646
msgid "Around object"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:815
+#: src/slic3r/GUI/Plater.cpp:820
msgid "Print settings"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:816 src/slic3r/GUI/Tab.cpp:1425
-#: src/slic3r/GUI/Tab.cpp:1426
+#: src/slic3r/GUI/Plater.cpp:821 src/slic3r/GUI/Tab.cpp:1481
+#: src/slic3r/GUI/Tab.cpp:1482
msgid "Filament"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:817
+#: src/slic3r/GUI/Plater.cpp:822
msgid "SLA print settings"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:818 src/slic3r/GUI/Preset.cpp:1524
+#: src/slic3r/GUI/Plater.cpp:823 src/slic3r/GUI/Preset.cpp:1565
msgid "SLA material"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:819
+#: src/slic3r/GUI/Plater.cpp:824
msgid "Printer"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:878 src/slic3r/GUI/Plater.cpp:5522
+#: src/slic3r/GUI/Plater.cpp:883 src/slic3r/GUI/Plater.cpp:5563
msgid "Send to printer"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:879
+#: src/slic3r/GUI/Plater.cpp:884
msgid "Remove device"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:880
-msgid "Export to SD card / Flash drive"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:892 src/slic3r/GUI/Plater.cpp:3121
-#: src/slic3r/GUI/Plater.cpp:5110
+#: src/slic3r/GUI/Plater.cpp:897 src/slic3r/GUI/Plater.cpp:3188
+#: src/slic3r/GUI/Plater.cpp:5168
msgid "Slice now"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1042
+#: src/slic3r/GUI/Plater.cpp:1047
msgid "Hold Shift to Slice & Export G-code"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1152
-#, possible-c-format
-msgid "%d (%d shells)"
-msgstr ""
-
#: src/slic3r/GUI/Plater.cpp:1157
#, possible-c-format
+msgid "%d (%d shells)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1162
+#, possible-c-format
msgid "Auto-repaired (%d errors)"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1160
+#: src/slic3r/GUI/Plater.cpp:1165
#, possible-c-format
msgid ""
"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
"facets reversed, %d backwards edges"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1170
+#: src/slic3r/GUI/Plater.cpp:1175
msgid "Yes"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1191
+#: src/slic3r/GUI/Plater.cpp:1196
msgid "Used Material (ml)"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1194
+#: src/slic3r/GUI/Plater.cpp:1199
msgid "object(s)"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1194
+#: src/slic3r/GUI/Plater.cpp:1199
msgid "supports and pad"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1231 src/slic3r/GUI/Plater.cpp:1245
+#: src/slic3r/GUI/Plater.cpp:1236 src/slic3r/GUI/Plater.cpp:1250
msgid "objects"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1231 src/slic3r/GUI/Plater.cpp:1245
+#: src/slic3r/GUI/Plater.cpp:1236 src/slic3r/GUI/Plater.cpp:1250
msgid "wipe tower"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1243 src/libslic3r/PrintConfig.cpp:760
-#: src/libslic3r/PrintConfig.cpp:2510 src/libslic3r/PrintConfig.cpp:2511
+#: src/slic3r/GUI/Plater.cpp:1248 src/libslic3r/PrintConfig.cpp:760
+#: src/libslic3r/PrintConfig.cpp:2517 src/libslic3r/PrintConfig.cpp:2518
msgid "Cost"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1260 src/libslic3r/PrintConfig.cpp:582
+#: src/slic3r/GUI/Plater.cpp:1265 src/libslic3r/PrintConfig.cpp:582
msgid "Color"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1261
+#: src/slic3r/GUI/Plater.cpp:1266
msgid "Pause"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1286
+#: src/slic3r/GUI/Plater.cpp:1291
msgid "normal mode"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1291
+#: src/slic3r/GUI/Plater.cpp:1296
msgid "stealth mode"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1395
+#: src/slic3r/GUI/Plater.cpp:1400
msgid "Load File"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:1399
+#: src/slic3r/GUI/Plater.cpp:1404
msgid "Load Files"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:2151
-msgid "New Project"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2273
-msgid "Loading"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2283
-#, possible-c-format
-msgid "Processing input file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2311
-msgid "You cannot load SLA project with a multi-part object on the bed"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2312 src/slic3r/GUI/Tab.cpp:2959
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2357
-msgid ""
-"This file contains several objects positioned at multiple heights.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"this file as a single object having multiple parts?"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2360 src/slic3r/GUI/Plater.cpp:2413
-msgid "Multi-part object detected"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2367
-msgid ""
-"This file cannot be loaded in a simple mode. Do you want to switch to an "
-"advanced mode?"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2368
-msgid "Detected advanced data"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2390
-#, possible-c-format
-msgid ""
-"You can't to add the object(s) from %s because of one or some of them "
-"is(are) multi-part"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2410
-msgid ""
-"Multiple objects were loaded for a multi-material printer.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"these files to represent a single object having multiple parts?"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2426
-msgid "Loaded"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2528
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2529
-msgid "Object too large?"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2591
-msgid "Export STL file:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2598
-msgid "Export AMF file:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2604
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2610
-msgid "Export OBJ file:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2712
-msgid "Delete Object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2723
-msgid "Reset Project"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2760
-msgid "Hollow"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2767
-msgid "Optimize Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2813
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2835
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2841
-msgid "Arranging canceled."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2842
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2858
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2891
-msgid "Orientation search canceled."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2892
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2922
-msgid "Indexing hollowed object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2926
-msgid "Hollowing cancelled."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2927
-msgid "Hollowing done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2929
-msgid "Hollowing failed."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2970
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2981
-msgid "Split to Objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3106
-msgid "Invalid data"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3115
-msgid "Ready to slice"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3153 src/slic3r/GUI/PrintHostDialogs.cpp:232
-msgid "Cancelling"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3170
-msgid "Another export job is currently running."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3286
-msgid "Please select the file to reload"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3321
-msgid "It is not allowed to change the file to reload"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3321
-msgid "Do you want to retry"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3339
-msgid "Reload from:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3428
-msgid "Unable to reload:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3433
-msgid "Error during reload"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3452
-msgid "Reload all from disk"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3473
-msgid "Fix Throught NetFabb"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3664
-msgid "Export failed"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3669 src/slic3r/GUI/PrintHostDialogs.cpp:233
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3931 src/slic3r/GUI/Plater.cpp:3953
-msgid "Remove the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3940
-msgid "Add one more instance of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3942
-msgid "Remove one instance of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3944
-msgid "Set number of instances"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3944
-msgid "Change the number of instances of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3963
-msgid "Reload the selected object from disk"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3966
-msgid "Export the selected object as STL file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3995
-msgid "Along X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3995
-msgid "Mirror the selected object along the X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3997
-msgid "Along Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3997
-msgid "Mirror the selected object along the Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3999
-msgid "Along Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3999
-msgid "Mirror the selected object along the Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4002
-msgid "Mirror"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4002
-msgid "Mirror the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4014
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4014 src/slic3r/GUI/Plater.cpp:4034
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4016
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4016 src/slic3r/GUI/Plater.cpp:4048
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4019 src/slic3r/GUI/Plater.cpp:4034
-#: src/slic3r/GUI/Plater.cpp:4048 src/libslic3r/PrintConfig.cpp:3471
-msgid "Split"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4019
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4040
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4040
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4097
-msgid "3D editor view"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4400
-msgid ""
-"%1% printer was active at the time the target Undo / Redo snapshot was "
-"taken. Switching to %1% printer requires reloading of %1% presets."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4575
-msgid "Load Project"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4603
-msgid "Import Object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4607
-msgid "Import Objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4669
-msgid "All objects will be removed, continue?"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4677
-msgid "Delete Selected Objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4685
-msgid "Increase Instances"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4720
-msgid "Decrease Instances"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4751
-msgid "Enter the number of copies:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4752
-msgid "Copies of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4756
-#, possible-c-format
-msgid "Set numbers of copies to %d"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4786
-msgid "Cut by Plane"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4839
-msgid "Save G-code file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4839
-msgid "Save SL1 file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4985
-#, possible-c-format
-msgid "STL file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5002
-#, possible-c-format
-msgid "AMF file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5005
-#, possible-c-format
-msgid "Error exporting AMF file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5038
-#, possible-c-format
-msgid "3MF file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5043
-#, possible-c-format
-msgid "Error exporting 3MF file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5203
+#: src/slic3r/GUI/Plater.cpp:2205
#, possible-c-format
msgid ""
"Unmounting successful. The device %s(%s) can now be safely removed from the "
"computer."
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:5521
+#: src/slic3r/GUI/Plater.cpp:2208
+#, possible-c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2221
+msgid "New Project"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2335
+msgid "Loading"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2345
+#, possible-c-format
+msgid "Processing input file %s"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2373
+msgid "You cannot load SLA project with a multi-part object on the bed"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2374 src/slic3r/GUI/Tab.cpp:2948
+msgid "Please check your object list before preset changing."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2419
+msgid ""
+"This file contains several objects positioned at multiple heights.\n"
+"Instead of considering them as multiple objects, should I consider\n"
+"this file as a single object having multiple parts?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2422 src/slic3r/GUI/Plater.cpp:2475
+msgid "Multi-part object detected"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2429
+msgid ""
+"This file cannot be loaded in a simple mode. Do you want to switch to an "
+"advanced mode?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2430
+msgid "Detected advanced data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2452
+#, possible-c-format
+msgid ""
+"You can't to add the object(s) from %s because of one or some of them "
+"is(are) multi-part"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2472
+msgid ""
+"Multiple objects were loaded for a multi-material printer.\n"
+"Instead of considering them as multiple objects, should I consider\n"
+"these files to represent a single object having multiple parts?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2488
+msgid "Loaded"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2590
+msgid ""
+"Your object appears to be too large, so it was automatically scaled down to "
+"fit your print bed."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2591
+msgid "Object too large?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2653
+msgid "Export STL file:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2660
+msgid "Export AMF file:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2666
+msgid "Save file as:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2672
+msgid "Export OBJ file:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2774
+msgid "Delete Object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2785
+msgid "Reset Project"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2822
+msgid "Hollow"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2829
+msgid "Optimize Rotation"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2875
+msgid "Arranging"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2902
+msgid "Could not arrange model objects! Some geometries may be invalid."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2908
+msgid "Arranging canceled."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2909
+msgid "Arranging done."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2925
+msgid "Searching for optimal orientation"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2958
+msgid "Orientation search canceled."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2959
+msgid "Orientation found."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2989
+msgid "Indexing hollowed object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2993
+msgid "Hollowing cancelled."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2994
+msgid "Hollowing done."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2996
+msgid "Hollowing failed."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3037
+msgid ""
+"The selected object can't be split because it contains more than one volume/"
+"material."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3048
+msgid "Split to Objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3173
+msgid "Invalid data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3182
+msgid "Ready to slice"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3220 src/slic3r/GUI/PrintHostDialogs.cpp:232
+msgid "Cancelling"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3237
+msgid "Another export job is currently running."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3353
+msgid "Please select the file to reload"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3388
+msgid "It is not allowed to change the file to reload"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3388
+msgid "Do you want to retry"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3406
+msgid "Reload from:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3495
+msgid "Unable to reload:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3500
+msgid "Error during reload"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3519
+msgid "Reload all from disk"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3540
+msgid "Fix Throught NetFabb"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3731
+msgid "Export failed"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3741 src/slic3r/GUI/PrintHostDialogs.cpp:233
+msgid "Cancelled"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3998 src/slic3r/GUI/Plater.cpp:4020
+msgid "Remove the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4007
+msgid "Add one more instance of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4009
+msgid "Remove one instance of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4011
+msgid "Set number of instances"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4011
+msgid "Change the number of instances of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4030
+msgid "Reload the selected object from disk"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4033
+msgid "Export the selected object as STL file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4062
+msgid "Along X axis"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4062
+msgid "Mirror the selected object along the X axis"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4064
+msgid "Along Y axis"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4064
+msgid "Mirror the selected object along the Y axis"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4066
+msgid "Along Z axis"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4066
+msgid "Mirror the selected object along the Z axis"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4069
+msgid "Mirror"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4069
+msgid "Mirror the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4081
+msgid "To objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4081 src/slic3r/GUI/Plater.cpp:4101
+msgid "Split the selected object into individual objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4083
+msgid "To parts"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4083 src/slic3r/GUI/Plater.cpp:4115
+msgid "Split the selected object into individual sub-parts"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4086 src/slic3r/GUI/Plater.cpp:4101
+#: src/slic3r/GUI/Plater.cpp:4115 src/libslic3r/PrintConfig.cpp:3493
+msgid "Split"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4086
+msgid "Split the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4107
+msgid "Optimize orientation"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4107
+msgid "Optimize the rotation of the object for better print results."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4164
+msgid "3D editor view"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4471
+msgid ""
+"%1% printer was active at the time the target Undo / Redo snapshot was "
+"taken. Switching to %1% printer requires reloading of %1% presets."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4646
+msgid "Load Project"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4674
+msgid "Import Object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4678
+msgid "Import Objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4740
+msgid "All objects will be removed, continue?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4748
+msgid "Delete Selected Objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4756
+msgid "Increase Instances"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4791
+msgid "Decrease Instances"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4822
+msgid "Enter the number of copies:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4823
+msgid "Copies of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4827
+#, possible-c-format
+msgid "Set numbers of copies to %d"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4857
+msgid "Cut by Plane"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4908
+msgid "Save G-code file as:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4908
+msgid "Save SL1 file as:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5043
+#, possible-c-format
+msgid "STL file exported to %s"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5060
+#, possible-c-format
+msgid "AMF file exported to %s"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5063
+#, possible-c-format
+msgid "Error exporting AMF file %s"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5096
+#, possible-c-format
+msgid "3MF file exported to %s"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5101
+#, possible-c-format
+msgid "Error exporting 3MF file %s"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5562
msgid "Export"
msgstr ""
-#: src/slic3r/GUI/Plater.cpp:5606
+#: src/slic3r/GUI/Plater.cpp:5648
msgid "Paste From Clipboard"
msgstr ""
-#: src/slic3r/GUI/Preferences.cpp:22 src/slic3r/GUI/Tab.cpp:1796
-#: src/slic3r/GUI/Tab.cpp:2040
+#: src/slic3r/GUI/Preferences.cpp:22 src/slic3r/GUI/Tab.cpp:1847
+#: src/slic3r/GUI/Tab.cpp:2059
msgid "General"
msgstr ""
@@ -4695,38 +4741,38 @@ msgstr ""
msgid "Select toolbar icon size in respect to the default one."
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:247
+#: src/slic3r/GUI/Preset.cpp:250
msgid "modified"
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:1109 src/slic3r/GUI/Preset.cpp:1164
-#: src/slic3r/GUI/Preset.cpp:1242 src/slic3r/GUI/Preset.cpp:1284
-#: src/slic3r/GUI/PresetBundle.cpp:1583 src/slic3r/GUI/PresetBundle.cpp:1672
+#: src/slic3r/GUI/Preset.cpp:1150 src/slic3r/GUI/Preset.cpp:1205
+#: src/slic3r/GUI/Preset.cpp:1283 src/slic3r/GUI/Preset.cpp:1325
+#: src/slic3r/GUI/PresetBundle.cpp:1599 src/slic3r/GUI/PresetBundle.cpp:1697
msgid "System presets"
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:1168 src/slic3r/GUI/Preset.cpp:1288
-#: src/slic3r/GUI/PresetBundle.cpp:1677
+#: src/slic3r/GUI/Preset.cpp:1209 src/slic3r/GUI/Preset.cpp:1329
+#: src/slic3r/GUI/PresetBundle.cpp:1702
msgid "User presets"
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:1201
+#: src/slic3r/GUI/Preset.cpp:1242
msgid "Add/Remove materials"
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:1203
+#: src/slic3r/GUI/Preset.cpp:1244
msgid "Add/Remove printers"
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:1522
+#: src/slic3r/GUI/Preset.cpp:1563
msgid "filament"
msgstr ""
-#: src/slic3r/GUI/Preset.cpp:1523
+#: src/slic3r/GUI/Preset.cpp:1564
msgid "SLA print"
msgstr ""
-#: src/slic3r/GUI/PresetBundle.cpp:1704
+#: src/slic3r/GUI/PresetBundle.cpp:1729
msgid "Add/Remove filaments"
msgstr ""
@@ -4954,11 +5000,11 @@ msgstr ""
#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:83
#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:688
-#: src/libslic3r/PrintConfig.cpp:703 src/libslic3r/PrintConfig.cpp:2408
-#: src/libslic3r/PrintConfig.cpp:2417 src/libslic3r/PrintConfig.cpp:2527
-#: src/libslic3r/PrintConfig.cpp:2535 src/libslic3r/PrintConfig.cpp:2543
-#: src/libslic3r/PrintConfig.cpp:2550 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2566
+#: src/libslic3r/PrintConfig.cpp:703 src/libslic3r/PrintConfig.cpp:2415
+#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2534
+#: src/libslic3r/PrintConfig.cpp:2542 src/libslic3r/PrintConfig.cpp:2550
+#: src/libslic3r/PrintConfig.cpp:2557 src/libslic3r/PrintConfig.cpp:2565
+#: src/libslic3r/PrintConfig.cpp:2573
msgid "s"
msgstr ""
@@ -4971,47 +5017,47 @@ msgstr ""
msgid "mm³/s"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:146
+#: src/slic3r/GUI/Selection.cpp:147
msgid "Selection-Add"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:187
+#: src/slic3r/GUI/Selection.cpp:188
msgid "Selection-Remove"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:219
+#: src/slic3r/GUI/Selection.cpp:220
msgid "Selection-Add Object"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:238
+#: src/slic3r/GUI/Selection.cpp:239
msgid "Selection-Remove Object"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:256
+#: src/slic3r/GUI/Selection.cpp:257
msgid "Selection-Add Instance"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:275
+#: src/slic3r/GUI/Selection.cpp:276
msgid "Selection-Remove Instance"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:376
+#: src/slic3r/GUI/Selection.cpp:377
msgid "Selection-Add All"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:402
+#: src/slic3r/GUI/Selection.cpp:403
msgid "Selection-Remove All"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:939
+#: src/slic3r/GUI/Selection.cpp:940
msgid "Scale To Fit"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:1475
+#: src/slic3r/GUI/Selection.cpp:1477
msgid "Set Printable Instance"
msgstr ""
-#: src/slic3r/GUI/Selection.cpp:1475
+#: src/slic3r/GUI/Selection.cpp:1477
msgid "Set Unprintable Instance"
msgstr ""
@@ -5059,320 +5105,348 @@ msgstr ""
msgid "Add a new printer"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:953
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:975
+msgid ""
+"A copy of the current system preset will be created, which will be detached "
+"from the system preset."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:976
+msgid ""
+"The current custom preset will be detached from the parent system preset."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:1010
msgid "This is a default preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:955
+#: src/slic3r/GUI/Tab.cpp:1012
msgid "This is a system preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:957
+#: src/slic3r/GUI/Tab.cpp:1014
msgid "Current preset is inherited from the default preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:960
-#, possible-c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
+#: src/slic3r/GUI/Tab.cpp:1016
+msgid "Current preset is inherited from"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:964
+#: src/slic3r/GUI/Tab.cpp:1020
msgid "It can't be deleted or modified."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:965
+#: src/slic3r/GUI/Tab.cpp:1021
msgid ""
"Any modifications should be saved as a new preset inherited from this one."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:966
+#: src/slic3r/GUI/Tab.cpp:1022
msgid "To do that please specify a new name for the preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:970
+#: src/slic3r/GUI/Tab.cpp:1026
msgid "Additional information:"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:976
+#: src/slic3r/GUI/Tab.cpp:1032
msgid "printer model"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:984
+#: src/slic3r/GUI/Tab.cpp:1040
msgid "default print profile"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:987
+#: src/slic3r/GUI/Tab.cpp:1043
msgid "default filament profile"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1001
+#: src/slic3r/GUI/Tab.cpp:1057
msgid "default SLA material profile"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1005
+#: src/slic3r/GUI/Tab.cpp:1061
msgid "default SLA print profile"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1013
+#: src/slic3r/GUI/Tab.cpp:1069
msgid "full profile name"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1014
+#: src/slic3r/GUI/Tab.cpp:1070
msgid "symbolic profile name"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1048 src/slic3r/GUI/Tab.cpp:3598
+#: src/slic3r/GUI/Tab.cpp:1108 src/slic3r/GUI/Tab.cpp:3655
msgid "Layers and perimeters"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1053
+#: src/slic3r/GUI/Tab.cpp:1113
msgid "Vertical shells"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1064
+#: src/slic3r/GUI/Tab.cpp:1124
msgid "Horizontal shells"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1065 src/libslic3r/PrintConfig.cpp:1780
+#: src/slic3r/GUI/Tab.cpp:1125 src/libslic3r/PrintConfig.cpp:1787
msgid "Solid layers"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1069
+#: src/slic3r/GUI/Tab.cpp:1129
msgid "Minimum shell thickness"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1080
+#: src/slic3r/GUI/Tab.cpp:1140
msgid "Quality (slower slicing)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1098
+#: src/slic3r/GUI/Tab.cpp:1158
msgid "Reducing printing time"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1110
+#: src/slic3r/GUI/Tab.cpp:1170
msgid "Skirt and brim"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1127
+#: src/slic3r/GUI/Tab.cpp:1188
msgid "Raft"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1131
+#: src/slic3r/GUI/Tab.cpp:1192
msgid "Options for support material and raft"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1146
+#: src/slic3r/GUI/Tab.cpp:1207
msgid "Speed for print moves"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1158
+#: src/slic3r/GUI/Tab.cpp:1219
msgid "Speed for non-print moves"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1161
+#: src/slic3r/GUI/Tab.cpp:1222
msgid "Modifiers"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1164
+#: src/slic3r/GUI/Tab.cpp:1225
msgid "Acceleration control (advanced)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1171
+#: src/slic3r/GUI/Tab.cpp:1232
msgid "Autospeed (advanced)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1179
+#: src/slic3r/GUI/Tab.cpp:1240
msgid "Multiple Extruders"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1187
+#: src/slic3r/GUI/Tab.cpp:1248
msgid "Ooze prevention"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1205
+#: src/slic3r/GUI/Tab.cpp:1266
msgid "Extrusion width"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1215
+#: src/slic3r/GUI/Tab.cpp:1276
msgid "Overlap"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1218
+#: src/slic3r/GUI/Tab.cpp:1279
msgid "Flow"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1227
+#: src/slic3r/GUI/Tab.cpp:1288
msgid "Other"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1230 src/slic3r/GUI/Tab.cpp:3665
+#: src/slic3r/GUI/Tab.cpp:1291 src/slic3r/GUI/Tab.cpp:3724
msgid "Output options"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1231
+#: src/slic3r/GUI/Tab.cpp:1292
msgid "Sequential printing"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1233
+#: src/slic3r/GUI/Tab.cpp:1294
msgid "Extruder clearance (mm)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1238 src/slic3r/GUI/Tab.cpp:3666
+#: src/slic3r/GUI/Tab.cpp:1299 src/slic3r/GUI/Tab.cpp:3725
msgid "Output file"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1245 src/libslic3r/PrintConfig.cpp:1453
+#: src/slic3r/GUI/Tab.cpp:1306 src/libslic3r/PrintConfig.cpp:1453
msgid "Post-processing scripts"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1251 src/slic3r/GUI/Tab.cpp:1252
-#: src/slic3r/GUI/Tab.cpp:1540 src/slic3r/GUI/Tab.cpp:1541
-#: src/slic3r/GUI/Tab.cpp:2012 src/slic3r/GUI/Tab.cpp:2013
-#: src/slic3r/GUI/Tab.cpp:2128 src/slic3r/GUI/Tab.cpp:2129
-#: src/slic3r/GUI/Tab.cpp:3535 src/slic3r/GUI/Tab.cpp:3536
+#: src/slic3r/GUI/Tab.cpp:1312 src/slic3r/GUI/Tab.cpp:1313
+#: src/slic3r/GUI/Tab.cpp:1596 src/slic3r/GUI/Tab.cpp:1597
+#: src/slic3r/GUI/Tab.cpp:2035 src/slic3r/GUI/Tab.cpp:2036
+#: src/slic3r/GUI/Tab.cpp:2117 src/slic3r/GUI/Tab.cpp:2118
+#: src/slic3r/GUI/Tab.cpp:3598 src/slic3r/GUI/Tab.cpp:3599
msgid "Notes"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1258 src/slic3r/GUI/Tab.cpp:1548
-#: src/slic3r/GUI/Tab.cpp:2019 src/slic3r/GUI/Tab.cpp:2135
-#: src/slic3r/GUI/Tab.cpp:3543 src/slic3r/GUI/Tab.cpp:3671
+#: src/slic3r/GUI/Tab.cpp:1319 src/slic3r/GUI/Tab.cpp:1604
+#: src/slic3r/GUI/Tab.cpp:2042 src/slic3r/GUI/Tab.cpp:2124
+#: src/slic3r/GUI/Tab.cpp:3606 src/slic3r/GUI/Tab.cpp:3730
msgid "Dependencies"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1259 src/slic3r/GUI/Tab.cpp:1549
-#: src/slic3r/GUI/Tab.cpp:2020 src/slic3r/GUI/Tab.cpp:2136
-#: src/slic3r/GUI/Tab.cpp:3544 src/slic3r/GUI/Tab.cpp:3672
+#: src/slic3r/GUI/Tab.cpp:1320 src/slic3r/GUI/Tab.cpp:1605
+#: src/slic3r/GUI/Tab.cpp:2043 src/slic3r/GUI/Tab.cpp:2125
+#: src/slic3r/GUI/Tab.cpp:3607 src/slic3r/GUI/Tab.cpp:3731
msgid "Profile dependencies"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1323 src/slic3r/GUI/Tab.cpp:1378
+#: src/slic3r/GUI/Tab.cpp:1379 src/slic3r/GUI/Tab.cpp:1434
msgid "Filament Overrides"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1324 src/slic3r/GUI/Tab.cpp:1383
-#: src/slic3r/GUI/Tab.cpp:2370
+#: src/slic3r/GUI/Tab.cpp:1380 src/slic3r/GUI/Tab.cpp:1439
+#: src/slic3r/GUI/Tab.cpp:2355
msgid "Retraction"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1433 src/libslic3r/PrintConfig.cpp:2067
+#: src/slic3r/GUI/Tab.cpp:1489 src/libslic3r/PrintConfig.cpp:2074
msgid "Temperature"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1439
+#: src/slic3r/GUI/Tab.cpp:1495
msgid "Bed"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1444
+#: src/slic3r/GUI/Tab.cpp:1500
msgid "Cooling"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1445 src/libslic3r/PrintConfig.cpp:1355
-#: src/libslic3r/PrintConfig.cpp:2200
+#: src/slic3r/GUI/Tab.cpp:1501 src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:2207
msgid "Enable"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1456
+#: src/slic3r/GUI/Tab.cpp:1512
msgid "Fan settings"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1465
+#: src/slic3r/GUI/Tab.cpp:1521
msgid "Cooling thresholds"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1471
+#: src/slic3r/GUI/Tab.cpp:1527
msgid "Filament properties"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1478
+#: src/slic3r/GUI/Tab.cpp:1534
msgid "Print speed override"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1488
+#: src/slic3r/GUI/Tab.cpp:1544
msgid "Wipe tower parameters"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1491
+#: src/slic3r/GUI/Tab.cpp:1547
msgid "Toolchange parameters with single extruder MM printers"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1505
+#: src/slic3r/GUI/Tab.cpp:1561
msgid "Ramming settings"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1527 src/slic3r/GUI/Tab.cpp:1975
+#: src/slic3r/GUI/Tab.cpp:1583 src/slic3r/GUI/Tab.cpp:1998
msgid "Custom G-code"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1528 src/slic3r/GUI/Tab.cpp:1976
-#: src/libslic3r/PrintConfig.cpp:1813 src/libslic3r/PrintConfig.cpp:1828
+#: src/slic3r/GUI/Tab.cpp:1584 src/slic3r/GUI/Tab.cpp:1999
+#: src/libslic3r/PrintConfig.cpp:1820 src/libslic3r/PrintConfig.cpp:1835
msgid "Start G-code"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1534 src/slic3r/GUI/Tab.cpp:1982
+#: src/slic3r/GUI/Tab.cpp:1590 src/slic3r/GUI/Tab.cpp:2005
#: src/libslic3r/PrintConfig.cpp:385 src/libslic3r/PrintConfig.cpp:395
msgid "End G-code"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1591
+#: src/slic3r/GUI/Tab.cpp:1639
msgid "Volumetric flow hints not available"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1677 src/slic3r/GUI/Tab.cpp:1915
+#: src/slic3r/GUI/Tab.cpp:1725 src/slic3r/GUI/Tab.cpp:1938
msgid "Test"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1687
+#: src/slic3r/GUI/Tab.cpp:1734
msgid "Could not get a valid Printer Host reference"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1693 src/slic3r/GUI/Tab.cpp:1928
+#: src/slic3r/GUI/Tab.cpp:1740 src/slic3r/GUI/Tab.cpp:1951
msgid "Success!"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1713
+#: src/slic3r/GUI/Tab.cpp:1760
msgid ""
"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
"signed certificate."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1728
+#: src/slic3r/GUI/Tab.cpp:1775
msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1729
+#: src/slic3r/GUI/Tab.cpp:1776
msgid "Open CA certificate file"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1757
-#, possible-c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
+#: src/slic3r/GUI/Tab.cpp:1803 src/libslic3r/PrintConfig.cpp:111
+msgid "HTTPS CA File"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1797 src/slic3r/GUI/Tab.cpp:2041
+#: src/slic3r/GUI/Tab.cpp:1804
+#, possible-c-format
+msgid ""
+"On this system, %s uses HTTPS certificates from the system Certificate Store "
+"or Keychain."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:1805
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate Store / "
+"Keychain."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:1848 src/slic3r/GUI/Tab.cpp:2060
msgid "Size and coordinates"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1802 src/slic3r/GUI/Tab.cpp:2046
-#: src/slic3r/GUI/Tab.cpp:3176
-msgid "Set"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1834
+#: src/slic3r/GUI/Tab.cpp:1857
msgid "Capabilities"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1839
+#: src/slic3r/GUI/Tab.cpp:1862
msgid "Number of extruders of the printer."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1867
+#: src/slic3r/GUI/Tab.cpp:1890
msgid ""
"Single Extruder Multi Material is selected, \n"
"and all extruders must have the same diameter.\n"
@@ -5380,72 +5454,72 @@ msgid ""
"nozzle diameter value?"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1870 src/slic3r/GUI/Tab.cpp:2340
+#: src/slic3r/GUI/Tab.cpp:1893 src/slic3r/GUI/Tab.cpp:2325
#: src/libslic3r/PrintConfig.cpp:1326
msgid "Nozzle diameter"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1900
+#: src/slic3r/GUI/Tab.cpp:1923
msgid "USB/Serial connection"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1901 src/libslic3r/PrintConfig.cpp:1661
+#: src/slic3r/GUI/Tab.cpp:1924 src/libslic3r/PrintConfig.cpp:1661
msgid "Serial port"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1906
+#: src/slic3r/GUI/Tab.cpp:1929
msgid "Rescan serial ports"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1928
+#: src/slic3r/GUI/Tab.cpp:1951
msgid "Connection to printer works correctly."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1931
+#: src/slic3r/GUI/Tab.cpp:1954
msgid "Connection failed."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1944 src/slic3r/GUI/Tab.cpp:2123
+#: src/slic3r/GUI/Tab.cpp:1967 src/slic3r/GUI/Tab.cpp:2112
msgid "Print Host upload"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1988 src/libslic3r/PrintConfig.cpp:153
+#: src/slic3r/GUI/Tab.cpp:2011 src/libslic3r/PrintConfig.cpp:153
msgid "Before layer change G-code"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:1994 src/libslic3r/PrintConfig.cpp:1080
+#: src/slic3r/GUI/Tab.cpp:2017 src/libslic3r/PrintConfig.cpp:1080
msgid "After layer change G-code"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2000 src/libslic3r/PrintConfig.cpp:2093
+#: src/slic3r/GUI/Tab.cpp:2023 src/libslic3r/PrintConfig.cpp:2100
msgid "Tool change G-code"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2006
+#: src/slic3r/GUI/Tab.cpp:2029
msgid "Between objects G-code (for sequential printing)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2078
+#: src/slic3r/GUI/Tab.cpp:2067
msgid "Display"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2093
+#: src/slic3r/GUI/Tab.cpp:2082
msgid "Tilt"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2094
+#: src/slic3r/GUI/Tab.cpp:2083
msgid "Tilt time"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2100 src/slic3r/GUI/Tab.cpp:3519
+#: src/slic3r/GUI/Tab.cpp:2089 src/slic3r/GUI/Tab.cpp:3582
msgid "Corrections"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2117 src/slic3r/GUI/Tab.cpp:3515
+#: src/slic3r/GUI/Tab.cpp:2106 src/slic3r/GUI/Tab.cpp:3578
msgid "Exposure"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2188 src/slic3r/GUI/Tab.cpp:2273
+#: src/slic3r/GUI/Tab.cpp:2173 src/slic3r/GUI/Tab.cpp:2258
#: src/libslic3r/PrintConfig.cpp:1129 src/libslic3r/PrintConfig.cpp:1146
#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1179
#: src/libslic3r/PrintConfig.cpp:1189 src/libslic3r/PrintConfig.cpp:1199
@@ -5453,175 +5527,183 @@ msgstr ""
msgid "Machine limits"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2202
+#: src/slic3r/GUI/Tab.cpp:2187
msgid "Values in this column are for Normal mode"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2203
+#: src/slic3r/GUI/Tab.cpp:2188
msgid "Normal"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2208
+#: src/slic3r/GUI/Tab.cpp:2193
msgid "Values in this column are for Stealth mode"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2209
+#: src/slic3r/GUI/Tab.cpp:2194
msgid "Stealth"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2217
+#: src/slic3r/GUI/Tab.cpp:2202
msgid "Maximum feedrates"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2222
+#: src/slic3r/GUI/Tab.cpp:2207
msgid "Maximum accelerations"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2229
+#: src/slic3r/GUI/Tab.cpp:2214
msgid "Jerk limits"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2234
+#: src/slic3r/GUI/Tab.cpp:2219
msgid "Minimum feedrates"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2298 src/slic3r/GUI/Tab.cpp:2306
+#: src/slic3r/GUI/Tab.cpp:2283 src/slic3r/GUI/Tab.cpp:2291
msgid "Single extruder MM setup"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2307
+#: src/slic3r/GUI/Tab.cpp:2292
msgid "Single extruder multimaterial parameters"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2338
+#: src/slic3r/GUI/Tab.cpp:2323
msgid ""
"This is a single extruder multimaterial printer, diameters of all extruders "
"will be set to the new value. Do you want to proceed?"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2362
+#: src/slic3r/GUI/Tab.cpp:2347
msgid "Layer height limits"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2367
+#: src/slic3r/GUI/Tab.cpp:2352
msgid "Position (for multi-extruder printers)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2373
+#: src/slic3r/GUI/Tab.cpp:2358
msgid "Only lift Z"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2386
+#: src/slic3r/GUI/Tab.cpp:2371
msgid ""
"Retraction when tool is disabled (advanced settings for multi-extruder "
"setups)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2394
+#: src/slic3r/GUI/Tab.cpp:2379
msgid "Reset to Filament Color"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2575
+#: src/slic3r/GUI/Tab.cpp:2560
msgid ""
"The Wipe option is not available when using the Firmware Retraction mode.\n"
"\n"
"Shall I disable it in order to enable Firmware Retraction?"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2577
+#: src/slic3r/GUI/Tab.cpp:2562
msgid "Firmware Retraction"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2919
+#: src/slic3r/GUI/Tab.cpp:2908
#, possible-c-format
msgid "Default preset (%s)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2920
+#: src/slic3r/GUI/Tab.cpp:2909
#, possible-c-format
msgid "Preset (%s)"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2937
+#: src/slic3r/GUI/Tab.cpp:2926
msgid "has the following unsaved changes:"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2940
+#: src/slic3r/GUI/Tab.cpp:2929
msgid "is not compatible with printer"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2941
+#: src/slic3r/GUI/Tab.cpp:2930
msgid "is not compatible with print profile"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2943
+#: src/slic3r/GUI/Tab.cpp:2932
msgid "and it has the following unsaved changes:"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:2947
+#: src/slic3r/GUI/Tab.cpp:2936
msgid "Unsaved Changes"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3045
-msgctxt "PresetName"
-msgid "%1% - Copy"
+#: src/slic3r/GUI/Tab.cpp:3030
+msgid "Detached"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3068
+#: src/slic3r/GUI/Tab.cpp:3030
+msgctxt "PresetName"
+msgid "Copy"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3059
msgid "The supplied name is empty. It can't be saved."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3073
+#: src/slic3r/GUI/Tab.cpp:3064
msgid "Cannot overwrite a system profile."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3077
+#: src/slic3r/GUI/Tab.cpp:3068
msgid "Cannot overwrite an external profile."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3082
+#: src/slic3r/GUI/Tab.cpp:3073
msgid "Preset with name \"%1%\" already exists."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3083
+#: src/slic3r/GUI/Tab.cpp:3074
msgid "Replace?"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3121
+#: src/slic3r/GUI/Tab.cpp:3142
msgid "remove"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3121
+#: src/slic3r/GUI/Tab.cpp:3142
msgid "delete"
msgstr ""
#. TRN remove/delete
-#: src/slic3r/GUI/Tab.cpp:3123
+#: src/slic3r/GUI/Tab.cpp:3144
msgid "Are you sure you want to %1% the selected preset?"
msgstr ""
#. TRN Remove/Delete
-#: src/slic3r/GUI/Tab.cpp:3126
+#: src/slic3r/GUI/Tab.cpp:3147
msgid "%1% Preset"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3252
+#: src/slic3r/GUI/Tab.cpp:3206 src/slic3r/GUI/Tab.cpp:3276
+msgid "Set"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3315
msgid "LOCKED LOCK"
msgstr ""
#. TRN Description for "LOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3254
+#: src/slic3r/GUI/Tab.cpp:3317
msgid ""
"indicates that the settings are the same as the system (or default) values "
"for the current option group"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3256
+#: src/slic3r/GUI/Tab.cpp:3319
msgid "UNLOCKED LOCK"
msgstr ""
#. TRN Description for "UNLOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3258
+#: src/slic3r/GUI/Tab.cpp:3321
msgid ""
"indicates that some settings were changed and are not equal to the system "
"(or default) values for the current option group.\n"
@@ -5629,23 +5711,23 @@ msgid ""
"to the system (or default) values."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3263
+#: src/slic3r/GUI/Tab.cpp:3326
msgid "WHITE BULLET"
msgstr ""
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
+#: src/slic3r/GUI/Tab.cpp:3328
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3268
+#: src/slic3r/GUI/Tab.cpp:3331
msgid "BACK ARROW"
msgstr ""
#. TRN Description for "BACK ARROW"
-#: src/slic3r/GUI/Tab.cpp:3270
+#: src/slic3r/GUI/Tab.cpp:3333
msgid ""
"indicates that the settings were changed and are not equal to the last saved "
"preset for the current option group.\n"
@@ -5653,13 +5735,13 @@ msgid ""
"to the last saved preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3280
+#: src/slic3r/GUI/Tab.cpp:3343
msgid ""
"LOCKED LOCK icon indicates that the settings are the same as the system (or "
"default) values for the current option group"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3282
+#: src/slic3r/GUI/Tab.cpp:3345
msgid ""
"UNLOCKED LOCK icon indicates that some settings were changed and are not "
"equal to the system (or default) values for the current option group.\n"
@@ -5667,17 +5749,17 @@ msgid ""
"default) values."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3285
+#: src/slic3r/GUI/Tab.cpp:3348
msgid "WHITE BULLET icon indicates a non system (or non default) preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3288
+#: src/slic3r/GUI/Tab.cpp:3351
msgid ""
"WHITE BULLET icon indicates that the settings are the same as in the last "
"saved preset for the current option group."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3290
+#: src/slic3r/GUI/Tab.cpp:3353
msgid ""
"BACK ARROW icon indicates that the settings were changed and are not equal "
"to the last saved preset for the current option group.\n"
@@ -5685,26 +5767,26 @@ msgid ""
"preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3296
+#: src/slic3r/GUI/Tab.cpp:3359
msgid ""
"LOCKED LOCK icon indicates that the value is the same as the system (or "
"default) value."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3297
+#: src/slic3r/GUI/Tab.cpp:3360
msgid ""
"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
"the system (or default) value.\n"
"Click to reset current value to the system (or default) value."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3303
+#: src/slic3r/GUI/Tab.cpp:3366
msgid ""
"WHITE BULLET icon indicates that the value is the same as in the last saved "
"preset."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3304
+#: src/slic3r/GUI/Tab.cpp:3367
msgid ""
"BACK ARROW icon indicates that the value was changed and is not equal to the "
"last saved preset.\n"
@@ -5712,56 +5794,56 @@ msgid ""
msgstr ""
#. TRN Preset
-#: src/slic3r/GUI/Tab.cpp:3417
+#: src/slic3r/GUI/Tab.cpp:3480
#, possible-c-format
msgid "Save %s as:"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3461
+#: src/slic3r/GUI/Tab.cpp:3524
msgid "the following suffix is not allowed:"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3465
+#: src/slic3r/GUI/Tab.cpp:3528
msgid "The supplied name is not available."
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3478 src/slic3r/GUI/Tab.cpp:3480
+#: src/slic3r/GUI/Tab.cpp:3541 src/slic3r/GUI/Tab.cpp:3543
msgid "Material"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3608
+#: src/slic3r/GUI/Tab.cpp:3665
msgid "Support head"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3613
+#: src/slic3r/GUI/Tab.cpp:3670
msgid "Support pillar"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3627
+#: src/slic3r/GUI/Tab.cpp:3686
msgid "Connection of the support sticks and junctions"
msgstr ""
-#: src/slic3r/GUI/Tab.cpp:3632
+#: src/slic3r/GUI/Tab.cpp:3691
msgid "Automatic generation"
msgstr ""
-#: src/slic3r/GUI/Tab.hpp:328 src/slic3r/GUI/Tab.hpp:431
+#: src/slic3r/GUI/Tab.hpp:336 src/slic3r/GUI/Tab.hpp:441
msgid "Print Settings"
msgstr ""
-#: src/slic3r/GUI/Tab.hpp:355
+#: src/slic3r/GUI/Tab.hpp:363
msgid "Filament Settings"
msgstr ""
-#: src/slic3r/GUI/Tab.hpp:391
+#: src/slic3r/GUI/Tab.hpp:399
msgid "Printer Settings"
msgstr ""
-#: src/slic3r/GUI/Tab.hpp:416
+#: src/slic3r/GUI/Tab.hpp:426
msgid "Material Settings"
msgstr ""
-#: src/slic3r/GUI/Tab.hpp:443
+#: src/slic3r/GUI/Tab.hpp:453
msgid "Save preset"
msgstr ""
@@ -5893,19 +5975,19 @@ msgid ""
"choose whether to enable automatic preset updates."
msgstr ""
-#: src/slic3r/GUI/UpdateDialogs.cpp:286
+#: src/slic3r/GUI/UpdateDialogs.cpp:287
msgid "For more information please visit our wiki page:"
msgstr ""
-#: src/slic3r/GUI/UpdateDialogs.cpp:303
+#: src/slic3r/GUI/UpdateDialogs.cpp:304
msgid "Configuration updates"
msgstr ""
-#: src/slic3r/GUI/UpdateDialogs.cpp:303
+#: src/slic3r/GUI/UpdateDialogs.cpp:304
msgid "No updates available"
msgstr ""
-#: src/slic3r/GUI/UpdateDialogs.cpp:308
+#: src/slic3r/GUI/UpdateDialogs.cpp:309
#, possible-c-format
msgid "%s has no configuration updates available."
msgstr ""
@@ -5999,30 +6081,30 @@ msgstr ""
msgid "Show advanced settings"
msgstr ""
-#: src/slic3r/GUI/wxExtensions.cpp:703
+#: src/slic3r/GUI/wxExtensions.cpp:706
#, possible-c-format
msgid "Switch to the %s mode"
msgstr ""
-#: src/slic3r/GUI/wxExtensions.cpp:704
+#: src/slic3r/GUI/wxExtensions.cpp:707
#, possible-c-format
msgid "Current mode is %s"
msgstr ""
-#: src/slic3r/Utils/AstroBox.cpp:68 src/slic3r/Utils/OctoPrint.cpp:68
+#: src/slic3r/Utils/AstroBox.cpp:69 src/slic3r/Utils/OctoPrint.cpp:69
#, possible-c-format
msgid "Mismatched type of print host: %s"
msgstr ""
-#: src/slic3r/Utils/AstroBox.cpp:83
+#: src/slic3r/Utils/AstroBox.cpp:84
msgid "Connection to AstroBox works correctly."
msgstr ""
-#: src/slic3r/Utils/AstroBox.cpp:89
+#: src/slic3r/Utils/AstroBox.cpp:90
msgid "Could not connect to AstroBox"
msgstr ""
-#: src/slic3r/Utils/AstroBox.cpp:89
+#: src/slic3r/Utils/AstroBox.cpp:92
msgid "Note: AstroBox version at least 1.1.0 is required."
msgstr ""
@@ -6030,21 +6112,21 @@ msgstr ""
msgid "Connection to Duet works correctly."
msgstr ""
-#: src/slic3r/Utils/Duet.cpp:54
+#: src/slic3r/Utils/Duet.cpp:55
msgid "Could not connect to Duet"
msgstr ""
-#: src/slic3r/Utils/Duet.cpp:82 src/slic3r/Utils/Duet.cpp:137
-#: src/slic3r/Utils/FlashAir.cpp:119 src/slic3r/Utils/FlashAir.cpp:140
-#: src/slic3r/Utils/FlashAir.cpp:156
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:139
+#: src/slic3r/Utils/FlashAir.cpp:122 src/slic3r/Utils/FlashAir.cpp:143
+#: src/slic3r/Utils/FlashAir.cpp:159
msgid "Unknown error occured"
msgstr ""
-#: src/slic3r/Utils/Duet.cpp:131
+#: src/slic3r/Utils/Duet.cpp:133
msgid "Wrong password"
msgstr ""
-#: src/slic3r/Utils/Duet.cpp:134
+#: src/slic3r/Utils/Duet.cpp:136
msgid "Could not get resources to create a new connection"
msgstr ""
@@ -6137,33 +6219,33 @@ msgstr ""
msgid "Connection to FlashAir works correctly and upload is enabled."
msgstr ""
-#: src/slic3r/Utils/FlashAir.cpp:73
+#: src/slic3r/Utils/FlashAir.cpp:74
msgid "Could not connect to FlashAir"
msgstr ""
-#: src/slic3r/Utils/FlashAir.cpp:73
+#: src/slic3r/Utils/FlashAir.cpp:76
msgid ""
"Note: FlashAir with firmware 2.00.02 or newer and activated upload function "
"is required."
msgstr ""
-#: src/slic3r/Utils/OctoPrint.cpp:83
+#: src/slic3r/Utils/OctoPrint.cpp:84
msgid "Connection to OctoPrint works correctly."
msgstr ""
-#: src/slic3r/Utils/OctoPrint.cpp:89
+#: src/slic3r/Utils/OctoPrint.cpp:90
msgid "Could not connect to OctoPrint"
msgstr ""
-#: src/slic3r/Utils/OctoPrint.cpp:89
+#: src/slic3r/Utils/OctoPrint.cpp:92
msgid "Note: OctoPrint version at least 1.1.0 is required."
msgstr ""
-#: src/slic3r/Utils/OctoPrint.cpp:176
+#: src/slic3r/Utils/OctoPrint.cpp:179
msgid "Connection to Prusa SL1 works correctly."
msgstr ""
-#: src/slic3r/Utils/OctoPrint.cpp:181
+#: src/slic3r/Utils/OctoPrint.cpp:185
msgid "Could not connect to Prusa SLA"
msgstr ""
@@ -6314,18 +6396,18 @@ msgstr ""
msgid "Error with zip archive"
msgstr ""
-#: src/libslic3r/GCode.cpp:637
+#: src/libslic3r/GCode.cpp:640
msgid "Empty layers detected, the output would not be printable."
msgstr ""
-#: src/libslic3r/GCode.cpp:638
+#: src/libslic3r/GCode.cpp:641
msgid "Print z"
msgstr ""
-#: src/libslic3r/GCode.cpp:639
+#: src/libslic3r/GCode.cpp:642
msgid ""
"This is usually caused by negligibly small extrusions or by a faulty model. "
-"Try to repair the model or change its orientation on the bed."
+"Try to repair the model or change its orientation on the bed."
msgstr ""
#: src/libslic3r/ExtrusionEntity.cpp:323
@@ -6349,110 +6431,110 @@ msgid ""
"compatible."
msgstr ""
-#: src/libslic3r/Print.cpp:1219
+#: src/libslic3r/Print.cpp:1218
msgid "All objects are outside of the print volume."
msgstr ""
-#: src/libslic3r/Print.cpp:1222
+#: src/libslic3r/Print.cpp:1221
msgid "The supplied settings will cause an empty print."
msgstr ""
-#: src/libslic3r/Print.cpp:1226
+#: src/libslic3r/Print.cpp:1225
msgid "Some objects are too close; your extruder will collide with them."
msgstr ""
-#: src/libslic3r/Print.cpp:1228
+#: src/libslic3r/Print.cpp:1227
msgid ""
"Some objects are too tall and cannot be printed without extruder collisions."
msgstr ""
-#: src/libslic3r/Print.cpp:1237
+#: src/libslic3r/Print.cpp:1236
msgid "The Spiral Vase option can only be used when printing a single object."
msgstr ""
-#: src/libslic3r/Print.cpp:1244
+#: src/libslic3r/Print.cpp:1243
msgid ""
"The Spiral Vase option can only be used when printing single material "
"objects."
msgstr ""
-#: src/libslic3r/Print.cpp:1257
+#: src/libslic3r/Print.cpp:1256
msgid ""
"The wipe tower is only supported if all extruders have the same nozzle "
"diameter and use filaments of the same diameter."
msgstr ""
-#: src/libslic3r/Print.cpp:1262
+#: src/libslic3r/Print.cpp:1261
msgid ""
"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
"and Repetier G-code flavors."
msgstr ""
-#: src/libslic3r/Print.cpp:1264
+#: src/libslic3r/Print.cpp:1263
msgid ""
"The Wipe Tower is currently only supported with the relative extruder "
"addressing (use_relative_e_distances=1)."
msgstr ""
-#: src/libslic3r/Print.cpp:1266
+#: src/libslic3r/Print.cpp:1265
msgid "Ooze prevention is currently not supported with the wipe tower enabled."
msgstr ""
-#: src/libslic3r/Print.cpp:1268
+#: src/libslic3r/Print.cpp:1267
msgid ""
"The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)."
msgstr ""
-#: src/libslic3r/Print.cpp:1270
+#: src/libslic3r/Print.cpp:1269
msgid ""
"The Wipe Tower is currently not supported for multimaterial sequential "
"prints."
msgstr ""
-#: src/libslic3r/Print.cpp:1291
+#: src/libslic3r/Print.cpp:1290
msgid ""
"The Wipe Tower is only supported for multiple objects if they have equal "
"layer heights"
msgstr ""
-#: src/libslic3r/Print.cpp:1293
+#: src/libslic3r/Print.cpp:1292
msgid ""
"The Wipe Tower is only supported for multiple objects if they are printed "
"over an equal number of raft layers"
msgstr ""
-#: src/libslic3r/Print.cpp:1295
+#: src/libslic3r/Print.cpp:1294
msgid ""
"The Wipe Tower is only supported for multiple objects if they are printed "
"with the same support_material_contact_distance"
msgstr ""
-#: src/libslic3r/Print.cpp:1297
+#: src/libslic3r/Print.cpp:1296
msgid ""
"The Wipe Tower is only supported for multiple objects if they are sliced "
"equally."
msgstr ""
-#: src/libslic3r/Print.cpp:1339
+#: src/libslic3r/Print.cpp:1338
msgid ""
"The Wipe tower is only supported if all objects have the same variable layer "
"height"
msgstr ""
-#: src/libslic3r/Print.cpp:1365
+#: src/libslic3r/Print.cpp:1364
msgid ""
"One or more object were assigned an extruder that the printer does not have."
msgstr ""
-#: src/libslic3r/Print.cpp:1374
+#: src/libslic3r/Print.cpp:1373
msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
msgstr ""
-#: src/libslic3r/Print.cpp:1377
+#: src/libslic3r/Print.cpp:1376
msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm"
msgstr ""
-#: src/libslic3r/Print.cpp:1388
+#: src/libslic3r/Print.cpp:1387
msgid ""
"Printing with multiple extruders of differing nozzle diameters. If support "
"is to be printed with the current extruder (support_material_extruder == 0 "
@@ -6460,13 +6542,13 @@ msgid ""
"same diameter."
msgstr ""
-#: src/libslic3r/Print.cpp:1396
+#: src/libslic3r/Print.cpp:1395
msgid ""
"For the Wipe Tower to work with the soluble supports, the support layers "
"need to be synchronized with the object layers."
msgstr ""
-#: src/libslic3r/Print.cpp:1400
+#: src/libslic3r/Print.cpp:1399
msgid ""
"The Wipe Tower currently supports the non-soluble supports only if they are "
"printed with the current extruder without triggering a tool change. (both "
@@ -6474,62 +6556,62 @@ msgid ""
"set to 0)."
msgstr ""
-#: src/libslic3r/Print.cpp:1422
+#: src/libslic3r/Print.cpp:1421
msgid "First layer height can't be greater than nozzle diameter"
msgstr ""
-#: src/libslic3r/Print.cpp:1427
+#: src/libslic3r/Print.cpp:1426
msgid "Layer height can't be greater than nozzle diameter"
msgstr ""
-#: src/libslic3r/Print.cpp:1584
+#: src/libslic3r/Print.cpp:1583
msgid "Infilling layers"
msgstr ""
-#: src/libslic3r/Print.cpp:1606
+#: src/libslic3r/Print.cpp:1605
msgid "Generating skirt"
msgstr ""
-#: src/libslic3r/Print.cpp:1614
+#: src/libslic3r/Print.cpp:1613
msgid "Generating brim"
msgstr ""
-#: src/libslic3r/Print.cpp:1638
+#: src/libslic3r/Print.cpp:1637
msgid "Exporting G-code"
msgstr ""
-#: src/libslic3r/Print.cpp:1642
+#: src/libslic3r/Print.cpp:1641
msgid "Generating G-code"
msgstr ""
-#: src/libslic3r/SLAPrint.cpp:613
+#: src/libslic3r/SLAPrint.cpp:615
msgid ""
"Cannot proceed without support points! Add support points or disable support "
"generation."
msgstr ""
-#: src/libslic3r/SLAPrint.cpp:625
+#: src/libslic3r/SLAPrint.cpp:627
msgid ""
"Elevation is too low for object. Use the \"Pad around object\" feature to "
"print the object without elevation."
msgstr ""
-#: src/libslic3r/SLAPrint.cpp:631
+#: src/libslic3r/SLAPrint.cpp:633
msgid ""
"The endings of the support pillars will be deployed on the gap between the "
"object and the pad. 'Support base safety distance' has to be greater than "
"the 'Pad object gap' parameter to avoid this."
msgstr ""
-#: src/libslic3r/SLAPrint.cpp:646
+#: src/libslic3r/SLAPrint.cpp:648
msgid "Exposition time is out of printer profile bounds."
msgstr ""
-#: src/libslic3r/SLAPrint.cpp:653
+#: src/libslic3r/SLAPrint.cpp:655
msgid "Initial exposition time is out of printer profile bounds."
msgstr ""
-#: src/libslic3r/SLAPrint.cpp:760
+#: src/libslic3r/SLAPrint.cpp:762
msgid "Slicing done"
msgstr ""
@@ -6670,10 +6752,6 @@ msgid ""
"the API Key or the password required for authentication."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:111
-msgid "HTTPS CA File"
-msgstr ""
-
#: src/libslic3r/PrintConfig.cpp:112
msgid ""
"Custom CA certificate file can be specified for HTTPS OctoPrint connections, "
@@ -6702,7 +6780,7 @@ msgid ""
"feature slows down both the print and the G-code generation."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:144 src/libslic3r/PrintConfig.cpp:2064
+#: src/libslic3r/PrintConfig.cpp:144 src/libslic3r/PrintConfig.cpp:2071
msgid "Other layers"
msgstr ""
@@ -6785,9 +6863,9 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:207 src/libslic3r/PrintConfig.cpp:780
#: src/libslic3r/PrintConfig.cpp:1640 src/libslic3r/PrintConfig.cpp:1650
-#: src/libslic3r/PrintConfig.cpp:1894 src/libslic3r/PrintConfig.cpp:2049
-#: src/libslic3r/PrintConfig.cpp:2247 src/libslic3r/PrintConfig.cpp:2727
-#: src/libslic3r/PrintConfig.cpp:2848
+#: src/libslic3r/PrintConfig.cpp:1901 src/libslic3r/PrintConfig.cpp:2056
+#: src/libslic3r/PrintConfig.cpp:2254 src/libslic3r/PrintConfig.cpp:2744
+#: src/libslic3r/PrintConfig.cpp:2865
msgid "°"
msgstr ""
@@ -6801,8 +6879,8 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:215 src/libslic3r/PrintConfig.cpp:792
#: src/libslic3r/PrintConfig.cpp:1219 src/libslic3r/PrintConfig.cpp:1282
-#: src/libslic3r/PrintConfig.cpp:1532 src/libslic3r/PrintConfig.cpp:2425
-#: src/libslic3r/PrintConfig.cpp:2767
+#: src/libslic3r/PrintConfig.cpp:1532 src/libslic3r/PrintConfig.cpp:2432
+#: src/libslic3r/PrintConfig.cpp:2784
msgid "%"
msgstr ""
@@ -6835,7 +6913,7 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:1191 src/libslic3r/PrintConfig.cpp:1241
#: src/libslic3r/PrintConfig.cpp:1300 src/libslic3r/PrintConfig.cpp:1433
#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1616
-#: src/libslic3r/PrintConfig.cpp:2028 src/libslic3r/PrintConfig.cpp:2154
+#: src/libslic3r/PrintConfig.cpp:2035 src/libslic3r/PrintConfig.cpp:2161
msgid "mm/s"
msgstr ""
@@ -6950,8 +7028,8 @@ msgstr ""
msgid "Default print profile"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:353 src/libslic3r/PrintConfig.cpp:2592
-#: src/libslic3r/PrintConfig.cpp:2603
+#: src/libslic3r/PrintConfig.cpp:353 src/libslic3r/PrintConfig.cpp:2599
+#: src/libslic3r/PrintConfig.cpp:2610
msgid ""
"Default print profile associated with the current printer profile. On "
"selection of the current printer profile, this print profile will be "
@@ -7022,7 +7100,7 @@ msgid ""
msgstr ""
#: src/libslic3r/PrintConfig.cpp:425 src/libslic3r/PrintConfig.cpp:843
-#: src/libslic3r/PrintConfig.cpp:2009
+#: src/libslic3r/PrintConfig.cpp:2016
msgid "Rectilinear"
msgstr ""
@@ -7067,9 +7145,9 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:451 src/libslic3r/PrintConfig.cpp:560
#: src/libslic3r/PrintConfig.cpp:882 src/libslic3r/PrintConfig.cpp:895
#: src/libslic3r/PrintConfig.cpp:1015 src/libslic3r/PrintConfig.cpp:1041
-#: src/libslic3r/PrintConfig.cpp:1423 src/libslic3r/PrintConfig.cpp:1761
-#: src/libslic3r/PrintConfig.cpp:1883 src/libslic3r/PrintConfig.cpp:1951
-#: src/libslic3r/PrintConfig.cpp:2111
+#: src/libslic3r/PrintConfig.cpp:1423 src/libslic3r/PrintConfig.cpp:1768
+#: src/libslic3r/PrintConfig.cpp:1890 src/libslic3r/PrintConfig.cpp:1958
+#: src/libslic3r/PrintConfig.cpp:2118
msgid "mm or %"
msgstr ""
@@ -7081,8 +7159,8 @@ msgid ""
msgstr ""
#: src/libslic3r/PrintConfig.cpp:462 src/libslic3r/PrintConfig.cpp:904
-#: src/libslic3r/PrintConfig.cpp:1720 src/libslic3r/PrintConfig.cpp:1772
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2124
+#: src/libslic3r/PrintConfig.cpp:1727 src/libslic3r/PrintConfig.cpp:1779
+#: src/libslic3r/PrintConfig.cpp:2002 src/libslic3r/PrintConfig.cpp:2131
msgid "mm/s or %"
msgstr ""
@@ -7206,7 +7284,7 @@ msgid ""
"maximum speeds."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:575 src/libslic3r/PrintConfig.cpp:1708
+#: src/libslic3r/PrintConfig.cpp:575 src/libslic3r/PrintConfig.cpp:1715
msgid "approximate seconds"
msgstr ""
@@ -7357,8 +7435,8 @@ msgid ""
"average."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:717 src/libslic3r/PrintConfig.cpp:2503
-#: src/libslic3r/PrintConfig.cpp:2504
+#: src/libslic3r/PrintConfig.cpp:717 src/libslic3r/PrintConfig.cpp:2510
+#: src/libslic3r/PrintConfig.cpp:2511
msgid "Density"
msgstr ""
@@ -7400,7 +7478,7 @@ msgstr ""
msgid "money/kg"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:771 src/libslic3r/PrintConfig.cpp:2587
+#: src/libslic3r/PrintConfig.cpp:771 src/libslic3r/PrintConfig.cpp:2594
msgid "(Unknown)"
msgstr ""
@@ -7451,7 +7529,7 @@ msgstr ""
msgid "Line"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:850 src/libslic3r/PrintConfig.cpp:2011
+#: src/libslic3r/PrintConfig.cpp:850 src/libslic3r/PrintConfig.cpp:2018
msgid "Honeycomb"
msgstr ""
@@ -8316,68 +8394,79 @@ msgid ""
msgstr ""
#: src/libslic3r/PrintConfig.cpp:1695
-msgid "Loops (minimum)"
+msgid "Draft shield"
msgstr ""
#: src/libslic3r/PrintConfig.cpp:1696
+msgid ""
+"If enabled, the skirt will be as tall as a highest printed object. This is "
+"useful to protect an ABS or ASA print from warping and detaching from print "
+"bed due to wind draft."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1702
+msgid "Loops (minimum)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1703
msgid "Skirt Loops"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1697
+#: src/libslic3r/PrintConfig.cpp:1704
msgid ""
"Number of loops for the skirt. If the Minimum Extrusion Length option is "
"set, the number of loops might be greater than the one configured here. Set "
"this to zero to disable skirt completely."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1705
+#: src/libslic3r/PrintConfig.cpp:1712
msgid "Slow down if layer print time is below"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1706
+#: src/libslic3r/PrintConfig.cpp:1713
msgid ""
"If layer print time is estimated below this number of seconds, print moves "
"speed will be scaled down to extend duration to this value."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1715
+#: src/libslic3r/PrintConfig.cpp:1722
msgid "Small perimeters"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1717
+#: src/libslic3r/PrintConfig.cpp:1724
msgid ""
"This separate setting will affect the speed of perimeters having radius <= "
"6.5mm (usually holes). If expressed as percentage (for example: 80%) it will "
"be calculated on the perimeters speed setting above. Set to zero for auto."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1727
+#: src/libslic3r/PrintConfig.cpp:1734
msgid "Solid infill threshold area"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1729
+#: src/libslic3r/PrintConfig.cpp:1736
msgid ""
"Force solid infill for regions having a smaller area than the specified "
"threshold."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1730
+#: src/libslic3r/PrintConfig.cpp:1737
msgid "mm²"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1736
+#: src/libslic3r/PrintConfig.cpp:1743
msgid "Solid infill extruder"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1738
+#: src/libslic3r/PrintConfig.cpp:1745
msgid "The extruder to use when printing solid infill."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1751
msgid "Solid infill every"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1746
+#: src/libslic3r/PrintConfig.cpp:1753
msgid ""
"This feature allows to force a solid layer every given number of layers. "
"Zero to disable. You can set this to any value (for example 9999); Slic3r "
@@ -8385,7 +8474,7 @@ msgid ""
"according to nozzle diameter and layer height."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1758
+#: src/libslic3r/PrintConfig.cpp:1765
msgid ""
"Set this to a non-zero value to set a manual extrusion width for infill for "
"solid surfaces. If left zero, default extrusion width will be used if set, "
@@ -8393,26 +8482,26 @@ msgid ""
"(for example 90%) it will be computed over layer height."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1769
+#: src/libslic3r/PrintConfig.cpp:1776
msgid ""
"Speed for printing solid regions (top/bottom/internal horizontal shells). "
"This can be expressed as a percentage (for example: 80%) over the default "
"infill speed above. Set to zero for auto."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1781
+#: src/libslic3r/PrintConfig.cpp:1788
msgid "Number of solid layers to generate on top and bottom surfaces."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1787 src/libslic3r/PrintConfig.cpp:1788
+#: src/libslic3r/PrintConfig.cpp:1794 src/libslic3r/PrintConfig.cpp:1795
msgid "Minimum thickness of a top / bottom shell"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1794
+#: src/libslic3r/PrintConfig.cpp:1801
msgid "Spiral vase"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1795
+#: src/libslic3r/PrintConfig.cpp:1802
msgid ""
"This feature will raise Z gradually while printing a single-walled object in "
"order to remove any visible seam. This option requires a single perimeter, "
@@ -8421,18 +8510,18 @@ msgid ""
"when printing more than an object."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1803
+#: src/libslic3r/PrintConfig.cpp:1810
msgid "Temperature variation"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1804
+#: src/libslic3r/PrintConfig.cpp:1811
msgid ""
"Temperature difference to be applied when an extruder is not active. Enables "
"a full-height \"sacrificial\" skirt on which the nozzles are periodically "
"wiped."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1814
+#: src/libslic3r/PrintConfig.cpp:1821
msgid ""
"This start procedure is inserted at the beginning, after bed has reached the "
"target temperature and extruder just started heating, and before extruder "
@@ -8443,7 +8532,7 @@ msgid ""
"put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1829
+#: src/libslic3r/PrintConfig.cpp:1836
msgid ""
"This start procedure is inserted at the beginning, after any printer start "
"gcode (and after any toolchange to this filament in case of multi-material "
@@ -8456,29 +8545,29 @@ msgid ""
"extruders, the gcode is processed in extruder order."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1845
+#: src/libslic3r/PrintConfig.cpp:1852
msgid "Single Extruder Multi Material"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1846
+#: src/libslic3r/PrintConfig.cpp:1853
msgid "The printer multiplexes filaments into a single hot end."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1851
+#: src/libslic3r/PrintConfig.cpp:1858
msgid "Prime all printing extruders"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1852
+#: src/libslic3r/PrintConfig.cpp:1859
msgid ""
"If enabled, all printing extruders will be primed at the front edge of the "
"print bed at the start of the print."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1857
+#: src/libslic3r/PrintConfig.cpp:1864
msgid "No sparse layers (EXPERIMENTAL)"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1858
+#: src/libslic3r/PrintConfig.cpp:1865
msgid ""
"If enabled, the wipe tower will not be printed on layers with no "
"toolchanges. On layers with a toolchange, extruder will travel downward to "
@@ -8486,75 +8575,75 @@ msgid ""
"with the print."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1865
+#: src/libslic3r/PrintConfig.cpp:1872
msgid "Generate support material"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1867
+#: src/libslic3r/PrintConfig.cpp:1874
msgid "Enable support material generation."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1871
+#: src/libslic3r/PrintConfig.cpp:1878
msgid "Auto generated supports"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1880
msgid ""
"If checked, supports will be generated automatically based on the overhang "
"threshold value. If unchecked, supports will be generated inside the "
"\"Support Enforcer\" volumes only."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1879
+#: src/libslic3r/PrintConfig.cpp:1886
msgid "XY separation between an object and its support"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1881
+#: src/libslic3r/PrintConfig.cpp:1888
msgid ""
"XY separation between an object and its support. If expressed as percentage "
"(for example 50%), it will be calculated over external perimeter width."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1891
+#: src/libslic3r/PrintConfig.cpp:1898
msgid "Pattern angle"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1893
+#: src/libslic3r/PrintConfig.cpp:1900
msgid ""
"Use this setting to rotate the support material pattern on the horizontal "
"plane."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1903 src/libslic3r/PrintConfig.cpp:2676
+#: src/libslic3r/PrintConfig.cpp:1910 src/libslic3r/PrintConfig.cpp:2693
msgid ""
"Only create support if it lies on a build plate. Don't create support on a "
"print."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1909
+#: src/libslic3r/PrintConfig.cpp:1916
msgid "Contact Z distance"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1911
+#: src/libslic3r/PrintConfig.cpp:1918
msgid ""
"The vertical distance between object and support material interface. Setting "
"this to 0 will also prevent Slic3r from using bridge flow and speed for the "
"first object layer."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1918
+#: src/libslic3r/PrintConfig.cpp:1925
msgid "0 (soluble)"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1919
+#: src/libslic3r/PrintConfig.cpp:1926
msgid "0.2 (detachable)"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1924
+#: src/libslic3r/PrintConfig.cpp:1931
msgid "Enforce support for the first"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1926
+#: src/libslic3r/PrintConfig.cpp:1933
msgid ""
"Generate support material for the specified number of layers counting from "
"bottom, regardless of whether normal support material is enabled or not and "
@@ -8562,21 +8651,21 @@ msgid ""
"of objects having a very thin or poor footprint on the build plate."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1931
+#: src/libslic3r/PrintConfig.cpp:1938
msgid "Enforce support for the first n layers"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1944
msgid "Support material/raft/skirt extruder"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1939
+#: src/libslic3r/PrintConfig.cpp:1946
msgid ""
"The extruder to use when printing support material, raft and skirt (1+, 0 to "
"use the current extruder to minimize tool changes)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1948
+#: src/libslic3r/PrintConfig.cpp:1955
msgid ""
"Set this to a non-zero value to set a manual extrusion width for support "
"material. If left zero, default extrusion width will be used if set, "
@@ -8584,89 +8673,89 @@ msgid ""
"example 90%) it will be computed over layer height."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1957
+#: src/libslic3r/PrintConfig.cpp:1964
msgid "Interface loops"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1959
+#: src/libslic3r/PrintConfig.cpp:1966
msgid ""
"Cover the top contact layer of the supports with loops. Disabled by default."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1964
+#: src/libslic3r/PrintConfig.cpp:1971
msgid "Support material/raft interface extruder"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1966
+#: src/libslic3r/PrintConfig.cpp:1973
msgid ""
"The extruder to use when printing support material interface (1+, 0 to use "
"the current extruder to minimize tool changes). This affects raft too."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1973
+#: src/libslic3r/PrintConfig.cpp:1980
msgid "Interface layers"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1975
+#: src/libslic3r/PrintConfig.cpp:1982
msgid ""
"Number of interface layers to insert between the object(s) and support "
"material."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1982
+#: src/libslic3r/PrintConfig.cpp:1989
msgid "Interface pattern spacing"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:1991
msgid "Spacing between interface lines. Set zero to get a solid interface."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:1993
+#: src/libslic3r/PrintConfig.cpp:2000
msgid ""
"Speed for printing support material interface layers. If expressed as "
"percentage (for example 50%) it will be calculated over support material "
"speed."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2002
+#: src/libslic3r/PrintConfig.cpp:2009
msgid "Pattern"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2004
+#: src/libslic3r/PrintConfig.cpp:2011
msgid "Pattern used to generate support material."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2010
+#: src/libslic3r/PrintConfig.cpp:2017
msgid "Rectilinear grid"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2016
+#: src/libslic3r/PrintConfig.cpp:2023
msgid "Pattern spacing"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2018
+#: src/libslic3r/PrintConfig.cpp:2025
msgid "Spacing between support material lines."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2027
+#: src/libslic3r/PrintConfig.cpp:2034
msgid "Speed for printing support material."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2034
+#: src/libslic3r/PrintConfig.cpp:2041
msgid "Synchronize with object layers"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2036
+#: src/libslic3r/PrintConfig.cpp:2043
msgid ""
"Synchronize support layers with the object print layers. This is useful with "
"multi-material printers, where the extruder switch is expensive."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2042
+#: src/libslic3r/PrintConfig.cpp:2049
msgid "Overhang threshold"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2044
+#: src/libslic3r/PrintConfig.cpp:2051
msgid ""
"Support material will not be generated for overhangs whose slope angle (90° "
"= vertical) is above the given threshold. In other words, this value "
@@ -8675,43 +8764,43 @@ msgid ""
"detection (recommended)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2056
+#: src/libslic3r/PrintConfig.cpp:2063
msgid "With sheath around the support"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2058
+#: src/libslic3r/PrintConfig.cpp:2065
msgid ""
"Add a sheath (a single perimeter line) around the base support. This makes "
"the support more reliable, but also more difficult to remove."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2065
+#: src/libslic3r/PrintConfig.cpp:2072
msgid ""
"Extruder temperature for layers after the first one. Set this to zero to "
"disable temperature control commands in the output."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2073
+#: src/libslic3r/PrintConfig.cpp:2080
msgid "Detect thin walls"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2075
+#: src/libslic3r/PrintConfig.cpp:2082
msgid ""
"Detect single-width walls (parts where two extrusions don't fit and we need "
"to collapse them into a single trace)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2081
+#: src/libslic3r/PrintConfig.cpp:2088
msgid "Threads"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2082
+#: src/libslic3r/PrintConfig.cpp:2089
msgid ""
"Threads are used to parallelize long-running tasks. Optimal threads number "
"is slightly above the number of available cores/processors."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2094
+#: src/libslic3r/PrintConfig.cpp:2101
msgid ""
"This custom code is inserted before every toolchange. Placeholder variables "
"for all PrusaSlicer settings as well as {previous_extruder} and "
@@ -8721,7 +8810,7 @@ msgid ""
"behaviour both before and after the toolchange."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2107
+#: src/libslic3r/PrintConfig.cpp:2114
msgid ""
"Set this to a non-zero value to set a manual extrusion width for infill for "
"top surfaces. You may want to use thinner extrudates to fill all narrow "
@@ -8730,7 +8819,7 @@ msgid ""
"percentage (for example 90%) it will be computed over layer height."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2119
+#: src/libslic3r/PrintConfig.cpp:2126
msgid ""
"Speed for printing top solid layers (it only applies to the uppermost "
"external layers and not to their internal solid layers). You may want to "
@@ -8739,54 +8828,54 @@ msgid ""
"for auto."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2134
+#: src/libslic3r/PrintConfig.cpp:2141
msgid "Number of solid layers to generate on top surfaces."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2135
+#: src/libslic3r/PrintConfig.cpp:2142
msgid "Top solid layers"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2143
+#: src/libslic3r/PrintConfig.cpp:2150
msgid ""
"The number of top solid layers is increased above top_solid_layers if "
"necessary to satisfy minimum thickness of top shell. This is useful to "
"prevent pillowing effect when printing with variable layer height."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2146
+#: src/libslic3r/PrintConfig.cpp:2153
msgid "Minimum top shell thickness"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2153
+#: src/libslic3r/PrintConfig.cpp:2160
msgid "Speed for travel moves (jumps between distant extrusion points)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2161
+#: src/libslic3r/PrintConfig.cpp:2168
msgid "Use firmware retraction"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2162
+#: src/libslic3r/PrintConfig.cpp:2169
msgid ""
"This experimental setting uses G10 and G11 commands to have the firmware "
"handle the retraction. This is only supported in recent Marlin."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2168
+#: src/libslic3r/PrintConfig.cpp:2175
msgid "Use relative E distances"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2169
+#: src/libslic3r/PrintConfig.cpp:2176
msgid ""
"If your firmware requires relative E values, check this, otherwise leave it "
"unchecked. Most firmwares use absolute values."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2175
+#: src/libslic3r/PrintConfig.cpp:2182
msgid "Use volumetric E"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2176
+#: src/libslic3r/PrintConfig.cpp:2183
msgid ""
"This experimental setting uses outputs the E values in cubic millimeters "
"instead of linear millimeters. If your firmware doesn't already know "
@@ -8796,127 +8885,127 @@ msgid ""
"only supported in recent Marlin."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2186
+#: src/libslic3r/PrintConfig.cpp:2193
msgid "Enable variable layer height feature"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2187
+#: src/libslic3r/PrintConfig.cpp:2194
msgid ""
"Some printers or printer setups may have difficulties printing with a "
"variable layer height. Enabled by default."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2193
+#: src/libslic3r/PrintConfig.cpp:2200
msgid "Wipe while retracting"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2194
+#: src/libslic3r/PrintConfig.cpp:2201
msgid ""
"This flag will move the nozzle while retracting to minimize the possible "
"blob on leaky extruders."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2201
+#: src/libslic3r/PrintConfig.cpp:2208
msgid ""
"Multi material printers may need to prime or purge extruders on tool "
"changes. Extrude the excess material into the wipe tower."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2207
+#: src/libslic3r/PrintConfig.cpp:2214
msgid "Purging volumes - load/unload volumes"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2208
+#: src/libslic3r/PrintConfig.cpp:2215
msgid ""
"This vector saves required volumes to change from/to each tool used on the "
"wipe tower. These values are used to simplify creation of the full purging "
"volumes below."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2214
+#: src/libslic3r/PrintConfig.cpp:2221
msgid "Purging volumes - matrix"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2215
+#: src/libslic3r/PrintConfig.cpp:2222
msgid ""
"This matrix describes volumes (in cubic milimetres) required to purge the "
"new filament on the wipe tower for any given pair of tools."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2224
+#: src/libslic3r/PrintConfig.cpp:2231
msgid "Position X"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2225
+#: src/libslic3r/PrintConfig.cpp:2232
msgid "X coordinate of the left front corner of a wipe tower"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2231
+#: src/libslic3r/PrintConfig.cpp:2238
msgid "Position Y"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2232
+#: src/libslic3r/PrintConfig.cpp:2239
msgid "Y coordinate of the left front corner of a wipe tower"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2239
+#: src/libslic3r/PrintConfig.cpp:2246
msgid "Width of a wipe tower"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2245
+#: src/libslic3r/PrintConfig.cpp:2252
msgid "Wipe tower rotation angle"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2246
+#: src/libslic3r/PrintConfig.cpp:2253
msgid "Wipe tower rotation angle with respect to x-axis."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2253
+#: src/libslic3r/PrintConfig.cpp:2260
msgid "Wipe into this object's infill"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2254
+#: src/libslic3r/PrintConfig.cpp:2261
msgid ""
"Purging after toolchange will done inside this object's infills. This lowers "
"the amount of waste but may result in longer print time due to additional "
"travel moves."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2261
+#: src/libslic3r/PrintConfig.cpp:2268
msgid "Wipe into this object"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2262
+#: src/libslic3r/PrintConfig.cpp:2269
msgid ""
"Object will be used to purge the nozzle after a toolchange to save material "
"that would otherwise end up in the wipe tower and decrease print time. "
"Colours of the objects will be mixed as a result."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2268
+#: src/libslic3r/PrintConfig.cpp:2275
msgid "Maximal bridging distance"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2269
+#: src/libslic3r/PrintConfig.cpp:2276
msgid "Maximal distance between supports on sparse infill sections."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2275
+#: src/libslic3r/PrintConfig.cpp:2282
msgid "XY Size Compensation"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2277
+#: src/libslic3r/PrintConfig.cpp:2284
msgid ""
"The object will be grown/shrunk in the XY plane by the configured value "
"(negative = inwards, positive = outwards). This might be useful for fine-"
"tuning hole sizes."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2285
+#: src/libslic3r/PrintConfig.cpp:2292
msgid "Z offset"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2286
+#: src/libslic3r/PrintConfig.cpp:2293
msgid ""
"This value will be added (or subtracted) from all the Z coordinates in the "
"output G-code. It is used to compensate for bad Z endstop position: for "
@@ -8924,398 +9013,408 @@ msgid ""
"print bed, set this to -0.3 (or fix your endstop)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2353
+#: src/libslic3r/PrintConfig.cpp:2360
msgid "Display width"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2354
+#: src/libslic3r/PrintConfig.cpp:2361
msgid "Width of the display"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2359
+#: src/libslic3r/PrintConfig.cpp:2366
msgid "Display height"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2360
+#: src/libslic3r/PrintConfig.cpp:2367
msgid "Height of the display"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2365
+#: src/libslic3r/PrintConfig.cpp:2372
msgid "Number of pixels in"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2367
+#: src/libslic3r/PrintConfig.cpp:2374
msgid "Number of pixels in X"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2373
+#: src/libslic3r/PrintConfig.cpp:2380
msgid "Number of pixels in Y"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2378
+#: src/libslic3r/PrintConfig.cpp:2385
msgid "Display horizontal mirroring"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2379
+#: src/libslic3r/PrintConfig.cpp:2386
msgid "Mirror horizontally"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2380
+#: src/libslic3r/PrintConfig.cpp:2387
msgid "Enable horizontal mirroring of output images"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2385
+#: src/libslic3r/PrintConfig.cpp:2392
msgid "Display vertical mirroring"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2386
+#: src/libslic3r/PrintConfig.cpp:2393
msgid "Mirror vertically"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2387
+#: src/libslic3r/PrintConfig.cpp:2394
msgid "Enable vertical mirroring of output images"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2392
+#: src/libslic3r/PrintConfig.cpp:2399
msgid "Display orientation"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2393
+#: src/libslic3r/PrintConfig.cpp:2400
msgid ""
"Set the actual LCD display orientation inside the SLA printer. Portrait mode "
"will flip the meaning of display width and height parameters and the output "
"images will be rotated by 90 degrees."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2399
+#: src/libslic3r/PrintConfig.cpp:2406
msgid "Landscape"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2400
+#: src/libslic3r/PrintConfig.cpp:2407
msgid "Portrait"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2405
+#: src/libslic3r/PrintConfig.cpp:2412
msgid "Fast"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2406
+#: src/libslic3r/PrintConfig.cpp:2413
msgid "Fast tilt"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2407
+#: src/libslic3r/PrintConfig.cpp:2414
msgid "Time of the fast tilt"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2414
+#: src/libslic3r/PrintConfig.cpp:2421
msgid "Slow"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2415
+#: src/libslic3r/PrintConfig.cpp:2422
msgid "Slow tilt"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2416
+#: src/libslic3r/PrintConfig.cpp:2423
msgid "Time of the slow tilt"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2423
+#: src/libslic3r/PrintConfig.cpp:2430
msgid "Area fill"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2424
+#: src/libslic3r/PrintConfig.cpp:2431
msgid ""
"The percentage of the bed area. \n"
"If the print area exceeds the specified value, \n"
"then a slow tilt will be used, otherwise - a fast tilt"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2431 src/libslic3r/PrintConfig.cpp:2432
-#: src/libslic3r/PrintConfig.cpp:2433
+#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
+#: src/libslic3r/PrintConfig.cpp:2440
msgid "Printer scaling correction"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2439 src/libslic3r/PrintConfig.cpp:2440
+#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
msgid "Printer absolute correction"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2441
+#: src/libslic3r/PrintConfig.cpp:2448
msgid ""
"Will inflate or deflate the sliced 2D polygons according to the sign of the "
"correction."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2447
+#: src/libslic3r/PrintConfig.cpp:2454
msgid "Elephant foot minimum width"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2449
+#: src/libslic3r/PrintConfig.cpp:2456
msgid ""
"Minimum width of features to maintain when doing elephant foot compensation."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2456 src/libslic3r/PrintConfig.cpp:2457
+#: src/libslic3r/PrintConfig.cpp:2463 src/libslic3r/PrintConfig.cpp:2464
msgid "Printer gamma correction"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2458
+#: src/libslic3r/PrintConfig.cpp:2465
msgid ""
"This will apply a gamma correction to the rasterized 2D polygons. A gamma "
"value of zero means thresholding with the threshold in the middle. This "
"behaviour eliminates antialiasing without losing holes in polygons."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2470 src/libslic3r/PrintConfig.cpp:2471
+#: src/libslic3r/PrintConfig.cpp:2477 src/libslic3r/PrintConfig.cpp:2478
msgid "SLA material type"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2482 src/libslic3r/PrintConfig.cpp:2483
+#: src/libslic3r/PrintConfig.cpp:2489 src/libslic3r/PrintConfig.cpp:2490
msgid "Initial layer height"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2489 src/libslic3r/PrintConfig.cpp:2490
+#: src/libslic3r/PrintConfig.cpp:2496 src/libslic3r/PrintConfig.cpp:2497
msgid "Bottle volume"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2491
+#: src/libslic3r/PrintConfig.cpp:2498
msgid "ml"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2496 src/libslic3r/PrintConfig.cpp:2497
+#: src/libslic3r/PrintConfig.cpp:2503 src/libslic3r/PrintConfig.cpp:2504
msgid "Bottle weight"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2498
+#: src/libslic3r/PrintConfig.cpp:2505
msgid "kg"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2505
+#: src/libslic3r/PrintConfig.cpp:2512
msgid "g/ml"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2519
msgid "money/bottle"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2517
+#: src/libslic3r/PrintConfig.cpp:2524
msgid "Faded layers"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2518
+#: src/libslic3r/PrintConfig.cpp:2525
msgid ""
"Number of the layers needed for the exposure time fade from initial exposure "
"time to the exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2525 src/libslic3r/PrintConfig.cpp:2526
+#: src/libslic3r/PrintConfig.cpp:2532 src/libslic3r/PrintConfig.cpp:2533
msgid "Minimum exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2534
+#: src/libslic3r/PrintConfig.cpp:2540 src/libslic3r/PrintConfig.cpp:2541
msgid "Maximum exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2541 src/libslic3r/PrintConfig.cpp:2542
+#: src/libslic3r/PrintConfig.cpp:2548 src/libslic3r/PrintConfig.cpp:2549
msgid "Exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2548 src/libslic3r/PrintConfig.cpp:2549
+#: src/libslic3r/PrintConfig.cpp:2555 src/libslic3r/PrintConfig.cpp:2556
msgid "Minimum initial exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2556 src/libslic3r/PrintConfig.cpp:2557
+#: src/libslic3r/PrintConfig.cpp:2563 src/libslic3r/PrintConfig.cpp:2564
msgid "Maximum initial exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2564 src/libslic3r/PrintConfig.cpp:2565
+#: src/libslic3r/PrintConfig.cpp:2571 src/libslic3r/PrintConfig.cpp:2572
msgid "Initial exposure time"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2571 src/libslic3r/PrintConfig.cpp:2572
+#: src/libslic3r/PrintConfig.cpp:2578 src/libslic3r/PrintConfig.cpp:2579
msgid "Correction for expansion"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2578
+#: src/libslic3r/PrintConfig.cpp:2585
msgid "SLA print material notes"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2579
+#: src/libslic3r/PrintConfig.cpp:2586
msgid "You can put your notes regarding the SLA print material here."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2591 src/libslic3r/PrintConfig.cpp:2602
+#: src/libslic3r/PrintConfig.cpp:2598 src/libslic3r/PrintConfig.cpp:2609
msgid "Default SLA material profile"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2613
+#: src/libslic3r/PrintConfig.cpp:2620
msgid "Generate supports"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2615
+#: src/libslic3r/PrintConfig.cpp:2622
msgid "Generate supports for the models"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2620
+#: src/libslic3r/PrintConfig.cpp:2627
msgid "Support head front diameter"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2622
+#: src/libslic3r/PrintConfig.cpp:2629
msgid "Diameter of the pointing side of the head"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2629
+#: src/libslic3r/PrintConfig.cpp:2636
msgid "Support head penetration"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2631
+#: src/libslic3r/PrintConfig.cpp:2638
msgid "How much the pinhead has to penetrate the model surface"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2638
+#: src/libslic3r/PrintConfig.cpp:2645
msgid "Support head width"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2640
+#: src/libslic3r/PrintConfig.cpp:2647
msgid "Width from the back sphere center to the front sphere center"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2648
+#: src/libslic3r/PrintConfig.cpp:2655
msgid "Support pillar diameter"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2650
+#: src/libslic3r/PrintConfig.cpp:2657
msgid "Diameter in mm of the support pillars"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2658
+#: src/libslic3r/PrintConfig.cpp:2665
+msgid "Max bridges on a pillar"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2667
+msgid ""
+"Maximum number of bridges that can be placed on a pillar. Bridges hold "
+"support point pinheads and connect to pillars as small branches."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2675
msgid "Support pillar connection mode"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2659
+#: src/libslic3r/PrintConfig.cpp:2676
msgid ""
"Controls the bridge type between two neighboring pillars. Can be zig-zag, "
"cross (double zig-zag) or dynamic which will automatically switch between "
"the first two depending on the distance of the two pillars."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2667
+#: src/libslic3r/PrintConfig.cpp:2684
msgid "Zig-Zag"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2668
+#: src/libslic3r/PrintConfig.cpp:2685
msgid "Cross"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2669
+#: src/libslic3r/PrintConfig.cpp:2686
msgid "Dynamic"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2681
+#: src/libslic3r/PrintConfig.cpp:2698
msgid "Pillar widening factor"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2683
+#: src/libslic3r/PrintConfig.cpp:2700
msgid ""
"Merging bridges or pillars into another pillars can increase the radius. "
"Zero means no increase, one means full increase."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2692
+#: src/libslic3r/PrintConfig.cpp:2709
msgid "Support base diameter"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2694
+#: src/libslic3r/PrintConfig.cpp:2711
msgid "Diameter in mm of the pillar base"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2702
+#: src/libslic3r/PrintConfig.cpp:2719
msgid "Support base height"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2704
+#: src/libslic3r/PrintConfig.cpp:2721
msgid "The height of the pillar base cone"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2711
+#: src/libslic3r/PrintConfig.cpp:2728
msgid "Support base safety distance"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2714
+#: src/libslic3r/PrintConfig.cpp:2731
msgid ""
"The minimum distance of the pillar base from the model in mm. Makes sense in "
"zero elevation mode where a gap according to this parameter is inserted "
"between the model and the pad."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2724
+#: src/libslic3r/PrintConfig.cpp:2741
msgid "Critical angle"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2726
+#: src/libslic3r/PrintConfig.cpp:2743
msgid "The default angle for connecting support sticks and junctions."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2734
+#: src/libslic3r/PrintConfig.cpp:2751
msgid "Max bridge length"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2736
+#: src/libslic3r/PrintConfig.cpp:2753
msgid "The max length of a bridge"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2743
+#: src/libslic3r/PrintConfig.cpp:2760
msgid "Max pillar linking distance"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2745
+#: src/libslic3r/PrintConfig.cpp:2762
msgid ""
"The max distance of two pillars to get linked with each other. A zero value "
"will prohibit pillar cascading."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2753
+#: src/libslic3r/PrintConfig.cpp:2770
msgid "Object elevation"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2755
+#: src/libslic3r/PrintConfig.cpp:2772
msgid ""
"How much the supports should lift up the supported object. If \"Pad around "
"object\" is enabled, this value is ignored."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2766
+#: src/libslic3r/PrintConfig.cpp:2783
msgid "This is a relative measure of support points density."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2772
+#: src/libslic3r/PrintConfig.cpp:2789
msgid "Minimal distance of the support points"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2774
+#: src/libslic3r/PrintConfig.cpp:2791
msgid "No support points will be placed closer than this threshold."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2780
+#: src/libslic3r/PrintConfig.cpp:2797
msgid "Use pad"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2782
+#: src/libslic3r/PrintConfig.cpp:2799
msgid "Add a pad underneath the supported model"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2787
+#: src/libslic3r/PrintConfig.cpp:2804
msgid "Pad wall thickness"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2789
+#: src/libslic3r/PrintConfig.cpp:2806
msgid "The thickness of the pad and its optional cavity walls."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2797
+#: src/libslic3r/PrintConfig.cpp:2814
msgid "Pad wall height"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2798
+#: src/libslic3r/PrintConfig.cpp:2815
msgid ""
"Defines the pad cavity depth. Set to zero to disable the cavity. Be careful "
"when enabling this feature, as some resins may produce an extreme suction "
@@ -9323,115 +9422,115 @@ msgid ""
"difficult."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2811
+#: src/libslic3r/PrintConfig.cpp:2828
msgid "Pad brim size"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2812
+#: src/libslic3r/PrintConfig.cpp:2829
msgid "How far should the pad extend around the contained geometry"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2822
+#: src/libslic3r/PrintConfig.cpp:2839
msgid "Max merge distance"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2824
+#: src/libslic3r/PrintConfig.cpp:2841
msgid ""
"Some objects can get along with a few smaller pads instead of a single big "
"one. This parameter defines how far the center of two smaller pads should "
"be. If theyare closer, they will get merged into one pad."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2844
+#: src/libslic3r/PrintConfig.cpp:2861
msgid "Pad wall slope"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2846
+#: src/libslic3r/PrintConfig.cpp:2863
msgid ""
"The slope of the pad wall relative to the bed plane. 90 degrees means "
"straight walls."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2855
+#: src/libslic3r/PrintConfig.cpp:2872
msgid "Pad around object"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2857
+#: src/libslic3r/PrintConfig.cpp:2874
msgid "Create pad around object and ignore the support elevation"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2862
+#: src/libslic3r/PrintConfig.cpp:2879
msgid "Pad around object everywhere"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2864
+#: src/libslic3r/PrintConfig.cpp:2881
msgid "Force pad around object everywhere"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2869
+#: src/libslic3r/PrintConfig.cpp:2886
msgid "Pad object gap"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2871
+#: src/libslic3r/PrintConfig.cpp:2888
msgid ""
"The gap between the object bottom and the generated pad in zero elevation "
"mode."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2880
+#: src/libslic3r/PrintConfig.cpp:2897
msgid "Pad object connector stride"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2882
+#: src/libslic3r/PrintConfig.cpp:2899
msgid ""
"Distance between two connector sticks which connect the object and the "
"generated pad."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2889
+#: src/libslic3r/PrintConfig.cpp:2906
msgid "Pad object connector width"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2891
+#: src/libslic3r/PrintConfig.cpp:2908
msgid ""
"Width of the connector sticks which connect the object and the generated pad."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2898
+#: src/libslic3r/PrintConfig.cpp:2915
msgid "Pad object connector penetration"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2901
+#: src/libslic3r/PrintConfig.cpp:2918
msgid "How much should the tiny connectors penetrate into the model body."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2908
+#: src/libslic3r/PrintConfig.cpp:2925
msgid "Enable hollowing"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2910
+#: src/libslic3r/PrintConfig.cpp:2927
msgid "Hollow out a model to have an empty interior"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2915
+#: src/libslic3r/PrintConfig.cpp:2932
msgid "Wall thickness"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2917
+#: src/libslic3r/PrintConfig.cpp:2934
msgid "Minimum wall thickness of a hollowed model."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2925
+#: src/libslic3r/PrintConfig.cpp:2942
msgid "Accuracy"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2927
+#: src/libslic3r/PrintConfig.cpp:2944
msgid ""
"Performance vs accuracy of calculation. Lower values may produce unwanted "
"artifacts."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:2937
+#: src/libslic3r/PrintConfig.cpp:2954
msgid ""
"Hollowing is done in two steps: first, an imaginary interior is calculated "
"deeper (offset plus the closing distance) in the object and then it's "
@@ -9440,255 +9539,255 @@ msgid ""
"most."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3320
+#: src/libslic3r/PrintConfig.cpp:3342
msgid "Export OBJ"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3321
+#: src/libslic3r/PrintConfig.cpp:3343
msgid "Export the model(s) as OBJ."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3332
+#: src/libslic3r/PrintConfig.cpp:3354
msgid "Export SLA"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3333
+#: src/libslic3r/PrintConfig.cpp:3355
msgid "Slice the model and export SLA printing layers as PNG."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3338
+#: src/libslic3r/PrintConfig.cpp:3360
msgid "Export 3MF"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3339
+#: src/libslic3r/PrintConfig.cpp:3361
msgid "Export the model(s) as 3MF."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3343
+#: src/libslic3r/PrintConfig.cpp:3365
msgid "Export AMF"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3344
+#: src/libslic3r/PrintConfig.cpp:3366
msgid "Export the model(s) as AMF."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3348
+#: src/libslic3r/PrintConfig.cpp:3370
msgid "Export STL"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3349
+#: src/libslic3r/PrintConfig.cpp:3371
msgid "Export the model(s) as STL."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3354
+#: src/libslic3r/PrintConfig.cpp:3376
msgid "Slice the model and export toolpaths as G-code."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3359
+#: src/libslic3r/PrintConfig.cpp:3381
msgid "Slice"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3360
+#: src/libslic3r/PrintConfig.cpp:3382
msgid ""
"Slice the model as FFF or SLA based on the printer_technology configuration "
"value."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3365
+#: src/libslic3r/PrintConfig.cpp:3387
msgid "Help"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3366
+#: src/libslic3r/PrintConfig.cpp:3388
msgid "Show this help."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3371
+#: src/libslic3r/PrintConfig.cpp:3393
msgid "Help (FFF options)"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3372
+#: src/libslic3r/PrintConfig.cpp:3394
msgid "Show the full list of print/G-code configuration options."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3376
+#: src/libslic3r/PrintConfig.cpp:3398
msgid "Help (SLA options)"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3377
+#: src/libslic3r/PrintConfig.cpp:3399
msgid "Show the full list of SLA print configuration options."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3381
+#: src/libslic3r/PrintConfig.cpp:3403
msgid "Output Model Info"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3382
+#: src/libslic3r/PrintConfig.cpp:3404
msgid "Write information about the model to the console."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3386
+#: src/libslic3r/PrintConfig.cpp:3408
msgid "Save config file"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3387
+#: src/libslic3r/PrintConfig.cpp:3409
msgid "Save configuration to the specified file."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3397
+#: src/libslic3r/PrintConfig.cpp:3419
msgid "Align XY"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3398
+#: src/libslic3r/PrintConfig.cpp:3420
msgid "Align the model to the given point."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3403
+#: src/libslic3r/PrintConfig.cpp:3425
msgid "Cut model at the given Z."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3424
+#: src/libslic3r/PrintConfig.cpp:3446
msgid "Center"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3425
+#: src/libslic3r/PrintConfig.cpp:3447
msgid "Center the print around the given center."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3429
+#: src/libslic3r/PrintConfig.cpp:3451
msgid "Don't arrange"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3430
+#: src/libslic3r/PrintConfig.cpp:3452
msgid ""
"Do not rearrange the given models before merging and keep their original XY "
"coordinates."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3433
+#: src/libslic3r/PrintConfig.cpp:3455
msgid "Duplicate"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3434
+#: src/libslic3r/PrintConfig.cpp:3456
msgid "Multiply copies by this factor."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3438
+#: src/libslic3r/PrintConfig.cpp:3460
msgid "Duplicate by grid"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3439
+#: src/libslic3r/PrintConfig.cpp:3461
msgid "Multiply copies by creating a grid."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3442
+#: src/libslic3r/PrintConfig.cpp:3464
msgid "Merge"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3443
+#: src/libslic3r/PrintConfig.cpp:3465
msgid ""
"Arrange the supplied models in a plate and merge them in a single model in "
"order to perform actions once."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3448
+#: src/libslic3r/PrintConfig.cpp:3470
msgid ""
"Try to repair any non-manifold meshes (this option is implicitly added "
"whenever we need to slice the model to perform the requested action)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3452
+#: src/libslic3r/PrintConfig.cpp:3474
msgid "Rotation angle around the Z axis in degrees."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3456
+#: src/libslic3r/PrintConfig.cpp:3478
msgid "Rotate around X"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3457
+#: src/libslic3r/PrintConfig.cpp:3479
msgid "Rotation angle around the X axis in degrees."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3461
+#: src/libslic3r/PrintConfig.cpp:3483
msgid "Rotate around Y"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3462
+#: src/libslic3r/PrintConfig.cpp:3484
msgid "Rotation angle around the Y axis in degrees."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3467
+#: src/libslic3r/PrintConfig.cpp:3489
msgid "Scaling factor or percentage."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3472
+#: src/libslic3r/PrintConfig.cpp:3494
msgid ""
"Detect unconnected parts in the given model(s) and split them into separate "
"objects."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3475
+#: src/libslic3r/PrintConfig.cpp:3497
msgid "Scale to Fit"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3476
+#: src/libslic3r/PrintConfig.cpp:3498
msgid "Scale to fit the given volume."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3485
+#: src/libslic3r/PrintConfig.cpp:3507
msgid "Ignore non-existent config files"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3486
+#: src/libslic3r/PrintConfig.cpp:3508
msgid "Do not fail if a file supplied to --load does not exist."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3489
+#: src/libslic3r/PrintConfig.cpp:3511
msgid "Load config file"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3490
+#: src/libslic3r/PrintConfig.cpp:3512
msgid ""
"Load configuration from the specified file. It can be used more than once to "
"load options from multiple files."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3493
+#: src/libslic3r/PrintConfig.cpp:3515
msgid "Output File"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3494
+#: src/libslic3r/PrintConfig.cpp:3516
msgid ""
"The file where the output will be written (if not specified, it will be "
"based on the input file)."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3504
+#: src/libslic3r/PrintConfig.cpp:3526
msgid "Data directory"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3505
+#: src/libslic3r/PrintConfig.cpp:3527
msgid ""
"Load and store settings at the given directory. This is useful for "
"maintaining different profiles or including configurations from a network "
"storage."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3508
+#: src/libslic3r/PrintConfig.cpp:3530
msgid "Logging level"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3509
+#: src/libslic3r/PrintConfig.cpp:3531
msgid ""
"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:"
"trace\n"
"For example. loglevel=2 logs fatal, error and warning level messages."
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3515
+#: src/libslic3r/PrintConfig.cpp:3537
msgid "Render with a software renderer"
msgstr ""
-#: src/libslic3r/PrintConfig.cpp:3516
+#: src/libslic3r/PrintConfig.cpp:3538
msgid ""
"Render with a software renderer. The bundled MESA software renderer is "
"loaded instead of the default OpenGL driver."
diff --git a/resources/localization/cs/PrusaSlicer.mo b/resources/localization/cs/PrusaSlicer.mo
index d1105a97ec..95c5093663 100644
Binary files a/resources/localization/cs/PrusaSlicer.mo and b/resources/localization/cs/PrusaSlicer.mo differ
diff --git a/resources/localization/cs/PrusaSlicer_cs.po b/resources/localization/cs/PrusaSlicer_cs.po
index a892a4dac6..cad51dbfa3 100644
--- a/resources/localization/cs/PrusaSlicer_cs.po
+++ b/resources/localization/cs/PrusaSlicer_cs.po
@@ -5,7 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
@@ -337,6 +337,10 @@ msgstr "Logický výraz může používat konfigurační hodnoty aktivního prof
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "Logický výraz může používat konfigurační hodnoty aktivního profilu tiskárny. Pokud je tento logický výraz pravdivý, potom je tento profil považován za kompatibilní s aktivním profilem tiskárny."
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "Bude vytvořena oddělená kopie aktuálního systémového přednastavení."
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "Obecným pravidlem je 160 až 230 °C pro PLA a 215 až 250 °C pro ABS."
@@ -1088,6 +1092,34 @@ msgstr "Ukončování..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "Nelze vypočítat šířku extrudování pro %1%: Proměnná \"%2%\" není dostupná."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"Current layer range overlaps with the next layer range."
+msgstr ""
+"Nelze vložit nový rozsah vrstev za aktuální rozsah vrstev.\n"
+"Aktuální rozsah vrstev se překrývá s dalším rozsahem vrstev."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"The next layer range is too thin to be split to two\n"
+"without violating the minimum layer height."
+msgstr ""
+"Nelze vložit nový rozsah vrstev za aktuální rozsah vrstev.\n"
+"Další rozsah vrstev je příliš tenký na to, aby byl rozdělen na dva\n"
+"bez porušení minimální výšky vrstvy."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid ""
+"Cannot insert a new layer range between the current and the next layer range.\n"
+"The gap between the current layer range and the next layer range\n"
+"is thinner than the minimum layer height allowed."
+msgstr ""
+"Nelze vložit nový rozsah vrstev mezi aktuální a následující rozsah vrstev.\n"
+"Mezera mezi aktuálním rozsahem vrstev a dalším rozsahem vrstev\n"
+"je tenčí, než je minimální povolená výška vrstvy."
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "Nelze přepsat systémový profil."
@@ -1561,19 +1593,14 @@ msgstr "Kubická"
msgid "Current mode is %s"
msgstr "Aktuální režim je %s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "Aktuální nastavení je zděděné od"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "Aktuální nastavení je zděděno z výchozího nastavení."
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Aktuální nastavení je zděděné od:\n"
-"%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Aktuální verze:"
@@ -1873,6 +1900,18 @@ msgstr "Odznačit obdélníkovým výběrem myši"
msgid "Deselects all objects"
msgstr "Odznačit všechny objekty"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Oddělit od systémového přednastavení"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Oddělení přednastavení"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Odpojeno"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Detekovat perimetry přemostění"
@@ -2021,14 +2060,6 @@ msgstr ""
"Vyberte ANO, pokud chcete změnit tuto hodnotu na %s%%,\n"
"nebo NE, pokud jste si jisti, že %s %s je správná hodnota."
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "Chcete automaticky vybrat výchozí filamenty?"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "Chcete automaticky vybrat výchozí materiály?"
-
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "Opravdu chcete odstranit všechny uložené změny nástrojů?"
@@ -2045,6 +2076,14 @@ msgstr "Chcete to zkusit znovu"
msgid "Do you want to save your manually edited support points?"
msgstr "Chcete uložit ručně upravené podpěrné body?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "Chcete pro tyto modely FFF tiskáren vybrat výchozí filamenty?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "Chcete pro tyto modely tiskáren vybrat výchozí SLA materiály?"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "Neuspořádávat"
@@ -2061,6 +2100,10 @@ msgstr "Nevytvářet podpěry pod mosty"
msgid "Downgrade"
msgstr "Downgrade"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "Ochranný štít"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2136,6 +2179,23 @@ msgstr "Upravit značku - Pravé tlačítko myši"
msgid "Editing"
msgstr "Editace"
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "Vysunou&t SD kartu / Flash disk"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "Vysunout SD kartu / Flash disk"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "Vysunout SD kartu / Flash disk po vyexportování G-codu."
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "Vysunutí zařízení %s(%s) se nezdařilo."
+
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
msgstr "Kompenzace rozplácnutí první vrstvy"
@@ -2426,6 +2486,10 @@ msgstr "Exportovat stávající plochu jako AMF"
msgid "Export current plate as G-code"
msgstr "Exportovat stávající plochu do G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Exportovat aktuální podložku jako G-code na SD kartu / Flash disk"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "Exportovat stávající plochu jako STL"
@@ -2447,6 +2511,10 @@ msgstr "Exportovat úplné zdrojové cesty modelů a dílů do souborů 3mf a am
msgid "Export G-code"
msgstr "Exportovat G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "Exportovat G-code na SD kartu / Flash disk"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "Exportovat OBJ"
@@ -2948,10 +3016,10 @@ msgid "For support enforcers only"
msgstr "Pouze pro vynucené podpěry"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
+#: src/slic3r/GUI/Tab.cpp:3267
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"na levé straně: indikuje nesystémové (jiné než výchozí) přednastavení,\n"
"na pravé straně: indikuje, že nastavení nebylo změněno."
@@ -3368,16 +3436,6 @@ msgstr "Soubor HTTPS CA"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "Soubor HTTPS CA je volitelný. Je nutný pouze pokud použijte HTTPS certifikát s vlastním podpisem."
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"Soubor HTTPS CA:\n"
-"V tomto systému používá %s certifikáty HTTPS ze systému Certificate Store nebo Keychain. Chcete-li použít vlastní soubor CA, importujte soubor CA do Certificate Store / Keychain."
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Velikost ikon vůči výchozí velikosti"
@@ -3428,6 +3486,10 @@ msgstr "Pokud je povoleno, stáhne Slic3r na pozadí aktualizace vestavěných s
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "Pokud je tato volba povolena, bude 3D scéna vykreslena v rozlišení Retina. Pokud dochází k potížím s výkonem, zkuste tuto volbu vypnout."
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "Pokud je tato možnost povolena, bude obrys (skirt) stejně vysoký jako nejvyšší tištěný objekt. To je užitečné k ochraně modelu při tisku z ABS nebo ASA před deformací a odlepením od tiskové podložky v důsledku průvanu."
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "Pokud je tato možnost povolena, nebude čistící věž vytištěna ve vrstvách bez změny barvy. U vrstev s výměnou sjede extruder směrem dolů a vytiskne vrstvu čistící věže. Uživatel je odpovědný za to, že nedojde ke kolizi tiskové hlavy s tiskem."
@@ -3589,7 +3651,9 @@ msgstr "indikuje, že nastavení jsou stejná jako systémové (výchozí) hodno
msgid ""
"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
-msgstr "indikuje, že došlo ke změně nastavení, které není shodné s naposledy uloženým přednastavením pro aktuální skupinu nastavení. Klikněte na ikonu ŠIPKY ZPĚT pro reset všech nastavení pro aktuální skupinu nastavení na naposledy uložené přednastavení."
+msgstr ""
+"indikuje, že došlo ke změně nastavení, které není shodné s naposledy uloženým přednastavením pro aktuální skupinu nastavení.\n"
+"Klikněte na ikonu ŠIPKY ZPĚT pro reset všech nastavení pro aktuální skupinu nastavení na naposledy uložené přednastavení."
#: src/slic3r/GUI/ConfigManipulation.cpp:211
#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
@@ -4118,6 +4182,10 @@ msgstr "Maximum"
msgid "Max bridge length"
msgstr "Maximální délka mostu"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Max počet mostů na sloupu"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "Maximální vzdálenost pro sloučení"
@@ -4286,6 +4354,10 @@ msgstr "Maximální ryv Y"
msgid "Maximum jerk Z"
msgstr "Maximální ryv Z"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "Maximální počet mostů, které mohou být umístěny na podpěrný sloup. Mosty drží hroty podpěr a připojují se ke sloupům jako malé větve."
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "Maximální povolený objem průtoku pro tento filament. Omezuje maximální rychlost průtoku pro tisk až na minimální rychlost průtoku pro tisk a filament. Zadejte nulu pro nastavení bez omezení."
@@ -4584,6 +4656,10 @@ msgstr "Oprava modelu byla dokončena"
msgid "Model repaired successfully"
msgstr "Model byl úspěšně opraven"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Úpravy aktuálního profilu budou uloženy."
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "upraveno"
@@ -4957,6 +5033,11 @@ msgstr "současného Objektu"
msgid "Offset"
msgstr "Odsazení"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "V tomto systému používá %s certifikáty HTTPS ze systému Certificate Store nebo Keychain."
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Zobrazení po jedné vrstvě"
@@ -5377,10 +5458,10 @@ msgstr "Přednastavení (%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "Přednastavení s názvem \"%1%\" již existuje."
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Kopie"
+msgid "Copy"
+msgstr "Kopie"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5899,9 +5980,9 @@ msgstr "Odebrat označené body"
msgid "Remove the selected object"
msgstr "Odstranit vybraný objekt"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Odstranit uživatelské profily - čistá instalace (nejprve bude provedena záloha)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "Odstranit uživatelské profily (předtím bude proveden snapshot)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -6423,8 +6504,8 @@ msgstr "Vyberte typ podpěr, které potřebujete"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
"Vyberte ANO, pokud chcete odstranit všechny uložené změny nástroje,\n"
"NE, pokud chcete, aby se všechny změny nástroje přepnout na změny barev,\n"
@@ -7569,7 +7650,7 @@ msgstr "Textura"
#: src/slic3r/GUI/ConfigManipulation.cpp:208
msgid "The %1% infill pattern is not supposed to work at 100%% density."
-msgstr "Vzor výplně %1% není určen pro 100 %% hustotu výplně."
+msgstr "Vzor výplně %1% není určen pro 100%% hustotu výplně."
#: src/slic3r/GUI/FirmwareDialog.cpp:548
#, c-format
@@ -7583,6 +7664,10 @@ msgid ""
"If the device is connected, please press the Reset button next to the USB connector ..."
msgstr "Zařízení %s nebylo nalezeno. Pokud je zařízení připojeno, stiskněte tlačítko Reset vedle USB konektoru ..."
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "Aktuální vlastní přednastavení bude odděleno od rodičovského systémového přednastavení."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
msgid ""
"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
@@ -7643,6 +7728,14 @@ msgstr "První vrstva bude v rovině XY zmenšena nakonfigurovanou hodnotou, kte
msgid "the following characters are not allowed:"
msgstr "následující znaky nejsou povolené:"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "Následující modely FFF tiskáren nemají vybraný filament:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "Následující modely SLA tiskáren nemají vybrané žádné materiály:"
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "následující přípona není povolená:"
@@ -7737,9 +7830,13 @@ msgstr "Vybraný objekt nemůže být rozdělen, protože obsahuje více než je
msgid "The selected object couldn't be split because it contains only one part."
msgstr "Vybraný objekt nemůže být rozdělen, protože obsahuje pouze jednu část."
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "Vybraný projekt již není dostupný"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
+msgstr ""
+"Vybraný projekt již není k dispozici.\n"
+"Chcete ho odstranit ze seznamu posledních projektů?"
#: src/slic3r/GUI/DoubleSlider.cpp:998
msgid ""
@@ -7916,6 +8013,14 @@ msgstr ""
msgid "This %s version: %s"
msgstr "Tento %s verze: %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+"Tato akce je nevratná.\n"
+"Chcete pokračovat?"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "Tento kód je vložen mezi objekty, pokud je použit sekvenční tisk. Ve výchozím nastavení je resetován extruder a tisková podložka pomocí non-wait (nečekacím) příkazem; nicméně pokud jsou příkazy M104, M109, 140 nebo M190 detekovány v tomto vlastním kódu, Slic3r nebude přidávat teplotní příkazy. Můžete přidávat zástupné proměnné pro veškeré nastavení Slic3ru, takže můžete vložit příkaz “M109 S[first_layer_temperature]” kamkoliv chcete."
@@ -8084,7 +8189,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "Nejmenší tisknutelná výška vrstvy pro tento extruder. Omezuje rozlišení pro výšku proměnné vrstvy. Typické hodnoty jsou mezi 0,05 mm a 0,1 mm."
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "To je obvykle způsobeno zanedbatelně malým množstvím extrudovaného materiálu nebo chybným modelem. Zkuste model opravit nebo změnit jeho orientaci na podložce."
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8228,6 +8333,10 @@ msgstr "Na objekty"
msgid "To parts"
msgstr "Na části"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Chcete-li použít vlastní soubor CA, importujte soubor CA do Certificate Store / Keychain."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
#, c-format
msgid "Toggle %c axis mirroring"
@@ -8982,14 +9091,6 @@ msgstr "Nelze načíst SLA projekt s objektem na podložce, který je složený
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "Nemůžete použít nestejnoměrnou změnu měřítka pro více vybraných objektů/částí"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "Pro vybrané tiskárny musíte vybrat alespoň jeden filament"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "Pro vybrané tiskárny musíte vybrat alespoň jeden materiál"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "Možná budete muset aktualizovat ovladač grafické karty."
diff --git a/resources/localization/de/PrusaSlicer.mo b/resources/localization/de/PrusaSlicer.mo
index fe2a2a42d5..7a3021c301 100644
Binary files a/resources/localization/de/PrusaSlicer.mo and b/resources/localization/de/PrusaSlicer.mo differ
diff --git a/resources/localization/de/PrusaSlicer_de.po b/resources/localization/de/PrusaSlicer_de.po
index e404fed5c0..e926a61459 100644
--- a/resources/localization/de/PrusaSlicer_de.po
+++ b/resources/localization/de/PrusaSlicer_de.po
@@ -5,7 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
@@ -337,6 +337,10 @@ msgstr "Ein boolescher Ausdruck, der die Konfigurationswerte eines aktiven Druck
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "Ein boolescher Ausdruck, der die Konfigurationswerte eines aktiven Druckerprofils verwendet. Wenn dieser Ausdruck als wahr bewertet wird, wird dieses Profil als kompatibel mit dem aktiven Druckerprofil angesehen."
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "Es wird eine Kopie der aktuellen Systemvoreinstellung erstellt, die von der Systemvoreinstellung gelöst wird."
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "Ein Daumenwert ist 160 bis 230 °C für PLA, und 215 bis 250 °C für ABS."
@@ -1084,6 +1088,32 @@ msgstr "Abbrechen..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "Kann die Extrusionsbreite für %1% nicht berechnen: Variable \"%2%\" nicht zugänglich."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"Current layer range overlaps with the next layer range."
+msgstr ""
+"Es kann kein neuer Schichtenbereich nach dem aktuellen Schichtenbereich eingefügt werden.\n"
+"Der aktuelle Schichtenbereich überschneidet sich mit dem nächsten Schichtenbereich."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"The next layer range is too thin to be split to two\n"
+"without violating the minimum layer height."
+msgstr ""
+"Es kann kein neuer Schichtenbereich nach dem aktuellen Schichtenbereich eingefügt werden.\n"
+"Der nächste Schichtenbereich ist zu schmal, um auf zwei Schichten aufgeteilt zu werden ohne die Mindestschichthöhe zu verletzen."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid ""
+"Cannot insert a new layer range between the current and the next layer range.\n"
+"The gap between the current layer range and the next layer range\n"
+"is thinner than the minimum layer height allowed."
+msgstr ""
+"Es kann kein neuer Schichtenbereich zwischen dem aktuellen und dem nächsten Schichtenbereich eingefügt werden.\n"
+"Die Lücke zwischen dem aktuellen und dem nächsten Schichtenbereich ist ist schmaler als die minimal zulässige Schichthöhe."
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "Systemprofil kann nicht überschrieben werden."
@@ -1557,19 +1587,14 @@ msgstr "Kubisch"
msgid "Current mode is %s"
msgstr "Aktueller Modus ist %s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "Aktuelle Voreinstellung ist abgeleitet von"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "Aktuelle Voreinstellung ist abgeleitet von der Standardvoreinstellung."
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Aktuelle Voreinstellung ist abgeleitet von:\n"
-"%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Aktuelle Version:"
@@ -1869,6 +1894,18 @@ msgstr "Abwahl über Rechteck"
msgid "Deselects all objects"
msgstr "Alle Objekte abwählen"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Lösen von der Systemvoreinstellung"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Lösen der Voreinstellugen"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Losgelöst"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Umfangbrücken entdecken"
@@ -2017,14 +2054,6 @@ msgstr ""
"Wählen Sie JA, wenn Sie diesen Wert auf %s%% ändern möchten, \n"
"oder NEIN, wenn Sie sicher sind, dass %s %s ein korrekter Wert ist."
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "Möchten Sie die Standardfilamente automatisch auswählen?"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "Möchten Sie automatisch Standardmaterialien auswählen?"
-
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "Möchten Sie alle gespeicherten Werkzeugänderungen löschen?"
@@ -2041,6 +2070,14 @@ msgstr "Möchten Sie es erneut versuchen"
msgid "Do you want to save your manually edited support points?"
msgstr "Möchten Sie Ihre manuell bearbeiteten Stützpunkte speichern?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "Möchten Sie Standardfilamente für diese FFF-Druckermodelle auswählen?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "Möchten Sie Standard-SLA-Materialien für diese Druckermodelle auswählen?"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "Nicht Anordnen"
@@ -2057,6 +2094,10 @@ msgstr "Brücken nicht unterstützen"
msgid "Downgrade"
msgstr "Downgrade"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "Windschutz"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2132,6 +2173,23 @@ msgstr "Häkchen bearbeiten - Rechtsklick"
msgid "Editing"
msgstr "Bearbeitung"
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "SD-Kar&te/Flash-Laufwerk auswerfen"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "SD-Karte/Flash-Laufwerk auswerfen"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "SD-Karte / Flash-Laufwerk auswerfen, nachdem der G-Code dorthin exportiert wurde."
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "Das Auswerfen von Gerät %s(%s) ist fehlgeschlagen."
+
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
msgstr "Elefantenfußkompensation"
@@ -2422,6 +2480,10 @@ msgstr "Exportiere die aktuelle Plattenbelegung als AMF"
msgid "Export current plate as G-code"
msgstr "Exportiere die aktuelle Plattenbelegung als G-Code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Aktuelle Druckplatte als G-Code auf SD-Karte/Flash-Laufwerk exportieren"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "Exportiere die aktuelle Plattenbelegung als STL"
@@ -2443,6 +2505,10 @@ msgstr "Exportieren Sie die vollständigen Pfadnamen der Modelle und Teilequelle
msgid "Export G-code"
msgstr "Export G-Code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "G-Code auf SD-Karte/Flash-Laufwerk exportieren"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "Exportiere OBJ"
@@ -2944,10 +3010,10 @@ msgid "For support enforcers only"
msgstr "Nur für Stützverstärker"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
+#: src/slic3r/GUI/Tab.cpp:3267
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"Beim linken Knopf: zeigt eine Nicht-System- (oder Nicht-Standard-) Einstellung an.\n"
"Beim rechten Knopf: zeigt an, dass die Einstellung nicht geändert wurde."
@@ -3360,16 +3426,6 @@ msgstr "HTTPS CA Datei"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "HTTPS-CA-Datei ist optional. Sie wird nur benötigt, wenn Sie HTTPS mit einem selbstsignierten Zertifikat verwenden."
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"HTTPS CA-Datei:\n"
-"Auf diesem System verwendet %s HTTPS-Zertifikate aus dem System Zertifikatsspeicher oder Schlüsselbund. Um eine benutzerdefinierte CA-Datei zu verwenden, importieren Sie bitte Ihre CA-Datei in den Zertifikatsspeicher / Schlüsselbund."
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Symbolgröße in Bezug auf die Standardgröße"
@@ -3420,6 +3476,10 @@ msgstr "Wenn aktiviert, lädt Slic3r Updates der eingebauten Systemvoreinstellun
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "Wenn aktiviert, wird die 3D-Szene in Retina-Auflösung gerendert. Wenn Sie Probleme mit der 3D-Leistung haben, kann es hilfreich sein, diese Option zu deaktivieren."
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "Wenn diese Option aktiviert ist, wird die Schürze so hoch wie das höchste gedruckte Objekt sein. Dies ist nützlich, um einen ABS- oder ASA-Druck vor dem Verziehen und Ablösen vom Druckbett aufgrund von Zugluft zu schützen."
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "Wenn aktiviert, wird der Reinigungsturm nicht auf Schichten ohne Werkzeugwechsel gedruckt. Bei Schichten mit Werkzeugwechsel fährt der Extruder nach unten, um den Reinigungsturm zu drucken. Der Benutzer ist dafür verantwortlich, dass es nicht zu einer Kollision mit dem Druck kommt."
@@ -3582,7 +3642,7 @@ msgid ""
"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
msgstr ""
-"zeigt an, dass die Einstellungen geändert wurden und nicht mit dem zuletzt gespeicherten Preset für die aktuelle Optionsgruppe übereinstimmen. \n"
+"zeigt an, dass die Einstellungen geändert wurden und nicht mit dem zuletzt gespeicherten Preset für die aktuelle Optionsgruppe übereinstimmen.\n"
"Klicken Sie auf das Symbol PFEIL ZURÜCK, um alle Einstellungen für die aktuelle Optionsgruppe auf das zuletzt gespeicherte Preset zurückzusetzen."
#: src/slic3r/GUI/ConfigManipulation.cpp:211
@@ -4112,6 +4172,10 @@ msgstr "Max"
msgid "Max bridge length"
msgstr "Max Überbrückungslänge"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Max Brücken auf einem Pfeiler"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "Maximaler Zusammenfügeabstand"
@@ -4280,6 +4344,10 @@ msgstr "Maximaler Ruck Y"
msgid "Maximum jerk Z"
msgstr "Maximaler Ruck Z"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "Maximale Anzahl von Brücken, die auf einen Pfeiler gesetzt werden können. Brücken halten Stützpunkt-Nadelköpfe und verbinden sich als kleine Äste mit den Pfeilern."
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "Maximale volumetrische Geschwindigkeit, die für dieses Filament zulässig ist. Begrenzt die maximale volumetrische Geschwindigkeit eines Drucks auf das Minimum von Druck- und Filament-Volumengeschwindigkeit. Wird auf null gesetzt, wenn es keine Begrenzung gibt."
@@ -4578,6 +4646,10 @@ msgstr "Modellreparatur beendet"
msgid "Model repaired successfully"
msgstr "Modellreparatur erfolgreich"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Änderungen am aktuellen Profil werden gespeichert."
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "geändert"
@@ -4951,6 +5023,11 @@ msgstr "des aktuellen Objekts"
msgid "Offset"
msgstr "Offset"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "Auf diesem System verwendet %s HTTPS-Zertifikate aus dem System Zertifikatsspeicher oder Schlüsselbund."
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Eine Schicht Modus"
@@ -5371,10 +5448,10 @@ msgstr "Voreinstellung (%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "Eine Voreinstellung mit dem Namen \"%1%\" existiert bereits."
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Kopieren"
+msgid "Copy"
+msgstr "Kopieren"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5892,9 +5969,9 @@ msgstr "Ausgewählte Punkte entfernen"
msgid "Remove the selected object"
msgstr "Ausgewähltes Objekt entfernen"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Benutzerprofile entfernen - von Grund auf neu installieren (eine Momentaufnahme wird vorab erstellt)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "Benutzerprofile entfernen (eine Momentaufnahme wird vorab erstellt)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -6414,8 +6491,8 @@ msgstr "Wählen Sie aus, welche Art von Unterstützung Sie benötigen"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
"Wählen Sie JA, wenn Sie alle gespeicherten Werkzeugänderungen löschen möchten, \n"
"NEIN, wenn Sie möchten, dass alle Werkzeugänderungen auf Farbwechsel umgestellt werden, \n"
@@ -7576,6 +7653,10 @@ msgstr ""
"Das %s-Gerät wurde nicht gefunden.\n"
"Wenn das Gerät angeschlossen ist, drücken Sie bitte die Reset-Taste neben dem USB-Anschluss...."
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "Die aktuelle benutzerdefinierte Voreinstellung wird von der Voreinstellung des übergeordneten Systems gelöst."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
msgid ""
"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
@@ -7639,6 +7720,14 @@ msgstr "Die erste Schicht wird in der XY-Ebene um den vorgegebenen Wert verklein
msgid "the following characters are not allowed:"
msgstr "die folgenden Zeichen sind nicht erlaubt:"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "Bei den folgenden FFF-Druckermodellen wurde kein Filament ausgewählt:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "Bei den folgenden SLA-Druckermodellen wurden keine Materialien ausgewählt:"
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "das folgenden Suffix ist nicht erlaubt:"
@@ -7733,9 +7822,13 @@ msgstr "Das ausgewählte Objekt konnte nicht getrennt werden, weil es aus mehr a
msgid "The selected object couldn't be split because it contains only one part."
msgstr "Das ausgewählte Objekt konnte nicht getrennt werden, da es nur aus einem Teil besteht."
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "Das ausgewählte Projekt ist nicht mehr verfügbar"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
+msgstr ""
+"Das ausgewählte Projekt ist nicht mehr verfügbar.\n"
+"Wollen Sie es aus der Liste der letzten Projekte entfernen?"
#: src/slic3r/GUI/DoubleSlider.cpp:998
msgid ""
@@ -7908,6 +8001,14 @@ msgstr ""
msgid "This %s version: %s"
msgstr "Diese %s Version: %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+"Diese Aktion ist nicht umkehrbar.\n"
+"Wollen Sie fortfahren?"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "Dieser Code wird beim sequentiellen Drucken zwischen Objekten eingefügt. Standardmäßig werden Extruder- und Betttemperatur mit dem Befehl, der nicht auf die Änderung wartet, zurückgesetzt. Wenn jedoch M104, M109, M140 oder M190 in diesem benutzerdefinierten Code erkannt werden, fügt Slic3r keine Temperaturbefehle hinzu. Beachten Sie, dass Sie Platzhaltervariablen für alle PrusaSlicer-Einstellungen verwenden können, so dass Sie einen \"M109 S[first_layer_temperature]\"-Befehl an beliebiger Stelle platzieren können."
@@ -8074,7 +8175,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "Dies ist die niedrigste druckbare Schichthöhe für diesen Extruder und begrenzt die Auflösung bei variabler Schichthöhe. Typische Werte liegen zwischen 0,05 mm und 0,1 mm."
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "Dies wird in der Regel durch vernachlässigbar kleine Extrusionen oder durch ein fehlerhaftes Modell verursacht. Versuchen Sie, das Modell zu reparieren oder seine Ausrichtung auf dem Druckbett zu ändern."
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8218,6 +8319,10 @@ msgstr "Zu Objekten"
msgid "To parts"
msgstr "Zu Teilen"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Um eine benutzerdefinierte CA-Datei zu verwenden, importieren Sie bitte Ihre CA-Datei in den Zertifikatsspeicher / Schlüsselbund."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
#, c-format
msgid "Toggle %c axis mirroring"
@@ -8973,14 +9078,6 @@ msgstr "Sie können kein SLA-Projekt mit einem mehrteiligen Objekt auf das Druck
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "Sie können den nichtgleichmäßigen Skalierungsmodus nicht für mehrere Objekte/Teileauswahlen verwenden"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "Sie müssen mindestens ein Filament für die ausgewählten Drucker auswählen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "Sie müssen mindestens ein Material für die ausgewählten Drucker auswählen"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "Möglicherweise müssen Sie Ihren Grafikkartentreiber aktualisieren."
diff --git a/resources/localization/en/PrusaSlicer.mo b/resources/localization/en/PrusaSlicer.mo
new file mode 100644
index 0000000000..423ec166fc
Binary files /dev/null and b/resources/localization/en/PrusaSlicer.mo differ
diff --git a/resources/localization/en/PrusaSlicer_en.po b/resources/localization/en/PrusaSlicer_en.po
new file mode 100644
index 0000000000..909c52319f
--- /dev/null
+++ b/resources/localization/en/PrusaSlicer_en.po
@@ -0,0 +1,155 @@
+msgid ""
+msgstr ""
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 2.3\n"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:71
+msgid "Don't notify about new releases any more"
+msgstr "Don't notify about new releases anymore"
+
+#: src/libslic3r/PrintConfig.cpp:287
+msgid "A boolean expression using the configuration values of an active print profile. If this expression evaluates to true, this profile is considered compatible with the active print profile."
+msgstr "A Boolean expression using the configuration values of an active print profile. If this expression evaluates to true, this profile is considered compatible with the active print profile."
+
+#: src/libslic3r/PrintConfig.cpp:272
+msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
+msgstr "A Boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
+
+#: src/libslic3r/PrintConfig.cpp:409
+msgid "Add solid infill near sloping surfaces to guarantee the vertical shell thickness (top+bottom solid layers)."
+msgstr "Add solid infill near sloping surfaces to guarantee the vertical shell thickness (top + bottom solid layers)."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:791
+msgid "Additionally a backup snapshot of the whole configuration is created before an update is applied."
+msgstr "Additionally, a backup snapshot of the whole configuration is created before an update is applied."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1268
+msgid "Autogeneration will erase all manually edited points."
+msgstr "Auto Generation will erase all manually edited points."
+
+#: src/slic3r/GUI/Tab.cpp:1171
+msgid "Autospeed (advanced)"
+msgstr "Auto Speed (advanced)"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
+msgid "Before roll back"
+msgstr "Before rollback"
+
+#: src/slic3r/GUI/ButtonsDescription.cpp:16
+msgid "Buttons And Text Colors Description"
+msgstr "Buttons and Text Colors Description"
+
+#: src/libslic3r/PrintConfig.cpp:791
+msgid "Density of internal infill, expressed in the range 0% - 100%."
+msgstr "Density of internal infill, expressed in the range 0 % - 100 %."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:773
+#, c-format
+msgid "If enabled, %s checks for new application versions online. When a new version becomes available, a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done."
+msgstr "If enabled, %s checks for new application versions online. When a new version becomes available, a notification is displayed at the next application startup (never during program usage). This is only a notification mechanism, no automatic installation is done."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:783
+#, c-format
+msgid "If enabled, %s downloads updates of built-in system presets in the background.These updates are downloaded into a separate temporary location.When a new preset version becomes available it is offered at application startup."
+msgstr "If enabled, %s downloads updates of built-in system presets in the background. These updates are downloaded into a separate temporary location. When a new preset version becomes available it is offered at application startup."
+
+#: src/slic3r/GUI/Preferences.cpp:66
+msgid "If enabled, PrusaSlicer will check for the new versions of itself online. When a new version becomes available a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done."
+msgstr "If enabled, PrusaSlicer will check for the new versions of itself online. When a new version becomes available a notification is displayed at the next application startup (never during program usage). This is only a notification mechanism, no automatic installation is done."
+
+#: src/libslic3r/PrintConfig.cpp:1858
+msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
+msgstr "If enabled, the wipe tower will not be printed on layers with no tool changes. On layers with a tool change, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
+
+#: src/libslic3r/PrintConfig.cpp:2262
+msgid "Object will be used to purge the nozzle after a toolchange to save material that would otherwise end up in the wipe tower and decrease print time. Colours of the objects will be mixed as a result."
+msgstr "Object will be used to purge the nozzle after a tool change to save material that would otherwise end up in the wipe tower and decrease print time. Colours of the objects will be mixed as a result."
+
+#: src/libslic3r/Print.cpp:1365
+msgid "One or more object were assigned an extruder that the printer does not have."
+msgstr "One or more objects were assigned an extruder that the printer does not have."
+
+#: src/libslic3r/PrintConfig.cpp:2254
+msgid "Purging after toolchange will done inside this object's infills. This lowers the amount of waste but may result in longer print time due to additional travel moves."
+msgstr "Purging after tool change will done inside this object's infills. This lowers the amount of waste but may result in longer print time due to additional travel moves."
+
+#: src/libslic3r/PrintConfig.cpp:1552
+msgid "Retraction Length (Toolchange)"
+msgstr "Retraction Length (Tool change)"
+
+#: src/libslic3r/PrintConfig.cpp:556
+msgid "Set this to a non-zero value to allow a manual extrusion width. If left to zero, Slic3r derives extrusion widths from the nozzle diameter (see the tooltips for perimeter extrusion width, infill extrusion width etc). If expressed as percentage (for example: 230%), it will be computed over layer height."
+msgstr "Set this to a non-zero value to allow a manual extrusion width. If left to zero, Slic3r derives extrusion widths from the nozzle diameter (see the tooltips for perimeter extrusion width, infill extrusion width etc.). If expressed as percentage (for example: 230%), it will be computed over layer height."
+
+#: src/libslic3r/PrintConfig.cpp:2824
+msgid "Some objects can get along with a few smaller pads instead of a single big one. This parameter defines how far the center of two smaller pads should be. If theyare closer, they will get merged into one pad."
+msgstr "Some objects can get along with a few smaller pads instead of a single big one. This parameter defines how far the center of two smaller pads should be. If they are closer, they will get merged into one pad."
+
+#: src/libslic3r/PrintConfig.cpp:624
+msgid "Speed used for unloading the filament on the wipe tower (does not affect initial part of unloading just after ramming)."
+msgstr "Speed used for unloading the filament on the wipe tower (does not affect initial part of unloading just after ramming)."
+
+#: src/libslic3r/PrintConfig.cpp:2044
+msgid "Support material will not be generated for overhangs whose slope angle (90° = vertical) is above the given threshold. In other words, this value represent the most horizontal slope (measured from the horizontal plane) that you can print without support material. Set to zero for automatic detection (recommended)."
+msgstr "Support material will not be generated for overhangs whose slope angle (90° = vertical) is above the given threshold. In other words, this value represents the most horizontal slope (measured from the horizontal plane) that you can print without support material. Set to zero for automatic detection (recommended)."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:998
+msgid ""
+"The sequential print is on.\n"
+"It's impossible to apply any custom G-code for objects printing sequentually.\n"
+"This code won't be processed during G-code generation."
+msgstr ""
+"The sequential print is on.\n"
+"It's impossible to apply any custom G-code for objects printing sequentially.\n"
+"This code won't be processed during G-code generation."
+
+#: src/libslic3r/PrintConfig.cpp:2094
+msgid "This custom code is inserted before every toolchange. Placeholder variables for all PrusaSlicer settings as well as {previous_extruder} and {next_extruder} can be used. When a tool-changing command which changes to the correct extruder is included (such as T{next_extruder}), PrusaSlicer will emit no other such command. It is therefore possible to script custom behaviour both before and after the toolchange."
+msgstr "This custom code is inserted before every tool change. Placeholder variables for all PrusaSlicer settings as well as {previous_extruder} and {next_extruder} can be used. When a tool-changing command which changes to the correct extruder is included (such as T{next_extruder}), PrusaSlicer will emit no other such command. It is therefore possible to script custom behaviour both before and after the tool change."
+
+#: src/libslic3r/PrintConfig.cpp:396
+msgid "This end procedure is inserted at the end of the output file, before the printer end gcode (and before any toolchange from this filament in case of multimaterial printers). Note that you can use placeholder variables for all PrusaSlicer settings. If you have multiple extruders, the gcode is processed in extruder order."
+msgstr "This end procedure is inserted at the end of the output file, before the printer end gcode (and before any tool change from this filament in case of multimaterial printers). Note that you can use placeholder variables for all PrusaSlicer settings. If you have multiple extruders, the gcode is processed in extruder order."
+
+#: src/libslic3r/PrintConfig.cpp:2215
+msgid "This matrix describes volumes (in cubic milimetres) required to purge the new filament on the wipe tower for any given pair of tools."
+msgstr "This matrix describes volumes (in cubic millimetres) required to purge the new filament on the wipe tower for any given pair of tools."
+
+#: src/libslic3r/PrintConfig.cpp:1829
+msgid "This start procedure is inserted at the beginning, after any printer start gcode (and after any toolchange to this filament in case of multi-material printers). This is used to override settings for a specific filament. If PrusaSlicer detects M104, M109, M140 or M190 in your custom codes, such commands will not be prepended automatically so you're free to customize the order of heating commands and other custom actions. Note that you can use placeholder variables for all PrusaSlicer settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want. If you have multiple extruders, the gcode is processed in extruder order."
+msgstr "This start procedure is inserted at the beginning, after any printer start gcode (and after any tool change to this filament in case of multi-material printers). This is used to override settings for a specific filament. If PrusaSlicer detects M104, M109, M140 or M190 in your custom codes, such commands will not be prepended automatically so you're free to customize the order of heating commands and other custom actions. Note that you can use placeholder variables for all PrusaSlicer settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want. If you have multiple extruders, the gcode is processed in extruder order."
+
+#: src/libslic3r/PrintConfig.cpp:641
+msgid "Time to wait after the filament is unloaded. May help to get reliable toolchanges with flexible materials that may need more time to shrink to original dimensions."
+msgstr "Time to wait after the filament is unloaded. May help to get reliable tool changes with flexible materials that may need more time to shrink to original dimensions."
+
+#: src/slic3r/GUI/Tab.cpp:1491
+msgid "Toolchange parameters with single extruder MM printers"
+msgstr "Toolchange parameters with single extruder MM printers"
+
+#: src/slic3r/Utils/Duet.cpp:82 src/slic3r/Utils/Duet.cpp:137
+#: src/slic3r/Utils/FlashAir.cpp:119 src/slic3r/Utils/FlashAir.cpp:140
+#: src/slic3r/Utils/FlashAir.cpp:156
+msgid "Unknown error occured"
+msgstr "Unknown error occurred"
+
+#: src/libslic3r/PrintConfig.cpp:253
+msgid "When printing multi-material objects, this settings will make Slic3r to clip the overlapping object parts one by the other (2nd part will be clipped by the 1st, 3rd part will be clipped by the 1st and 2nd etc)."
+msgstr "When printing multi-material objects, this settings will make Slic3r to clip the overlapping object parts one by the other (2nd part will be clipped by the 1st, 3rd part will be clipped by the 1st and 2nd etc.)."
+
+#: src/libslic3r/PrintConfig.cpp:1391
+msgid "When set to zero, the distance the filament is moved from parking position during load is exactly the same as it was moved back during unload. When positive, it is loaded further, if negative, the loading move is shorter than unloading."
+msgstr "When set to zero, the distance the filament is moved from parking position during load is exactly the same as it was moved back during unload. When positive, it is loaded further, if negative, the loading move is shorter than unloading."
+
+#: src/slic3r/GUI/Tab.cpp:3285
+msgid "WHITE BULLET icon indicates a non system (or non default) preset."
+msgstr "WHITE BULLET icon indicates a non-system (or non-default) preset."
diff --git a/resources/localization/es/PrusaSlicer.mo b/resources/localization/es/PrusaSlicer.mo
index 6f8e14bead..0da47d5b62 100644
Binary files a/resources/localization/es/PrusaSlicer.mo and b/resources/localization/es/PrusaSlicer.mo differ
diff --git a/resources/localization/es/PrusaSlicer_es.po b/resources/localization/es/PrusaSlicer_es.po
index 367d779c02..0e69f373c4 100644
--- a/resources/localization/es/PrusaSlicer_es.po
+++ b/resources/localization/es/PrusaSlicer_es.po
@@ -5,7 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.3\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
@@ -337,6 +337,10 @@ msgstr "Una expresión booleana que utiliza los valores de configuración de un
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "Una expresión booleana utilizando valores de configuración de un perfil existente. Si esta expresión es verdadera, el perfil será considerado compatible con el perfil de impresión activo."
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "Se creará una copia del preajuste del sistema actual, que se separará del preajuste del sistema."
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "Una buena aproximación es de 160 a 230 °C para PLA y de 215 a 250 °C para ABS."
@@ -1088,6 +1092,34 @@ msgstr "Cancelando..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "No se puede calcular el ancho de extrusión para %1%: Variable \"%2%\" no accesible."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"Current layer range overlaps with the next layer range."
+msgstr ""
+"No se puede insertar un nuevo rango de capas después del rango de capa actual.\n"
+"El rango de capa actual se superpone con el siguiente rango de capa."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"The next layer range is too thin to be split to two\n"
+"without violating the minimum layer height."
+msgstr ""
+"No se puede insertar un nuevo rango de capas después del rango de capa actual.\n"
+"El siguiente rango de capa es demasiado delgado para dividirse en dos\n"
+"sin violar la altura mínima de la capa."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid ""
+"Cannot insert a new layer range between the current and the next layer range.\n"
+"The gap between the current layer range and the next layer range\n"
+"is thinner than the minimum layer height allowed."
+msgstr ""
+"No se puede insertar un nuevo rango de capas entre el rango de capa actual y el siguiente.\n"
+"La brecha entre el rango de capa actual y el siguiente rango de capa\n"
+"es más delgada que la altura mínima de capa permitida."
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "No se puede sobre-escribir un perfil del sistema."
@@ -1561,19 +1593,14 @@ msgstr "Cúbico"
msgid "Current mode is %s"
msgstr "El modo actual es %s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "El preajuste fue heredado de"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "El preajuste fue heredado del preajuste predeterminado."
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"El preajuste fue heredado de:\n"
-"%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Versión actual:"
@@ -1873,6 +1900,18 @@ msgstr "Deseleccionar mediante rectángulo"
msgid "Deselects all objects"
msgstr "Deseleccionar todos los objetos"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Separar del preajuste del sistema"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Separar preajuste"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Separado"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Detectar perímetros con puentes"
@@ -2021,14 +2060,6 @@ msgstr ""
"Escoge SI si deseas cambiar este valor a %s%%,\n"
"o NO si estás seguro que %s %s es el valor correcto."
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "¿Deseas seleccionar automáticamente filamentos predeterminados?"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "¿Deseas seleccionar automáticamente materiales predeterminados?"
-
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "¿Desea eliminar todos los cambios de herramienta guardados?"
@@ -2045,6 +2076,14 @@ msgstr "Quieres volver a intentarlo"
msgid "Do you want to save your manually edited support points?"
msgstr "¿Deseas guardar tus puntos de soporte editados manualmente?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "¿Desea seleccionar filamentos predeterminados para estos modelos de impresoras FFF?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "¿Desea seleccionar materiales SLA predeterminados para estos modelos de impresora?"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "No organizar"
@@ -2061,6 +2100,10 @@ msgstr "No soportar puentes"
msgid "Downgrade"
msgstr "Volver a una versión anterior"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "Escudo de protección"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2136,6 +2179,23 @@ msgstr "Editar marca de verificación - Clic derecho"
msgid "Editing"
msgstr "Edición"
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "Expul&sa tarjeta SD / disco USB"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "Expulsa la tarjeta SD / disco USB"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "Expulsa la tarjeta SD / disco USB después de que se haya exportado a él."
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "La expulsión del dispositivo %s(%s) ha fallado."
+
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
msgstr "Compensación del pie de elefante"
@@ -2426,6 +2486,10 @@ msgstr "Exportar plataforma actual como AMF"
msgid "Export current plate as G-code"
msgstr "Exportar plataforma actual como código G"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Exporta a G-code en la tarjeta SD / disco USB"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "Exportar plataforma actual como STL"
@@ -2447,6 +2511,10 @@ msgstr "Exportar nombres de ruta completos de las fuentes de los modelos y de pi
msgid "Export G-code"
msgstr "Exportar código G"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "Exporta G-code a la tarjeta SD / disco USB"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "Exportar OBJ"
@@ -2948,10 +3016,10 @@ msgid "For support enforcers only"
msgstr "Sólo para modificadores de soportes"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
+#: src/slic3r/GUI/Tab.cpp:3267
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"para el botón izquierdo: indica un preajuste que no es del sistema (o no predeterminado),\n"
"para el botón derecho: indica que la configuración no se ha modificado."
@@ -3364,17 +3432,6 @@ msgstr "Archivo HTTPS CA"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "El archivo HTTPS CA es opcional. Sólo se necesita si vas a usar HTTPS con un certificado auto-firmado."
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"Archivo CA HTTPS:\n"
-"En este sistema,%s usa certificados HTTPS del almacén de certificados o llavero. \n"
-"Para usar un archivo CA personalizado, importa tu archivo CA al Almacén de Certificados/Llavero."
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Tamaño del icono respecto al tamaño original"
@@ -3425,6 +3482,10 @@ msgstr "Si está activado, Slic3r descargará actualizaciones de los ajustes del
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "Si está activado, la escena 3D se mostrará en resolución Retina. Si tienes problemas de prestaciones 3D, desactivar esta opción te puede ayudar."
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "Si está habilitado, la falda será tan alta como un objeto impreso más alto. Esto es útil para proteger una impresión ABS o ASA de la deformación y la separación de la cama de impresión debido al viento."
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "Si está habilitado, laTorre de Limpieza no se imprimirá en capas sin cambios de herramientas. En capas con cambio de herramienta, el extrusor viajará hacia abajo para imprimir la torre de limpieza. El usuario es responsable de garantizar que no haya colisión con la impresión."
@@ -3586,7 +3647,9 @@ msgstr "indica que los ajustes son los mismos que los valores del sistema (o por
msgid ""
"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
-msgstr "indica que los ajustes cambiaron y no son iguales que los ajustes grabados la última vez para el grupo de opciones actual. Haz clic en el símbolo de FLECHA ATRÁS para resetear todos los ajustes del grupo de opciones actual a los grabados la vez anterior."
+msgstr ""
+"indica que los ajustes cambiaron y no son iguales que los ajustes grabados la última vez para el grupo de opciones actual.\n"
+"Haz clic en el símbolo de FLECHA ATRÁS para resetear todos los ajustes del grupo de opciones actual a los grabados la vez anterior."
#: src/slic3r/GUI/ConfigManipulation.cpp:211
#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
@@ -4115,6 +4178,10 @@ msgstr "Max"
msgid "Max bridge length"
msgstr "Distancia máxima de puentes"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Puentes maximos en un pilar"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "Distancia máxima de combinación"
@@ -4283,6 +4350,10 @@ msgstr "Máximo jerk Y"
msgid "Maximum jerk Z"
msgstr "Máximo jerk Z"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "Número máximo de puentes que se pueden colocar en un pilar. Los puentes sostienen cabezas de alfiler de puntos de apoyo y se conectan a los pilares como pequeñas ramas."
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "Velocidad volumétrica máxima permitida para este filamento. Limita la velocidad volumétrica máxima de una impresión al mínimo de velocidad volumétrica de impresión y filamento. Establecer en cero para usar sin límite."
@@ -4581,6 +4652,10 @@ msgstr "Reparación del modelo terminada"
msgid "Model repaired successfully"
msgstr "Modelo reparado exitosamente"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Se guardarán las modificaciones al perfil actual."
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "modificado"
@@ -4954,6 +5029,11 @@ msgstr "del Objeto actual"
msgid "Offset"
msgstr "Desplazamiento"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "En este sistema,%s usa certificados HTTPS del almacén de certificados o llavero."
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Modo de capa única"
@@ -5374,10 +5454,10 @@ msgstr "Ajuste inicial (%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "Ya existe un preset con el nombre \"% 1%\"."
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Copiar"
+msgid "Copy"
+msgstr "Copiar"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5897,9 +5977,9 @@ msgstr "Eliminar puntos seleccionados"
msgid "Remove the selected object"
msgstr "Eliminar el objeto seleccionado"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Eliminar perfiles de usuario - instalar desde cero (se realizará una instantánea con anterioridad)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "Eliminar perfiles de usuario (se tomará una instantánea de antemano)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -6421,8 +6501,8 @@ msgstr "Selecciona qué clase de soporte necesitas"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
"Escoge SI si deseas borrar todos los cambios de herramienta,\n"
"NO si deseas que los cambios de herramienta sean cambios de color,\n"
@@ -7583,6 +7663,10 @@ msgstr ""
"No se encontró el dispositivo %s. \n"
"Si el dispositivo está conectado, presione el botón Reset al lado del conector USB ..."
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "El preajuste personalizado actual se separará del preajuste del sistema principal."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
msgid ""
"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
@@ -7643,6 +7727,14 @@ msgstr "La primera capa se contraerá en el plano XY por el valor configurado pa
msgid "the following characters are not allowed:"
msgstr "los siguientes caracteres no están permitidos:"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "Los siguientes modelos de impresoras FFF no tienen filamento seleccionado:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "Los siguientes modelos de impresoras SLA no tienen filamento seleccionado:"
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "el siguiente sufijo no está permitido:"
@@ -7737,9 +7829,13 @@ msgstr "El objeto seleccionado no se puede dividir porque contiene más de un vo
msgid "The selected object couldn't be split because it contains only one part."
msgstr "El objeto seleccionado no se pudo dividir porque contiene solo una parte."
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "El proyecto seleccionado no está diponible"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
+msgstr ""
+"El proyecto seleccionado no está disponible.\n"
+"¿Desea eliminarlo de la lista de proyectos recientes?"
#: src/slic3r/GUI/DoubleSlider.cpp:998
msgid ""
@@ -7907,6 +8003,14 @@ msgstr ""
msgid "This %s version: %s"
msgstr "Esta %s versión: %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+"Esta acción no es reversible.\n"
+"¿Deseas continuar?"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "Este código se inserta entre los objetos cuando se utiliza la impresión secuencial. Por defecto, el extrusor y la temperatura de la cama se reinician utilizando un comando de no espera; sin embargo, si se detectan M104, M109, M140 o M190 en este código personalizado, Slic3r no agregará comandos de temperatura. Tenga en cuenta que puede usar variables de marcador de posición para todas las configuraciones de Slic3r, por lo que puede poner un comando \"M109 S [first_layer_temperature]\" donde lo desee."
@@ -8074,7 +8178,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "Esta es la altura más baja de la capa imprimible para este extrusor y limita la resolución para la altura de la capa variable. Los valores típicos están entre 0.05 mm y 0.1 mm."
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "Esto generalmente es causado por extrusiones insignificantemente pequeñas o por un modelo defectuoso. Intenta reparar el modelo o cambia su orientación en la cama."
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8217,6 +8321,10 @@ msgstr "A los objetos"
msgid "To parts"
msgstr "A las piezas"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Para usar un archivo CA personalizado, importa tu archivo CA al Almacén de Certificados/Llavero."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
#, c-format
msgid "Toggle %c axis mirroring"
@@ -8971,14 +9079,6 @@ msgstr "No puedes cargar un proyecto SLA con varias piezas en la base"
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "No puedes usar el modo de escala no uniforme para la selección de múltiples objetos/partes"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "Debes seleccionar al menos un filamento para las impresoras seleccionadas"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "Debes seleccionar al menos un material para las impresoras seleccionadas"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "Puede que necesites actualizar tu tarjeta de gráficos."
diff --git a/resources/localization/fr/PrusaSlicer.mo b/resources/localization/fr/PrusaSlicer.mo
index 7fd27690ee..b01197c788 100644
Binary files a/resources/localization/fr/PrusaSlicer.mo and b/resources/localization/fr/PrusaSlicer.mo differ
diff --git a/resources/localization/fr/PrusaSlicer_fr.po b/resources/localization/fr/PrusaSlicer_fr.po
index 235c6dd08d..4bed900177 100644
--- a/resources/localization/fr/PrusaSlicer_fr.po
+++ b/resources/localization/fr/PrusaSlicer_fr.po
@@ -5,7 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.3\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
@@ -337,6 +337,10 @@ msgstr "Une expression booléenne utilisant les valeurs de configuration d'un pr
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "Une expression booléenne utilisant les valeurs de configuration d'un profil d'imprimante actif. Si cette expression est évaluée comme vraie, ce profil est considéré comme compatible avec le profil d'imprimante actif."
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "Une copie du préréglage système actuel sera créé, et il sera détaché du préréglage système."
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "La règle générale est 160 à 230 °C pour le PLA et 215 à 250 °C pour l'ABS."
@@ -1088,6 +1092,32 @@ msgstr "Annulation..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "Impossible de calculer la largeur d'extrusion pour %1% : la variable \"%2%\" n'est pas accessible."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"Current layer range overlaps with the next layer range."
+msgstr ""
+"Impossible d'insérer une nouvelle zone de couche après la zone de couche actuelle.\n"
+"La zone de couche actuelle chevauche la prochaine zone de couche."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"The next layer range is too thin to be split to two\n"
+"without violating the minimum layer height."
+msgstr ""
+"Impossible d'insérer une nouvelle zone de couche après la zone de couche actuelle.\n"
+"La zone de couche suivante est trop fine pour être séparée en deux sans enfreindre la hauteur de couche minimum."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid ""
+"Cannot insert a new layer range between the current and the next layer range.\n"
+"The gap between the current layer range and the next layer range\n"
+"is thinner than the minimum layer height allowed."
+msgstr ""
+"Impossible d'insérer une nouvelle zone de couche entre l'actuelle et la prochaine.\n"
+"L'espace entre la zone de couche actuelle et la prochaine est inférieur à la hauteur de couche minimum autorisée."
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "Impossible d'écraser un profil système."
@@ -1561,19 +1591,14 @@ msgstr "Cubique"
msgid "Current mode is %s"
msgstr "Le mode actuel est %s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "Le préréglage actuel est hérité de"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "Le préréglage actuel est hérité du préréglage par défaut."
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Le préréglage actuel est hérité de :\n"
-"%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Version actuelle :"
@@ -1873,6 +1898,18 @@ msgstr "Désélectionner par rectangle"
msgid "Deselects all objects"
msgstr "Désélectionner tous les objets"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Détacher du préréglage système"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Détacher le préréglage"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Détaché"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Détecter les périmètres faisant des ponts"
@@ -2021,14 +2058,6 @@ msgstr ""
"Sélectionnez OUI si vous voulez changer cette valeur pour %s%%,\n"
"ou NON si vous êtes certain que %s%s est une valeur correcte."
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "Voulez-vous sélectionner automatiquement les filaments par défaut ?"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "Voulez-vous sélectionner automatiquement les matériaux par défaut ?"
-
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "Voulez-vous supprimer tous les changements d'outils enregistrés ?"
@@ -2045,6 +2074,14 @@ msgstr "Voulez-vous réessayer"
msgid "Do you want to save your manually edited support points?"
msgstr "Voulez-vous sauvegarder vos points de support édités manuellement ?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "Voulez-vous sélectionner les filaments par défaut pour ces modèles d'imprimantes FFF ?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "Voulez-vous sélectionner les matériaux SLA par défaut pour ces modèles d'imprimantes ?"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "Ne pas agencer"
@@ -2061,6 +2098,10 @@ msgstr "Ne pas supporter les ponts"
msgid "Downgrade"
msgstr "Rétrograder"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "Bouclier contre les flux d'air"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2136,6 +2177,23 @@ msgstr "Modifier la coche - Clic droit"
msgid "Editing"
msgstr "Édition"
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "Éjec&ter la carte SD / la clef USB"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "Éjecter la carte SD / la clef USB"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "Éjecter la carte SD / la clef USB une fois que la G-code y a été exporté."
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "L'éjection de l'appareil %s(%s) a échoué."
+
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
msgstr "Compensation de l'effet patte d'éléphant"
@@ -2426,6 +2484,10 @@ msgstr "Exporter le plateau courant en AMF"
msgid "Export current plate as G-code"
msgstr "Exporter le plateau courant en G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Exporter le plateau actuel en tant que G-code vers la carte SD / la clef USB"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "Exporter le plateau courant en STL"
@@ -2447,6 +2509,10 @@ msgstr "Exportez les chemins d'accès complets des modèles et des sources de pi
msgid "Export G-code"
msgstr "Exporter le G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "Exporter le G-code vers la carte SD / la clef USB"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "Exporter OBJ"
@@ -2948,10 +3014,10 @@ msgid "For support enforcers only"
msgstr "Seulement pour les générateur de supports"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
+#: src/slic3r/GUI/Tab.cpp:3267
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"pour le bouton gauche : indique un préréglage non-système (ou non par défaut),\n"
"pour le bouton droit : indique que le réglage n'a pas été modifié."
@@ -3368,17 +3434,6 @@ msgstr "HTTPS CA Fichier"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "Le fichier HTTPS CA est optionnel. Il est uniquement requis si vous utilisez le HTTPS avec un certificat auto-signé."
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"Fichier HTTPS CA :\n"
-"\tDans ce système, %s utilise des certificats HTTPS issus du système Magasin de Certificats ou Trousseau.\n"
-"\tPour utiliser un fichier CA personnalisé, veuillez importer votre fichier CA dans le Magasin de Certificats / Trousseau."
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Taille de l'icône par rapport à la taille par défaut"
@@ -3429,6 +3484,10 @@ msgstr "Si activé, Slic3r télécharge les mises à jours des préréglages sys
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "Si ceci est activé, la scène 3D sera affichée avec la résolution Retina. Si vous rencontrez des problèmes de performance 3D, le fait de désactiver cette option vous aidera peut-être."
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "Si elle est activée, la jupe sera aussi haute que l'objet imprimé le plus haut. Cela sert à protéger les impressions ABS ou ASA des phénomènes de déformation ou de décollement du plateau d'impression liés au flux d'air."
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "Si elle est activée, la tour de nettoyage ne sera pas imprimée sur des couches sans changement d'outil. Sur les couches avec un changement d'outil, l'extrudeur se déplacera vers le bas pour imprimer la tour de nettoyage. C'est à l'utilisateur de s'assurer qu'il n'y a pas de collision avec l'impression."
@@ -3578,7 +3637,6 @@ msgid ""
"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values."
msgstr ""
"indique que certains paramètres ont été modifiés et ne sont pas égaux aux valeurs du système (ou par défaut) pour le groupe d'options actuel.\n"
-"\n"
"Cliquez sur l'icône CADENAS OUVERT pour régler tous les paramètres pour le groupe d'options actuel sur les valeurs du système (ou par défaut)."
#. TRN Description for "LOCKED LOCK"
@@ -4055,15 +4113,15 @@ msgstr "Verrouiller les supports sous de nouveaux îlots"
#: src/slic3r/GUI/Tab.cpp:3252
msgid "LOCKED LOCK"
-msgstr "VERROU VERROUILLE"
+msgstr "CADENAS FERMÉ"
#: src/slic3r/GUI/Tab.cpp:3280
msgid "LOCKED LOCK icon indicates that the settings are the same as the system (or default) values for the current option group"
-msgstr "L'icône VERROU VERROUILLE indique que les réglages sont les mêmes que les valeurs système (ou par défaut) pour le groupe d'options actuel"
+msgstr "L'icône CADENAS FERMÉ indique que les réglages sont les mêmes que les valeurs système (ou par défaut) pour le groupe d'options actuel"
#: src/slic3r/GUI/Tab.cpp:3296
msgid "LOCKED LOCK icon indicates that the value is the same as the system (or default) value."
-msgstr "L'icône VERROU VERROUILLÉ indique que la valeur est la même que la valeur système (ou par défaut)."
+msgstr "L'icône CADENAS FERMÉ indique que la valeur est la même que la valeur système (ou par défaut)."
#: src/libslic3r/PrintConfig.cpp:3508
msgid "Logging level"
@@ -4122,6 +4180,10 @@ msgstr "Maximum"
msgid "Max bridge length"
msgstr "Longueur maximum de pont"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Nombre de ponts maximum par pilier"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "Distance maximum de fusion"
@@ -4290,6 +4352,10 @@ msgstr "Mouvement brusque maximum Y"
msgid "Maximum jerk Z"
msgstr "Mouvement brusque maximum Z"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "Le nombre de ponts maximum pouvant être placés sur un pilier. Les ponts soutiennent les têtes des points de support et sont connectés aux piliers comme de petites branches."
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "Vitesse volumétrique maximale autorisée pour ce filament. Limite la vitesse volumétrique d'une impression au minimum des vitesses volumétriques d'impression et de filament. Mettez à zéro pour enlever la limite."
@@ -4588,6 +4654,10 @@ msgstr "Réparation du modèle terminée"
msgid "Model repaired successfully"
msgstr "Réparation du modèle réussie"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Les modifications du profil actuel vont être sauvegardées."
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "modifié"
@@ -4961,6 +5031,11 @@ msgstr "d'un Objet en cours"
msgid "Offset"
msgstr "Décalage"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "Dans ce système, %s utilise des certificats HTTPS issus du système Magasin de Certificats ou Trousseau."
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Mode couche unique"
@@ -5381,10 +5456,10 @@ msgstr "Préréglage (%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "Un préréglage avec le nom \"%1%\" existe déjà."
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Copie"
+msgid "Copy"
+msgstr "Copie"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5906,9 +5981,9 @@ msgstr "Retirer les points sélectionnés"
msgid "Remove the selected object"
msgstr "Retirer l'objet sélectionné"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Supprimer les profils d'utilisateur - installation à partir de zéro (un instantané des réglages sera pris)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "Supprimer les profils utilisateurs (un instantané sera pris au préalable)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -6430,8 +6505,8 @@ msgstr "Choisissez le type de support dont vous avez besoin"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
"Sélectionnez OUI si vous souhaitez supprimer tous les changements d'outil enregistrées, \n"
"NON si vous souhaitez que tous les changements d'outil soient remplacés par des modifications de couleur, \n"
@@ -7591,6 +7666,10 @@ msgstr ""
"L'équipement %s n'a pas été trouvé.\n"
"Si l'équipement est connecté, veuillez appuyer sur le bouton Reset à côté du connecteur USB ..."
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "Le préréglage personnalisé actuel sera détaché du préréglage système parent."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
msgid ""
"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
@@ -7651,6 +7730,14 @@ msgstr "La première couche sera réduite sur le plan XY selon la valeur configu
msgid "the following characters are not allowed:"
msgstr "les caractères suivant ne sont pas autorisés :"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "Les modèles d'imprimantes FFF suivants n'ont aucun filament sélectionné :"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "Les modèles d'imprimantes SLA suivants n'ont aucun matériau sélectionné :"
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "le suffixe suivant n'est pas autorisé :"
@@ -7745,9 +7832,13 @@ msgstr "L'objet sélectionné ne peut être scindé car il contient plus d'un vo
msgid "The selected object couldn't be split because it contains only one part."
msgstr "L'objet sélectionné n'a pu être scindé car il ne contient qu'une seule pièce."
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "Le projet sélectionné n'est plus disponible"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
+msgstr ""
+"Le projet sélectionné n'est plus disponible.\n"
+"Voulez-vous le retirer de la liste des projets récents?"
#: src/slic3r/GUI/DoubleSlider.cpp:998
msgid ""
@@ -7921,6 +8012,14 @@ msgstr ""
msgid "This %s version: %s"
msgstr "Version de ce %s : %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+"Cette action n'est pas réversible.\n"
+"Voulez-vous continuer ?"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "Ce code est inséré entre des objets lorsque vous utilisez l'impression séquentielle. Par défaut la température de l'extrudeur et du plateau est réinitialisée et utilise la commande sans-attente ; toutefois si des commandes M104, M109, M140 ou M190 sont détectées dans ce code personnalisé, Slic3r n'ajoutera pas de commandes de température. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r, donc vous pouvez entrer une commande \"M109S[first_layer_temperature]\" où vous le souhaitez."
@@ -8089,7 +8188,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "Cette valeur est la hauteur de couche imprimable minimum pour cet extrudeur et elle limite la résolution pour la hauteur de couche variable. Les valeurs type se situent entre 0.05 mm et 0.1 mm."
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "Ceci est généralement provoqué par de petites extrusions négligeables ou par un modèle défectueux. Essayez de réparer le modèle ou de changer son orientation sur le lit."
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8233,6 +8332,10 @@ msgstr "Vers les objets"
msgid "To parts"
msgstr "Vers les parties"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Pour utiliser un fichier CA personnalisé, veuillez importer votre fichier CA dans le Magasin de Certificats / Trousseau."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
#, c-format
msgid "Toggle %c axis mirroring"
@@ -8988,14 +9091,6 @@ msgstr "Vous ne pouvez pas charger un projet SLA avec un objet en plusieurs part
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "Vous ne pouvez pas utiliser un mode de redimensionnement non-uniforme pour une sélection d'objets/de parties multiples"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "Vous devez sélectionner au moins un filament pour les imprimantes sélectionnées"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "Vous devez sélectionner au moins un matériau pour les imprimantes sélectionnées"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "Vous avez peut-être besoin de mettre à jour le pilote de votre carte graphique."
diff --git a/resources/localization/it/PrusaSlicer.mo b/resources/localization/it/PrusaSlicer.mo
index 9130c6abf4..cb07f0949b 100644
Binary files a/resources/localization/it/PrusaSlicer.mo and b/resources/localization/it/PrusaSlicer.mo differ
diff --git a/resources/localization/it/PrusaSlicer_it.po b/resources/localization/it/PrusaSlicer_it.po
index 7a6c3e0a06..9cb5960b97 100644
--- a/resources/localization/it/PrusaSlicer_it.po
+++ b/resources/localization/it/PrusaSlicer_it.po
@@ -5,12 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"X-Generator: PhraseApp (phraseapp.com)\n"
#: src/slic3r/GUI/MainFrame.cpp:66
msgid " - Remember to check for updates at http://github.com/prusa3d/PrusaSlicer/releases"
@@ -28,7 +23,7 @@ msgid "%"
msgstr "%"
#: src/slic3r/GUI/GLCanvas3D.cpp:963
-#, c-format
+#, possible-c-format
msgid "%.2f - %.2f mm"
msgstr "%.2f - %.2f mm"
@@ -46,125 +41,97 @@ msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
msgstr "%1%=%2% mm è troppo basso per essere un altezza layer stampabile %3% mm"
#: src/slic3r/GUI/PresetHints.cpp:229
-#, c-format
+#, possible-c-format
msgid "%3.2f mm³/s at filament speed %3.2f mm/s."
msgstr "%3.2f mm³/s alla velocità del filamento di %3.2f mm/s."
#: src/slic3r/GUI/Plater.cpp:1152
-#, c-format
+#, possible-c-format
msgid "%d (%d shells)"
msgstr "%d (%d di perimetri)"
#: src/slic3r/GUI/Plater.cpp:1160
-#, c-format
+#, possible-c-format
msgid "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d facets reversed, %d backwards edges"
msgstr "%d facce degenerate, %d spigoli riparati, %d facce rimosse, %d faccee aggiunte, %d facce invertite, %d spigoli inversi"
#: src/slic3r/GUI/PresetHints.cpp:270
-#, c-format
+#, possible-c-format
msgid "%d lines: %.2f mm"
msgstr "%d linee: %.2f mm"
#: src/slic3r/GUI/MainFrame.cpp:1027
-#, c-format
+#, possible-c-format
msgid "%d presets successfully imported."
msgstr "%d preset importati correttamente."
#: src/slic3r/GUI/MainFrame.cpp:692
-#, c-format
+#, possible-c-format
msgid "%s &Website"
msgstr "%s Sito &Web"
#: src/slic3r/GUI/UpdateDialogs.cpp:211
-#, c-format
+#, possible-c-format
msgid "%s configuration is incompatible"
msgstr "configurazione %s non compatibile"
#: src/slic3r/GUI/Field.cpp:175
-#, c-format
+#, possible-c-format
msgid "%s doesn't support percentage"
msgstr "%s non supporta la percentuale"
#: src/slic3r/GUI/MsgDialog.cpp:73
-#, c-format
+#, possible-c-format
msgid "%s error"
msgstr "errore %s"
#: src/slic3r/GUI/ConfigWizard.cpp:481
-#, c-format
+#, possible-c-format
msgid "%s Family"
msgstr "Famiglia %s"
#: src/slic3r/GUI/MsgDialog.cpp:74
-#, c-format
+#, possible-c-format
msgid "%s has encountered an error"
msgstr "%s ha riscontrato un errore"
#: src/slic3r/GUI/GUI_App.cpp:138
-#, c-format
-msgid ""
-"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n"
-"\n"
-"The application will now terminate."
-msgstr ""
-"%s ha riscontrato un errore. Probabilmente è stato causato dalla memoria piena. Se sei sicuro di avere abbastanza RAM nel sistema, questo potrebbe essere un bug e te ne saremmo grati se potessi informarci.\n"
-"\n"
-"L'applicazione verrà chiusa."
+#, possible-c-format
+msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n\nThe application will now terminate."
+msgstr "%s ha riscontrato un errore. Probabilmente è stato causato dalla memoria piena. Se sei sicuro di avere abbastanza RAM nel sistema, questo potrebbe essere un bug e te ne saremmo grati se potessi informarci.\n\nL'applicazione verrà chiusa."
#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:222
-#, c-format
+#, possible-c-format
msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it."
msgstr "%s ha riscontrato un errore. Probabilmente è stato causato dalla memoria piena. Se sei sicuro di avere abbastanza RAM nel sistema, questo potrebbe essere un bug e te ne saremmo grati se potessi informarci."
#: src/slic3r/GUI/UpdateDialogs.cpp:308
-#, c-format
+#, possible-c-format
msgid "%s has no configuration updates available."
-msgstr "%s non ha disponibili aggiornamenti di configurazione."
+msgstr "Non sono disponibili aggiornamenti di configurazione per %s."
#: src/slic3r/GUI/UpdateDialogs.cpp:148 src/slic3r/GUI/UpdateDialogs.cpp:210
-#, c-format
+#, possible-c-format
msgid "%s incompatibility"
msgstr "incompatibilità %s"
#: src/slic3r/GUI/UpdateDialogs.cpp:270
-#, c-format
-msgid ""
-"%s now uses an updated configuration structure.\n"
-"\n"
-"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n"
-"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n"
-"\n"
-"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates."
-msgstr ""
-"%s adesso utilizza uno schema aggiornato di configurazioni.\n"
-"\n"
-"Sono stati introdotti i così detti 'Preset di sistema', che contengono i settaggi integrati predefiniti per varie stampanti. Questi preset di sistema non possono essere modificati, però l'utente può creare i propri preset ereditando le impostazioni da quelli di sistema.\n"
-"Un preset ereditato può sia ereditare un valore particolare dal genitore, o sovrascriverlo con un valore personalizzato.\n"
-"\n"
-"Si prega di procedere con il %s che segue per impostare i nuovi preset e scegliere se abilitare gli aggiornamenti automatici del preset."
+#, possible-c-format
+msgid "%s now uses an updated configuration structure.\n\nSo called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\nAn inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\nPlease proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates."
+msgstr "%s adesso utilizza uno schema aggiornato di configurazioni.\n\nSono stati introdotti i così detti 'Preset di sistema', che contengono i settaggi integrati predefiniti per varie stampanti. Questi preset di sistema non possono essere modificati, però l'utente può creare i propri preset ereditando le impostazioni da quelli di sistema.\nUn preset ereditato può sia ereditare un valore particolare dal genitore, o sovrascriverlo con un valore personalizzato.\n\nSi prega di procedere con il %s che segue per impostare i nuovi preset e scegliere se abilitare gli aggiornamenti automatici del preset."
#: src/slic3r/GUI/GUI_App.cpp:820
-#, c-format
+#, possible-c-format
msgid "%s View Mode"
msgstr "%s Modalità Visualizzazione"
#: src/slic3r/GUI/UpdateDialogs.cpp:151
-#, c-format
-msgid ""
-"%s will now start updates. Otherwise it won't be able to start.\n"
-"\n"
-"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"%s avvierà gli aggiornamenti. In caso contrario non sarà in grado di avviarsi.\n"
-"\n"
-"Si fa noto che prima verrà creata un'istantanea della configurazione completa. Questa potrà essere ripristinata in qualunque momento se dovesse esserci un problema con la nuova versione.\n"
-"\n"
-"Pacchetti di configurazione aggiornati:"
+#, possible-c-format
+msgid "%s will now start updates. Otherwise it won't be able to start.\n\nNote that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n\nUpdated configuration bundles:"
+msgstr "%s avvierà gli aggiornamenti. In caso contrario non sarà in grado di avviarsi.\n\nSi fa noto che prima verrà creata un'istantanea della configurazione completa. Questa potrà essere ripristinata in qualunque momento se dovesse esserci un problema con la nuova versione.\n\nPacchetti di configurazione aggiornati:"
#: src/slic3r/GUI/MainFrame.cpp:705
-#, c-format
+#, possible-c-format
msgid "&About %s"
msgstr "Inform&azioni su %s"
@@ -310,7 +277,7 @@ msgstr "3&D"
#: src/slic3r/GUI/Plater.cpp:4097
msgid "3D editor view"
-msgstr "Vista editing 3D"
+msgstr "Vista modifica 3D"
#: src/libslic3r/PrintConfig.cpp:851
msgid "3D Honeycomb"
@@ -321,7 +288,7 @@ msgid "3Dconnexion settings"
msgstr "Impostazioni 3Dconnexion"
#: src/slic3r/GUI/Plater.cpp:5038
-#, c-format
+#, possible-c-format
msgid "3MF file exported to %s"
msgstr "File 3MF esportato in %s"
@@ -337,6 +304,10 @@ msgstr "Un'espressione booleana che usa i valori di configurazione di un profilo
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "Un'espressione booleana che usa i valori di configurazione di un profilo stampante attivo. Se questa espressione produce un risultato vero, questo profilo si considera compatibile con il profilo stampante attivo."
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "Verrà creata una copia del preset di sistema corrente, e verrà distaccata dal preset di sistema."
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "Una regola generale è da 160 a 230°C per il PLA, e da 215 a 250°C per l'ABS."
@@ -350,12 +321,12 @@ msgid "A toolpath outside the print area was detected"
msgstr "È stato rilevato un percorso al di fuori dell'area di stampa"
#: src/slic3r/GUI/AboutDialog.cpp:199
-#, c-format
+#, possible-c-format
msgid "About %s"
msgstr "Informazioni su %s"
#: src/slic3r/GUI/GLCanvas3D.cpp:959
-#, c-format
+#, possible-c-format
msgid "above %.2f mm"
msgstr "sopra %.2f mm"
@@ -666,17 +637,13 @@ msgid "Alternate nozzles:"
msgstr "Ugelli alternativi:"
#: src/slic3r/GUI/Plater.cpp:5002
-#, c-format
+#, possible-c-format
msgid "AMF file exported to %s"
msgstr "File AMF esportato in %s"
#: src/slic3r/GUI/GLCanvas3D.cpp:690
-msgid ""
-"An object outside the print area was detected\n"
-"Resolve the current problem to continue slicing"
-msgstr ""
-"È stato rilevato un oggetto al di fuori dell'area di stampa\n"
-"Risolvere il problema per continuare lo slicing"
+msgid "An object outside the print area was detected\nResolve the current problem to continue slicing"
+msgstr "È stato rilevato un oggetto al di fuori dell'area di stampa\nRisolvere il problema per continuare lo slicing"
#: src/slic3r/GUI/GLCanvas3D.cpp:685
msgid "An object outside the print area was detected"
@@ -730,12 +697,8 @@ msgid "Are you sure you want to %1% the selected preset?"
msgstr "Sei sicuro di voler %1% il preset selezionato?"
#: src/slic3r/GUI/FirmwareDialog.cpp:902
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"Sei sicuro di voler annullare il flash del firmware?\n"
-"Questo potrebbe lasciare la tua stampante in una condizione inutilizzabile!"
+msgid "Are you sure you want to cancel firmware flashing?\nThis could leave your printer in an unusable state!"
+msgstr "Sei sicuro di voler annullare il flash del firmware?\nQuesto potrebbe lasciare la tua stampante in una condizione inutilizzabile!"
#: src/slic3r/GUI/DoubleSlider.cpp:1903 src/slic3r/GUI/DoubleSlider.cpp:1924
msgid "Are you sure you want to continue?"
@@ -823,12 +786,12 @@ msgid "Auto-generate points"
msgstr "Genera punti automaticamente"
#: src/slic3r/GUI/Plater.cpp:1157
-#, c-format
+#, possible-c-format
msgid "Auto-repaired (%d errors)"
msgstr "Auto-riparati (%d errori)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:339
-#, c-format
+#, possible-c-format
msgid "Auto-repaired (%d errors):"
msgstr "Auto-riparati (%d errori):"
@@ -869,20 +832,12 @@ msgid "BACK ARROW"
msgstr "FRECCIA INDIETRO"
#: src/slic3r/GUI/Tab.cpp:3290
-msgid ""
-"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
-"Click to reset all settings for the current option group to the last saved preset."
-msgstr ""
-"L'icona FRECCIA INDIETRO indica che le impostazioni sono state cambiate e non corrispondono all'ultimo preset salvato per il seguente gruppo di opzioni.\n"
-"Clicca per reimpostare all'ultimo preset salvato tutte le impostazioni per il seguente gruppo di opzioni."
+msgid "BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\nClick to reset all settings for the current option group to the last saved preset."
+msgstr "L'icona FRECCIA INDIETRO indica che le impostazioni sono state cambiate e non corrispondono all'ultimo preset salvato per il seguente gruppo di opzioni.\nClicca per reimpostare all'ultimo preset salvato tutte le impostazioni per il seguente gruppo di opzioni."
#: src/slic3r/GUI/Tab.cpp:3304
-msgid ""
-"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n"
-"Click to reset current value to the last saved preset."
-msgstr ""
-"L'icona FRECCIA ALL'INDIETRO indica che il valore è stato cambiato e non corrisponde all'ultimo preset salvato.\n"
-"Cliccare per reimpostare il valore corrente all'ultimo preset salvato."
+msgid "BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\nClick to reset current value to the last saved preset."
+msgstr "L'icona FRECCIA ALL'INDIETRO indica che il valore è stato cambiato e non corrisponde all'ultimo preset salvato.\nCliccare per reimpostare il valore corrente all'ultimo preset salvato."
#: src/slic3r/GUI/Preferences.cpp:55
msgid "Background processing"
@@ -1088,6 +1043,18 @@ msgstr "Annullo in corso..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "Non è possibile calcolare la larghezza di estrusione per %1%: Variabile \"%2%\" non accessibile."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid "Cannot insert a new layer range after the current layer range.\nCurrent layer range overlaps with the next layer range."
+msgstr "Non è possibile inserire un nuovo intervallo layer dopo quello attuale.\nL'intervallo layer attuale si sovrappone alla quello successivo."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid "Cannot insert a new layer range after the current layer range.\nThe next layer range is too thin to be split to two\nwithout violating the minimum layer height."
+msgstr "Non è possibile inserire un nuovo intervallo layer dopo quello attuale.\nL'intervallo layer successivo è troppo sottile per essere diviso in due\nsenza violare l'altezza layer minima."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid "Cannot insert a new layer range between the current and the next layer range.\nThe gap between the current layer range and the next layer range\nis thinner than the minimum layer height allowed."
+msgstr "Non è possibile inserire un nuovo intervallo layer tra quello attuale e quello successivo.\nLo spazio tra l'intervallo layer corrente e quello successivo\nè più sottile dell'altezza layer minima consentita."
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "Impossibile sovrascrivere un profilo di sistema."
@@ -1145,7 +1112,7 @@ msgid "Change Extruders"
msgstr "Cambio Estrusori"
#: src/slic3r/GUI/GUI_ObjectSettings.cpp:152
-#, c-format
+#, possible-c-format
msgid "Change Option %s"
msgstr "Modifica Opzione %s"
@@ -1266,7 +1233,7 @@ msgid "Color change (\"%1%\") for Extruder %2%"
msgstr "Cambio colore (\"%1%\") per Estrusore %2%"
#: src/slic3r/GUI/GLCanvas3D.cpp:995
-#, c-format
+#, possible-c-format
msgid "Color change for Extruder %d at %.2f mm"
msgstr "Cambio colore per Estrusore %d a %.2f mm"
@@ -1557,23 +1524,18 @@ msgid "Cubic"
msgstr "Cubico"
#: src/slic3r/GUI/wxExtensions.cpp:704
-#, c-format
+#, possible-c-format
msgid "Current mode is %s"
msgstr "La modalità corrente è %s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "Il preset corrente è ereditato da"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "Il preset attuale è stato ereditato dal preset predefinito."
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Il preset corrente è ereditato da:\n"
-"%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Versione corrente:"
@@ -1681,7 +1643,7 @@ msgid "Default filament profile associated with the current printer profile. On
msgstr "Profilo filamento predefinito associato al profilo stampante corrente. Quando si seleziona il profilo stampante corrente, questo profilo filamento verrà attivato."
#: src/slic3r/GUI/Tab.cpp:2919
-#, c-format
+#, possible-c-format
msgid "Default preset (%s)"
msgstr "Preset predefinito (%s)"
@@ -1786,7 +1748,7 @@ msgid "Delete Object"
msgstr "Elimina Oggetto"
#: src/slic3r/GUI/GUI_ObjectSettings.cpp:101
-#, c-format
+#, possible-c-format
msgid "Delete Option %s"
msgstr "Elimina Opzione %s"
@@ -1873,6 +1835,18 @@ msgstr "Deseleziona con rettangolo"
msgid "Deselects all objects"
msgstr "Deseleziona tutti gli oggetti"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Distacco dal preset di sistema"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Preset distacco"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Distaccato"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Rileva perimetri ponte (bridge)"
@@ -2011,23 +1985,9 @@ msgid "Do not rearrange the given models before merging and keep their original
msgstr "Non disporre i modelli prima dell’unione e mantieni le coordinate XY originali."
#: src/slic3r/GUI/Field.cpp:240
-#, c-format
-msgid ""
-"Do you mean %s%% instead of %s %s?\n"
-"Select YES if you want to change this value to %s%%, \n"
-"or NO if you are sure that %s %s is a correct value."
-msgstr ""
-"Intendevi %s invece di %s %s?\n"
-"Seleziona SI se vuoi cambiare il valore a %s %%,\n"
-"o NO se sei sicuro che %s %s è il valore corretto."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "Vuoi selezionare automaticamente i filamenti predefiniti?"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "Vuoi selezionare automaticamente i materiali predefiniti?"
+#, possible-c-format
+msgid "Do you mean %s%% instead of %s %s?\nSelect YES if you want to change this value to %s%%, \nor NO if you are sure that %s %s is a correct value."
+msgstr "Intendevi %s invece di %s %s?\nSeleziona SI se vuoi cambiare il valore a %s %%,\no NO se sei sicuro che %s %s è il valore corretto."
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
@@ -2045,6 +2005,14 @@ msgstr "Vuoi riprovare"
msgid "Do you want to save your manually edited support points?"
msgstr "Vuoi salvare i punti di supporto modificati manualmente?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "Vuoi selezionare i filamenti predefiniti per questi modelli di stampante FFF?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "Vuoi selezionare i materiali SLA predefiniti per questi modelli di stampante?"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "Non disporre"
@@ -2061,6 +2029,10 @@ msgstr "Non supportare i bridge"
msgid "Downgrade"
msgstr "Downgrade"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "Scudo di protezione"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2134,7 +2106,24 @@ msgstr "Modifica segno di spunta - Clic destro"
#: src/slic3r/GUI/GUI_ObjectList.cpp:282 src/slic3r/GUI/GUI_ObjectList.cpp:394
msgid "Editing"
-msgstr "Editing"
+msgstr "Modifica"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "Espelli Scheda SD / Memoria flash &t"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "Espelli scheda SD / Memoria flash"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "Espelli scheda SD / Memoria flash dopo l'esportazione del G-code in essa."
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, possible-c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "Espulsione del dispositivo %s(%s) non riuscita."
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
@@ -2273,7 +2262,7 @@ msgid "Error"
msgstr "Errore"
#: src/slic3r/GUI/FirmwareDialog.cpp:645
-#, c-format
+#, possible-c-format
msgid "Error accessing port at %s: %s"
msgstr "Errore nell'accedere alla porta a%s: %s"
@@ -2282,12 +2271,12 @@ msgid "Error during reload"
msgstr "Errore durante il ri-caricamento"
#: src/slic3r/GUI/Plater.cpp:5043
-#, c-format
+#, possible-c-format
msgid "Error exporting 3MF file %s"
msgstr "Errore nell'esportazione del file 3MF %s"
#: src/slic3r/GUI/Plater.cpp:5005
-#, c-format
+#, possible-c-format
msgid "Error exporting AMF file %s"
msgstr "Errore nell'esportazione del file AMF %s"
@@ -2316,7 +2305,7 @@ msgid "Error! Invalid model"
msgstr "Errore! Modello non valido"
#: src/slic3r/GUI/FirmwareDialog.cpp:647
-#, c-format
+#, possible-c-format
msgid "Error: %s"
msgstr "Errore: %s"
@@ -2346,7 +2335,7 @@ msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm"
msgstr "%1% %2% mm eccessivi per essere stampabili con un diametro ugello di %3% mm"
#: src/slic3r/GUI/UpdateDialogs.cpp:191 src/slic3r/GUI/UpdateDialogs.cpp:246
-#, c-format
+#, possible-c-format
msgid "Exit %s"
msgstr "Chiudi %s"
@@ -2426,6 +2415,10 @@ msgstr "Esporta il piano corrente come AMF"
msgid "Export current plate as G-code"
msgstr "Esporta il piano corrente come G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Esporta il piano corrente come G-code su scheda SD / Memoria flash"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "Esporta il piano corrente come STL"
@@ -2447,6 +2440,10 @@ msgstr "Esporta il percorso completo dei modelli e fonti delle parti nei file 3m
msgid "Export G-code"
msgstr "Esporta G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "Esporta G-code su Scheda SD / Memoria flash"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "Esporta OBJ"
@@ -2576,7 +2573,7 @@ msgstr "Estrusore"
#: src/slic3r/GUI/DoubleSlider.cpp:1134 src/slic3r/GUI/DoubleSlider.cpp:1170
#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1704
#: src/slic3r/GUI/Tab.cpp:2320 src/libslic3r/GCode/PreviewData.cpp:445
-#, c-format
+#, possible-c-format
msgid "Extruder %d"
msgstr "Estrusore %d"
@@ -2948,18 +2945,12 @@ msgid "For support enforcers only"
msgstr "Solo per rinforzi supporto"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
-msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-"per il tasto sinistro: indica un preset non di sistema (o non-predefinito),\n"
-"per il tasto destro: indica che le impostazioni non sono state modificate."
+#: src/slic3r/GUI/Tab.cpp:3267
+msgid "for the left button: indicates a non-system (or non-default) preset,\nfor the right button: indicates that the settings hasn't been modified."
+msgstr "per il tasto sinistro: indica un preset non di sistema (o non-predefinito),\nper il tasto destro: indica che le impostazioni non sono state modificate."
#: src/slic3r/GUI/ConfigManipulation.cpp:136
-msgid ""
-"For the Wipe Tower to work with the soluble supports, the support layers\n"
-"need to be synchronized with the object layers."
+msgid "For the Wipe Tower to work with the soluble supports, the support layers\nneed to be synchronized with the object layers."
msgstr "Per far sì che la torre di spurgo funzioni con i supporti solubili, i layer dei supporti devono essere sincronizzati con quelli del modello."
#: src/libslic3r/Print.cpp:1396
@@ -3003,12 +2994,8 @@ msgid "G-code"
msgstr "G-code"
#: src/slic3r/GUI/DoubleSlider.cpp:1021
-msgid ""
-"G-code associated to this tick mark is in a conflict with print mode.\n"
-"Editing it will cause changes of Slider data."
-msgstr ""
-"Il G-code associato a questo segno di spunta è in conflitto con la modalità di stampa.\n"
-"La modifica causerà cambiamenti nei dati della barra di scorrimento."
+msgid "G-code associated to this tick mark is in a conflict with print mode.\nEditing it will cause changes of Slider data."
+msgstr "Il G-code associato a questo segno di spunta è in conflitto con la modalità di stampa.\nLa modifica causerà cambiamenti nei dati della barra di scorrimento."
#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:130
msgid "G-code file exported to %1%"
@@ -3127,7 +3114,7 @@ msgstr "Gizmo-Sposta"
#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:489
msgid "Gizmo-Place on Face"
-msgstr "Gizmo-Posiziona sulla faccia"
+msgstr "Gizmo-Posiziona su faccia"
#: src/slic3r/GUI/GLCanvas3D.cpp:3001
#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:564
@@ -3211,7 +3198,7 @@ msgid "Heights at which a filament change is to occur."
msgstr "Altezze alle quali i cambi di filamento devono avvenire."
#: src/slic3r/GUI/ConfigWizard.cpp:433
-#, c-format
+#, possible-c-format
msgid "Hello, welcome to %s! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "Ciao, benvenuto su %s! La %s ti aiuterà con la configurazione iniziale; giusto qualche impostazione e sarai pronto a stampare."
@@ -3333,9 +3320,7 @@ msgid "Hostname, IP or URL"
msgstr "Nome Host, IP o URL"
#: src/slic3r/GUI/Tab.cpp:139
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
+msgid "Hover the cursor over buttons to find more information \nor click this button."
msgstr "Scorri il cursore sui bottoni per ottenere maggiori informazioni o clicca su questo bottone."
#: src/libslic3r/PrintConfig.cpp:2812
@@ -3362,17 +3347,6 @@ msgstr "File HTTPS CA"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "File HTTPS CA opzionale. È necessario solo se si intende usare un HTTPS con certificato autofirmato."
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"File HTTPS CA:\n"
-"Su questo sistema, %s utilizza certificati HTTPS provenienti dal sistema Certificate Store o da Keychain.\n"
-"Per utilizzare un file CA personalizzato, importa il tuo file CA sul Certificate Store / Keychain."
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Dimensioni icona rispetto alla dimensione predefinita"
@@ -3386,12 +3360,12 @@ msgid "If checked, supports will be generated automatically based on the overhan
msgstr "Se attivo, verranno automaticamente generati i supporti in base al valore soglia di sporgenza. Se disattivato, i supporti verranno generati solamente all'interno dei volumi di \"Rinforzo Supporto\"."
#: src/slic3r/GUI/ConfigWizard.cpp:773
-#, c-format
+#, possible-c-format
msgid "If enabled, %s checks for new application versions online. When a new version becomes available, a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done."
msgstr "Se attivato, %s verifica la presenza di nuove versioni online. Quando è disponibile una nuova versione, viene mostrata una notifica al successivo avvio dell'applicazione (mai durante l'uso del programma). È solo un meccanismo di notifica, non viene effettuato nessun aggiornamento automatico."
#: src/slic3r/GUI/ConfigWizard.cpp:783
-#, c-format
+#, possible-c-format
msgid "If enabled, %s downloads updates of built-in system presets in the background.These updates are downloaded into a separate temporary location.When a new preset version becomes available it is offered at application startup."
msgstr "Se attivo, %s scarica in background gli aggiornamenti dei preset integrati nel sistema. Questi aggiornamenti vengono scaricati in una cartella temporanea separata. Quando è disponibile una nuova versione del preset, questa viene proposta all'avvio."
@@ -3400,12 +3374,8 @@ msgid "If enabled, all printing extruders will be primed at the front edge of th
msgstr "Se attivata, tutti gli estrusori di stampa verranno preparati nel bordo frontale del piano di stampa all'inizio della stampa."
#: src/slic3r/GUI/ConfigWizard.cpp:805
-msgid ""
-"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n"
-"If not enabled, the Reload from disk command will ask to select each file using an open file dialog."
-msgstr ""
-"Se attivo, permette al comando di Ricarica da disco di trovare e caricare automaticamente i file quando richiesti.\n"
-"Se non attivo, il comando Ricarica da disco chiederà di selezionare ciascun file tramite finestra di apertura file."
+msgid "If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\nIf not enabled, the Reload from disk command will ask to select each file using an open file dialog."
+msgstr "Se attivo, permette al comando di Ricarica da disco di trovare e caricare automaticamente i file quando richiesti.\nSe non attivo, il comando Ricarica da disco chiederà di selezionare ciascun file tramite finestra di apertura file."
#: src/slic3r/GUI/Preferences.cpp:74
msgid "If enabled, allows the Reload from disk command to automatically find and load the files when invoked."
@@ -3423,6 +3393,10 @@ msgstr "Se abilitato, Slic3r scarica gli aggiornamenti dei preset inclusi in bac
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "Se attivo, la scena 3D verrà renderizzata con la risoluzione Retina. Se si riscontrano problemi di prestazioni 3D, disattivare questa opzione potrebbe essere d'aiuto."
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "Se abilitata, lo skirt sarà alto quanto l'oggetto stampato più alto. Questo è utile per evitare che una stampa ABS o ASA si deformi e si stacchi dal piano di stampa a causa di correnti d'aria."
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "Se attiva, la torre di spurgo non verrà stampata sui layer con cambio attrezzo. Sui layer con un cambio attrezzo, l'estrusore si sposterà verso il basso per stampare la torre di spurgo. L'utente è responsabile nell'accertarsi che non avvengano collisioni durante la stampa."
@@ -3540,7 +3514,7 @@ msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "Importa STL/OBJ/AMF/3MF senza configurazione, mantieni piano"
#: src/slic3r/GUI/GUI_ObjectList.cpp:3422
-#, c-format
+#, possible-c-format
msgid "In this mode you can select only other %s Items%s"
msgstr "In questa modalità puoi selezionare solo altri %s oggetti %s"
@@ -3549,7 +3523,7 @@ msgid "Incompatible bundles:"
msgstr "Gruppi incompatibili:"
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75
-#, c-format
+#, possible-c-format
msgid "Incompatible with this %s"
msgstr "Incompatibile con questo %s"
@@ -3567,12 +3541,8 @@ msgstr "Indicizzazione di un oggetto svuotato"
#. TRN Description for "UNLOCKED LOCK"
#: src/slic3r/GUI/Tab.cpp:3258
-msgid ""
-"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values."
-msgstr ""
-"indica che è stata modificata qualche impostazione e non è uguale ai valori di sistema (o predefiniti) del corrente gruppo di opzioni.\n"
-"Clicca l'icona LUCCHETTO APERTO per reimpostare tutte le impostazioni del corrente gruppo di opzioni ai valori di sistema (o predefiniti)."
+msgid "indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\nClick the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values."
+msgstr "indica che è stata modificata qualche impostazione e non è uguale ai valori di sistema (o predefiniti) del corrente gruppo di opzioni.\nClicca l'icona LUCCHETTO APERTO per reimpostare tutte le impostazioni del corrente gruppo di opzioni ai valori di sistema (o predefiniti)."
#. TRN Description for "LOCKED LOCK"
#: src/slic3r/GUI/Tab.cpp:3254
@@ -3581,12 +3551,8 @@ msgstr "indica che le impostazioni sono uguali ai valori di sistema (o predefini
#. TRN Description for "BACK ARROW"
#: src/slic3r/GUI/Tab.cpp:3270
-msgid ""
-"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
-"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
-msgstr ""
-"indica che le impostazioni sono state modificate e non corrispondono all'ultimo preset salvato per l'attuale gruppo opzioni.\n"
-"Clicca l'icona FRECCIA INDIETRO per reimpostare all'ultimo preset salvato tutte le impostazioni per il seguente gruppo di opzioni."
+msgid "indicates that the settings were changed and are not equal to the last saved preset for the current option group.\nClick the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
+msgstr "indica che le impostazioni sono state modificate e non corrispondono all'ultimo preset salvato per l'attuale gruppo opzioni.\nClicca l'icona FRECCIA INDIETRO per reimpostare all'ultimo preset salvato tutte le impostazioni per il seguente gruppo di opzioni."
#: src/slic3r/GUI/ConfigManipulation.cpp:211
#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
@@ -3653,7 +3619,7 @@ msgstr "Ispeziona / attiva istantanee di configurazione"
#: src/slic3r/GUI/ObjectDataViewModel.cpp:60
#: src/slic3r/GUI/ObjectDataViewModel.cpp:216
-#, c-format
+#, possible-c-format
msgid "Instance %d"
msgstr "Istanza %d"
@@ -3779,7 +3745,7 @@ msgid "Jump to height"
msgstr "Salta all'altezza"
#: src/slic3r/GUI/DoubleSlider.cpp:955
-#, c-format
+#, possible-c-format
msgid "Jump to height %s or Set extruder sequence for the entire print"
msgstr "Salta all'altezza %s o Imposta sequenza estrusore per l'intera stampa"
@@ -4085,7 +4051,7 @@ msgstr "Manifold"
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
msgid "Manual editing"
-msgstr "Editing manuale"
+msgstr "Modifica manuale"
#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:180
msgid "Masked SLA file exported to %1%"
@@ -4115,6 +4081,10 @@ msgstr "Massimo"
msgid "Max bridge length"
msgstr "Lunghezza massima Bridge"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Ponteggi massimi su un pilastro"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "Massima distanza di unione"
@@ -4153,7 +4123,7 @@ msgstr "Distanza massima bridging"
#: src/libslic3r/PrintConfig.cpp:2269
msgid "Maximal distance between supports on sparse infill sections."
-msgstr "Distanza massima tra supporti in sezioni a scarso riempimento."
+msgstr "Distanza massima tra supporti in sezioni a riempimento sparso."
#: src/libslic3r/PrintConfig.cpp:1145
msgid "Maximum acceleration E"
@@ -4283,6 +4253,10 @@ msgstr "Jerk massimo Y"
msgid "Maximum jerk Z"
msgstr "Jerk massimo Z"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "Numero massimo di ponteggi che può essere posizionato su un pilastro. I ponteggi mantengono le capocchie dei punti di supporto e si collegano ai pilastri come piccoli rami."
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "Massima velocità volumetrica consentita per questo filamento. Limita la velocità volumetrica massima di una stampa alla velocità volumetrica minima del filamento e di stampa. Imposta a zero per non avere limite."
@@ -4436,7 +4410,7 @@ msgid "Mirror vertically"
msgstr "Specchia verticalmente"
#: src/slic3r/Utils/AstroBox.cpp:68 src/slic3r/Utils/OctoPrint.cpp:68
-#, c-format
+#, possible-c-format
msgid "Mismatched type of print host: %s"
msgstr "Tipo di Host di stampa non corrispondente: %s"
@@ -4581,6 +4555,10 @@ msgstr "Riparazione modello terminata"
msgid "Model repaired successfully"
msgstr "Modello riparato con successo"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Verranno salvate le modifiche al profilo attuale."
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "modificato"
@@ -4674,7 +4652,7 @@ msgid "Multi-part object detected"
msgstr "Rilevato oggetto in parti multiple"
#: src/slic3r/GUI/FirmwareDialog.cpp:419 src/slic3r/GUI/FirmwareDialog.cpp:454
-#, c-format
+#, possible-c-format
msgid "Multiple %s devices found. Please only connect one at a time for flashing."
msgstr "Trovati molteplici %s dispositivi. Per favore connettine uno alla volta per il flashing."
@@ -4683,13 +4661,8 @@ msgid "Multiple Extruders"
msgstr "Estrusori multipli"
#: src/slic3r/GUI/Plater.cpp:2410
-msgid ""
-"Multiple objects were loaded for a multi-material printer.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"these files to represent a single object having multiple parts?"
-msgstr ""
-"Sono stati caricati oggetti multipli per stampante multi-material.\n"
-"Invece di considerarli come oggetti multipli, devo considerarli come parte di un singolo oggetto avente parti multiple?"
+msgid "Multiple objects were loaded for a multi-material printer.\nInstead of considering them as multiple objects, should I consider\nthese files to represent a single object having multiple parts?"
+msgstr "Sono stati caricati oggetti multipli per stampante multi-material.\nInvece di considerarli come oggetti multipli, devo considerarli come parte di un singolo oggetto avente parti multiple?"
#: src/libslic3r/PrintConfig.cpp:3439
msgid "Multiply copies by creating a grid."
@@ -4737,7 +4710,7 @@ msgid "New project, clear plater"
msgstr "Nuovo progetto, pulisci piano"
#: src/slic3r/GUI/UpdateDialogs.cpp:38
-#, c-format
+#, possible-c-format
msgid "New version of %s is available"
msgstr "È disponibile una nuova versione di %s"
@@ -4771,7 +4744,7 @@ msgstr "NESSUN RAMMING"
#: src/libslic3r/PrintConfig.cpp:1857
msgid "No sparse layers (EXPERIMENTAL)"
-msgstr "Nessun layer rado (SPERIMENTALE)"
+msgstr "Nessun layer sparso (SPERIMENTALE)"
#: src/libslic3r/PrintConfig.cpp:2774
msgid "No support points will be placed closer than this threshold."
@@ -4821,7 +4794,7 @@ msgstr "Nota: è richiesta una versione di OctoPrint 1.1.0 o successiva."
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1345
msgid "Note: some shortcuts work in (non)editing mode only."
-msgstr "Nota: alcune scorciatoie funzionano solo in modalità (non)editing."
+msgstr "Nota: alcune scorciatoie funzionano solo in modalità (non)modifica."
#: src/slic3r/GUI/Tab.cpp:1251 src/slic3r/GUI/Tab.cpp:1252
#: src/slic3r/GUI/Tab.cpp:1540 src/slic3r/GUI/Tab.cpp:1541
@@ -4953,6 +4926,11 @@ msgstr "di un Oggetto corrente"
msgid "Offset"
msgstr "Offset"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, possible-c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "Su questo sistema, %s utilizza certificati HTTPS provenienti dal sistema Certificate Store o da Keychain."
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Modalità Un Layer"
@@ -5015,7 +4993,7 @@ msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "Apri progetto STL/OBJ/AMF/3MF con configurazione, pulisci piano"
#: src/slic3r/GUI/MainFrame.cpp:693
-#, c-format
+#, possible-c-format
msgid "Open the %s website in your browser"
msgstr "Apri il sito web di %s nel browser"
@@ -5271,7 +5249,7 @@ msgid "Perimeters"
msgstr "Perimetri"
#: src/slic3r/GUI/ConfigWizard.cpp:860
-#, c-format
+#, possible-c-format
msgid "Pick another vendor supported by %s"
msgstr "Scegli un altro distributore supportato da %s"
@@ -5293,7 +5271,7 @@ msgstr "Posiziona i cuscinetti negli alloggi e riprendi a stampare"
#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:45
msgid "Place on face"
-msgstr "Posiziona sulla faccia"
+msgstr "Posiziona su faccia"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:192 src/slic3r/GUI/MainFrame.cpp:204
msgid "Plater"
@@ -5365,7 +5343,7 @@ msgid "Preparing infill"
msgstr "Preparazione infill"
#: src/slic3r/GUI/Tab.cpp:2920
-#, c-format
+#, possible-c-format
msgid "Preset (%s)"
msgstr "Preset (%s)"
@@ -5373,10 +5351,10 @@ msgstr "Preset (%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "Preset con il nome \"%1%\" già esistente."
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Copia"
+msgid "Copy"
+msgstr "Copia"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5391,29 +5369,17 @@ msgid "Press to activate selection rectangle"
msgstr "Premi per attivare il rettangolo di selezione"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
-msgid ""
-"Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\n"
-"selected objects around their own center"
-msgstr ""
-"Premi per ridimensionare (nel Gizmo ridimensiona) o ruotare (nel Gizmo ruota)\n"
-"l'oggetto selezionato attorno al proprio centro"
+msgid "Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\nselected objects around their own center"
+msgstr "Premi per ridimensionare (nel Gizmo ridimensiona) o ruotare (nel Gizmo ruota)\nl'oggetto selezionato attorno al proprio centro"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:161
-msgid ""
-"Press to select multiple objects\n"
-"or move multiple objects with mouse"
-msgstr ""
-"Premi per selezionare o spostare\n"
-"oggetti multipli con il mouse"
+msgid "Press to select multiple objects\nor move multiple objects with mouse"
+msgstr "Premi per selezionare o spostare\noggetti multipli con il mouse"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:195
#, no-c-format
-msgid ""
-"Press to snap by 5% in Gizmo scale\n"
-"or to snap by 1mm in Gizmo move"
-msgstr ""
-"Premi per scatti del 5% nel Gizmo ridimensiona\n"
-"o per scatti di 1mm nel Gizmo sposta"
+msgid "Press to snap by 5% in Gizmo scale\nor to snap by 1mm in Gizmo move"
+msgstr "Premi per scatti del 5% nel Gizmo ridimensiona\no per scatti di 1mm nel Gizmo sposta"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 src/slic3r/GUI/Plater.cpp:4105
#: src/slic3r/GUI/Tab.cpp:2390
@@ -5540,12 +5506,12 @@ msgstr "Stampa con più estrusori con ugelli di di diametro diverso. Se il suppo
#. TRN "Processing input_file_basename"
#: src/slic3r/GUI/MainFrame.cpp:849
-#, c-format
+#, possible-c-format
msgid "Processing %s"
msgstr "Elaborando %s"
#: src/slic3r/GUI/Plater.cpp:2283
-#, c-format
+#, possible-c-format
msgid "Processing input file %s"
msgstr "Processando il file di input %s"
@@ -5588,10 +5554,8 @@ msgid "PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap co
msgstr "PrusaSlicer è basato su Slic3r di Alessandro Ranellucci e la comunità RepRap."
#: src/slic3r/GUI/GLCanvas3DManager.cpp:284
-#, c-format
-msgid ""
-"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
-"while OpenGL version %s, render %s, vendor %s was detected."
+#, possible-c-format
+msgid "PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \nwhile OpenGL version %s, render %s, vendor %s was detected."
msgstr "PrusaSlicer richiede un driver video con supporto OpenGL 2.0 per funzionare correttamente, mentre è stata rilevata la versione %s OpenGL, render %s, distributore %s."
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
@@ -5599,14 +5563,8 @@ msgid "PrusaSlicer version"
msgstr "versione PrusaSlicer"
#: src/slic3r/GUI/ConfigWizard.cpp:815
-msgid ""
-"PrusaSlicer's user interfaces comes in three variants:\n"
-"Simple, Advanced, and Expert.\n"
-"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively."
-msgstr ""
-"L'interfaccia utente di PrusaSlicer è disponibile in tre varianti:\n"
-"Semplice, Avanzata ed Esperto.\n"
-"La modalità Semplice mostra solo le impostazioni rilevanti utilizzate più spesso per una semplice stampa 3D. Le altre due offrono progressivamente ottimizzazioni più sofisticate, sono adatte ad utenti avanzati ed esperti, rispettivamente."
+msgid "PrusaSlicer's user interfaces comes in three variants:\nSimple, Advanced, and Expert.\nThe Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively."
+msgstr "L'interfaccia utente di PrusaSlicer è disponibile in tre varianti:\nSemplice, Avanzata ed Esperto.\nLa modalità Semplice mostra solo le impostazioni rilevanti utilizzate più spesso per una semplice stampa 3D. Le altre due offrono progressivamente ottimizzazioni più sofisticate, sono adatte ad utenti avanzati ed esperti, rispettivamente."
#: src/libslic3r/PrintConfig.cpp:2254
msgid "Purging after toolchange will done inside this object's infills. This lowers the amount of waste but may result in longer print time due to additional travel moves."
@@ -5640,7 +5598,7 @@ msgstr "Qualità / Velocità"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1530
#: src/slic3r/GUI/GUI_ObjectList.cpp:1536
#: src/slic3r/GUI/GUI_ObjectList.cpp:1849
-#, c-format
+#, possible-c-format
msgid "Quick Add Settings (%s)"
msgstr "Aggiungere Impostazioni Rapide (%s)"
@@ -5653,7 +5611,7 @@ msgid "Quick Slice and Save As"
msgstr "Slice veloce e Salva Come"
#: src/slic3r/GUI/MainFrame.cpp:540
-#, c-format
+#, possible-c-format
msgid "Quit %s"
msgstr "Chiudi %s"
@@ -5674,14 +5632,8 @@ msgid "Ramming customization"
msgstr "Personalizzazione del ramming"
#: src/slic3r/GUI/WipeTowerDialog.cpp:41
-msgid ""
-"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n"
-"\n"
-"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc."
-msgstr ""
-"Il ramming è la rapida estrusione appena prima di un cambio di attrezzo in una stampante MM ad estrusore singolo. Lo scopo è di dare la forma corretta al capo del filamento scaricato cosicché non prevenga l'inserzione del nuovo filamento e perché possa essere inserito più facilmente esso stesso. Questa fase è importante e materiali diversi possono richiedere velocità diverse per ottenere la forma corretta. Per questo motivo le velocità di estrusione del ramming possono essere modificate.\n"
-"\n"
-"Questa è un'impostazione per esperti, valori scorretti produrranno facilmente dei blocchi, o porteranno l'ingranaggio di estrusione a macinare il filamento etc."
+msgid "Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n\nThis is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc."
+msgstr "Il ramming è la rapida estrusione appena prima di un cambio di attrezzo in una stampante MM ad estrusore singolo. Lo scopo è di dare la forma corretta al capo del filamento scaricato cosicché non prevenga l'inserzione del nuovo filamento e perché possa essere inserito più facilmente esso stesso. Questa fase è importante e materiali diversi possono richiedere velocità diverse per ottenere la forma corretta. Per questo motivo le velocità di estrusione del ramming possono essere modificate.\n\nQuesta è un'impostazione per esperti, valori scorretti produrranno facilmente dei blocchi, o porteranno l'ingranaggio di estrusione a macinare il filamento etc."
#: src/slic3r/GUI/WipeTowerDialog.cpp:91
msgid "Ramming line spacing"
@@ -5740,7 +5692,7 @@ msgid "Recent projects"
msgstr "Prog&etti recenti"
#: src/slic3r/GUI/PresetHints.cpp:263
-#, c-format
+#, possible-c-format
msgid "Recommended object thin wall thickness for layer height %.2f and"
msgstr "Spessore raccomandato per oggetto con parete sottile per altezza layer %.2f e"
@@ -5775,7 +5727,7 @@ msgid "Redo"
msgstr "Ripeti"
#: src/slic3r/GUI/GLCanvas3D.cpp:4065
-#, c-format
+#, possible-c-format
msgid "Redo %1$d Action"
msgid_plural "Redo %1$d Actions"
msgstr[0] "Ripeti %1$d Azione"
@@ -5894,9 +5846,9 @@ msgstr "Rimuovi punti selezionati"
msgid "Remove the selected object"
msgstr "Rimuovi l'oggetto selezionato"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Rimuovi profili utente - reinstalla da zero (sarà prima fatto uno snapshot)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "Rimuovere i profili utente (verrà effettuata un'istantanea prima di procedere)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -5967,22 +5919,22 @@ msgid "Report an I&ssue"
msgstr "&Segnala un problema"
#: src/slic3r/GUI/MainFrame.cpp:703
-#, c-format
+#, possible-c-format
msgid "Report an issue on %s"
msgstr "Segnala un problema su %s"
#: src/slic3r/Utils/PresetUpdater.cpp:713
-#, c-format
+#, possible-c-format
msgid "requires max. %s"
msgstr "richiede max. %s"
#: src/slic3r/Utils/PresetUpdater.cpp:710
-#, c-format
+#, possible-c-format
msgid "requires min. %s"
msgstr "richiede min. %s"
#: src/slic3r/Utils/PresetUpdater.cpp:705
-#, c-format
+#, possible-c-format
msgid "requires min. %s and max. %s"
msgstr "richiede min. %s e max. %s"
@@ -6149,7 +6101,7 @@ msgid "Rotation angle around the Z axis in degrees."
msgstr "Angolo di rotazione attorno all'asse Z in gradi."
#: src/slic3r/GUI/GUI_App.cpp:797
-#, c-format
+#, possible-c-format
msgid "Run %s"
msgstr "Run %s"
@@ -6178,12 +6130,12 @@ msgstr "Manda in stampa"
#. TRN Preset
#: src/slic3r/GUI/Tab.cpp:3417
-#, c-format
+#, possible-c-format
msgid "Save %s as:"
msgstr "Salva %s come:"
#: src/slic3r/GUI/MainFrame.cpp:826
-#, c-format
+#, possible-c-format
msgid "Save %s file as:"
msgstr "Salva file %s come:"
@@ -6205,7 +6157,7 @@ msgstr "Salva configurazione nel file specificato."
#. TRN "Save current Settings"
#: src/slic3r/GUI/Tab.cpp:133
-#, c-format
+#, possible-c-format
msgid "Save current %s"
msgstr "Salva le %s attuali"
@@ -6276,12 +6228,8 @@ msgid "Scale factors"
msgstr "Fattore di scala"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:196
-msgid ""
-"Scale selection to fit print volume\n"
-"in Gizmo scale"
-msgstr ""
-"Ridimensiona la selezione per riempire il volume di stampa\n"
-"nel Gizmo Ridimensiona"
+msgid "Scale selection to fit print volume\nin Gizmo scale"
+msgstr "Ridimensiona la selezione per riempire il volume di stampa\nnel Gizmo Ridimensiona"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1724
msgid "Scale the selected object to fit the print volume"
@@ -6416,14 +6364,8 @@ msgid "Select what kind of support do you need"
msgstr "Seleziona il tipo di supporto richiesto"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
-msgid ""
-"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
-msgstr ""
-"Seleziona SI se vuoi cancellare tutti i cambi attrezzo salvati,\n"
-"NO se vuoi che tutti i cambi attrezzo passino a cambi colore,\n"
-"o ANNULLA per lasciarlo invariato."
+msgid "Select YES if you want to delete all saved tool changes, \nNO if you want all tool changes switch to color changes, \nor CANCEL to leave it unchanged."
+msgstr "Seleziona SI se vuoi cancellare tutti i cambi attrezzo salvati,\nNO se vuoi che tutti i cambi attrezzo passino a cambi colore,\no ANNULLA per lasciarlo invariato."
#: src/slic3r/GUI/Selection.cpp:146
msgid "Selection-Add"
@@ -6564,7 +6506,7 @@ msgid "Set number of instances"
msgstr "Imposta numero di istanze"
#: src/slic3r/GUI/Plater.cpp:4756
-#, c-format
+#, possible-c-format
msgid "Set numbers of copies to %d"
msgstr "Imposta il numero di copie a %d"
@@ -6653,12 +6595,8 @@ msgid "Set upper thumb to current slider thumb"
msgstr "Imposta il cursore superiore alla barra di scorrimento attuale"
#: src/libslic3r/PrintConfig.cpp:3509
-msgid ""
-"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n"
-"For example. loglevel=2 logs fatal, error and warning level messages."
-msgstr ""
-"Imposta la sensibilità di log. 0:fatale, 1:errore, 2:avviso, 3:informazioni, 4:debug, 5:traccia\n"
-"Per esempio. loglevel=2 registra messaggi fatali, di errore e di avviso."
+msgid "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\nFor example. loglevel=2 logs fatal, error and warning level messages."
+msgstr "Imposta la sensibilità di log. 0:fatale, 1:errore, 2:avviso, 3:informazioni, 4:debug, 5:traccia\nPer esempio. loglevel=2 registra messaggi fatali, di errore e di avviso."
#: src/slic3r/GUI/BedShapeDialog.cpp:155
msgid "Settings"
@@ -6754,7 +6692,7 @@ msgstr "Mostra informazioni di sistema"
#: src/slic3r/GUI/MainFrame.cpp:626
msgid "Show the 3D editing view"
-msgstr "Mostra la Vista editing 3D"
+msgstr "Mostra la Vista modifica 3D"
#: src/slic3r/GUI/MainFrame.cpp:629
msgid "Show the 3D slices preview"
@@ -6829,14 +6767,8 @@ msgid "Single Extruder Multi Material"
msgstr "Estrusore singolo Multi Material"
#: src/slic3r/GUI/Tab.cpp:1867
-msgid ""
-"Single Extruder Multi Material is selected, \n"
-"and all extruders must have the same diameter.\n"
-"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?"
-msgstr ""
-"Materiale multiplo a singolo estrusore selezionato,\n"
-"tutti gli estrusori devono avere lo stesso diametro.\n"
-"Vuoi modificare il diametro di tutti gli estrusori al valore del diametro dell'ugello del primo estrusore?"
+msgid "Single Extruder Multi Material is selected, \nand all extruders must have the same diameter.\nDo you want to change the diameter for all extruders to first extruder nozzle diameter value?"
+msgstr "Materiale multiplo a singolo estrusore selezionato,\ntutti gli estrusori devono avere lo stesso diametro.\nVuoi modificare il diametro di tutti gli estrusori al valore del diametro dell'ugello del primo estrusore?"
#: src/slic3r/GUI/Tab.cpp:2307
msgid "Single extruder multimaterial parameters"
@@ -7291,7 +7223,7 @@ msgid "stealth mode"
msgstr "modalità silenziosa"
#: src/slic3r/GUI/Plater.cpp:4985
-#, c-format
+#, possible-c-format
msgid "STL file exported to %s"
msgstr "File STL esportato in %s"
@@ -7442,12 +7374,8 @@ msgid "Supports stealth mode"
msgstr "Supporto modalità silenziosa"
#: src/slic3r/GUI/ConfigManipulation.cpp:159
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters"
-msgstr ""
-"I supporti funzionano meglio se le la seguente funzione è attivata:\n"
-"- Rileva perimetri ponte"
+msgid "Supports work better, if the following feature is enabled:\n- Detect bridging perimeters"
+msgstr "I supporti funzionano meglio se le la seguente funzione è attivata:\n- Rileva perimetri ponte"
#: src/slic3r/GUI/Preferences.cpp:87
msgid "Suppress \" - default - \" presets"
@@ -7482,27 +7410,17 @@ msgid "Switch to Preview"
msgstr "Passa ad Anteprima"
#: src/slic3r/GUI/wxExtensions.cpp:703
-#, c-format
+#, possible-c-format
msgid "Switch to the %s mode"
msgstr "Passa alla modalità %s"
#: src/slic3r/GUI/GUI_App.cpp:882
-msgid ""
-"Switching the language will trigger application restart.\n"
-"You will lose content of the plater."
-msgstr ""
-"Il cambio della lingua necessita il riavvio dell'applicazione.\n"
-"Verrà cancellato il contenuto del piano."
+msgid "Switching the language will trigger application restart.\nYou will lose content of the plater."
+msgstr "Il cambio della lingua necessita il riavvio dell'applicazione.\nVerrà cancellato il contenuto del piano."
#: src/slic3r/GUI/WipeTowerDialog.cpp:365
-msgid ""
-"Switching to simple settings will discard changes done in the advanced mode!\n"
-"\n"
-"Do you want to proceed?"
-msgstr ""
-"Cambiare alle impostazioni semplici eliminerà tutte le modifiche fatte alle impostazioni complesse!\n"
-"\n"
-"Procedere?"
+msgid "Switching to simple settings will discard changes done in the advanced mode!\n\nDo you want to proceed?"
+msgstr "Cambiare alle impostazioni semplici eliminerà tutte le modifiche fatte alle impostazioni complesse!\n\nProcedere?"
#: src/slic3r/GUI/Tab.cpp:1014
msgid "symbolic profile name"
@@ -7567,27 +7485,22 @@ msgid "The %1% infill pattern is not supposed to work at 100%% density."
msgstr "La trama di riempimento %1% non è fatta per lavorare con densità al 100%%."
#: src/slic3r/GUI/FirmwareDialog.cpp:548
-#, c-format
+#, possible-c-format
msgid "The %s device could not have been found"
msgstr "Il dispositivo %s non è stato trovato"
#: src/slic3r/GUI/FirmwareDialog.cpp:436
-#, c-format
-msgid ""
-"The %s device was not found.\n"
-"If the device is connected, please press the Reset button next to the USB connector ..."
-msgstr ""
-"Il dispositivo %s non è stato trovato.\n"
-"Se il dispositivo è connesso, premi il pulsante Reset vicino al connettore USB ..."
+#, possible-c-format
+msgid "The %s device was not found.\nIf the device is connected, please press the Reset button next to the USB connector ..."
+msgstr "Il dispositivo %s non è stato trovato.\nSe il dispositivo è connesso, premi il pulsante Reset vicino al connettore USB ..."
+
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "Il preset personalizzato corrente sarà staccato dal preset del sistema padre."
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
-msgid ""
-"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
-"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n"
-"once the rotation is embedded into the object coordinates."
-msgstr ""
-"L'oggetto modificato corrente è inclinato (angoli di rotazione non multipli di 90°).\n"
-"Un ridimensionamento non uniforme di un oggetto inclinato è possibile solamente su un sistema di coordinate reali, non appena la rotazione è inclusa nelle coordinate dell'oggetto."
+msgid "The currently manipulated object is tilted (rotation angles are not multiples of 90°).\nNon-uniform scaling of tilted objects is only possible in the World coordinate system,\nonce the rotation is embedded into the object coordinates."
+msgstr "L'oggetto modificato corrente è inclinato (angoli di rotazione non multipli di 90°).\nUn ridimensionamento non uniforme di un oggetto inclinato è possibile solamente su un sistema di coordinate reali, non appena la rotazione è inclusa nelle coordinate dell'oggetto."
#: src/libslic3r/PrintConfig.cpp:2726
msgid "The default angle for connecting support sticks and junctions."
@@ -7642,6 +7555,14 @@ msgstr "Il primo layer verrà ristretto sul piano XY dal valore configurato, cos
msgid "the following characters are not allowed:"
msgstr "non sono permessi i seguenti caratteri:"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "I seguenti modelli di stampante FFF non hanno nessun filamento selezionato:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "I seguenti modelli di stampante SLA non hanno nessun filamento selezionato:"
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "il seguente suffisso non è permesso:"
@@ -7695,14 +7616,8 @@ msgid "The object will be raised by this number of layers, and support material
msgstr "L'oggetto verrà sollevato per questo numero di layer e verrà generato il materiale di supporto al di sotto di esso."
#: src/libslic3r/PrintConfig.cpp:2424
-msgid ""
-"The percentage of the bed area. \n"
-"If the print area exceeds the specified value, \n"
-"then a slow tilt will be used, otherwise - a fast tilt"
-msgstr ""
-"La percentuale dell'area del piano.\n"
-"Se l'area di stampa supera un determinato valore,\n"
-"verrà utilizzata l'inclinazione lenta, in caso contrario - l'inclinazione veloce"
+msgid "The percentage of the bed area. \nIf the print area exceeds the specified value, \nthen a slow tilt will be used, otherwise - a fast tilt"
+msgstr "La percentuale dell'area del piano.\nSe l'area di stampa supera un determinato valore,\nverrà utilizzata l'inclinazione lenta, in caso contrario - l'inclinazione veloce"
#: src/slic3r/GUI/GUI_App.cpp:932
msgid "The presets on the following tabs were modified"
@@ -7736,19 +7651,13 @@ msgstr "L'oggetto selezionato non può essere diviso perché contiene più di un
msgid "The selected object couldn't be split because it contains only one part."
msgstr "L'oggetto selezionato non può essere diviso perché contiene solo una parte."
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "Il progetto selezionato non è più disponibile"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid "The selected project is no longer available.\nDo you want to remove it from the recent projects list?"
+msgstr "Il progetto selezionato non è più disponibile.\nVuoi rimuoverlo dall'elenco dei progetti recenti?"
#: src/slic3r/GUI/DoubleSlider.cpp:998
-msgid ""
-"The sequential print is on.\n"
-"It's impossible to apply any custom G-code for objects printing sequentually.\n"
-"This code won't be processed during G-code generation."
-msgstr ""
-"La stampa sequenziale è attiva.\n"
-"Non è possibile applicare alcun G-code personalizzato per oggetti con stampa sequenziale.\n"
-"Questo codice non sarà processato durante la generazione del G-code."
+msgid "The sequential print is on.\nIt's impossible to apply any custom G-code for objects printing sequentually.\nThis code won't be processed during G-code generation."
+msgstr "La stampa sequenziale è attiva.\nNon è possibile applicare alcun G-code personalizzato per oggetti con stampa sequenziale.\nQuesto codice non sarà processato durante la generazione del G-code."
#: src/libslic3r/PrintConfig.cpp:2846
msgid "The slope of the pad wall relative to the bed plane. 90 degrees means straight walls."
@@ -7764,22 +7673,8 @@ msgstr "Velocità delle retrazioni (si applica solamente al motore dell'estrusor
#: src/slic3r/GUI/ConfigManipulation.cpp:81
#, no-c-format
-msgid ""
-"The Spiral Vase mode requires:\n"
-"- one perimeter\n"
-"- no top solid layers\n"
-"- 0% fill density\n"
-"- no support material\n"
-"- Ensure vertical shell thickness enabled\n"
-"- Detect thin walls disabled"
-msgstr ""
-"La modalità Vaso a spirale necessita:\n"
-"-un solo perimetro\n"
-"-nessun layer solido superiore\n"
-"-densità riempimento 0%\n"
-"-nessun materiale di supporto\n"
-"-Mantieni spessore guscio verticale attivo\n"
-"-Rileva perimetri sottili disattivo"
+msgid "The Spiral Vase mode requires:\n- one perimeter\n- no top solid layers\n- 0% fill density\n- no support material\n- Ensure vertical shell thickness enabled\n- Detect thin walls disabled"
+msgstr "La modalità Vaso a spirale necessita:\n-un solo perimetro\n-nessun layer solido superiore\n-densità riempimento 0%\n-nessun materiale di supporto\n-Mantieni spessore guscio verticale attivo\n-Rileva perimetri sottili disattivo"
#: src/libslic3r/Print.cpp:1237
msgid "The Spiral Vase option can only be used when printing a single object."
@@ -7816,24 +7711,15 @@ msgid "The vertical distance between object and support material interface. Sett
msgstr "Distanza verticale tra oggetto e interfaccia del materiale di supporto. Impostando questo valore a 0 eviterà che Slic3r utilizzi il flusso e velocità bridge per il primo layer dell'oggetto."
#: src/slic3r/GUI/Tab.cpp:2575
-msgid ""
-"The Wipe option is not available when using the Firmware Retraction mode.\n"
-"\n"
-"Shall I disable it in order to enable Firmware Retraction?"
-msgstr ""
-"La funzione Wipe non è disponibile quando si usa la modalità Retrazione Firmware.\n"
-"\n"
-"Devo disattivarla per poter abilitare la Retrazione Firmware?"
+msgid "The Wipe option is not available when using the Firmware Retraction mode.\n\nShall I disable it in order to enable Firmware Retraction?"
+msgstr "La funzione Wipe non è disponibile quando si usa la modalità Retrazione Firmware.\n\nDevo disattivarla per poter abilitare la Retrazione Firmware?"
#: src/libslic3r/Print.cpp:1268
msgid "The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)."
msgstr "La Torre di Spurgo attualmente non supporta la volumetrica E (use_volumetric_e=0)."
#: src/slic3r/GUI/ConfigManipulation.cpp:115
-msgid ""
-"The Wipe Tower currently supports the non-soluble supports only\n"
-"if they are printed with the current extruder without triggering a tool change.\n"
-"(both support_material_extruder and support_material_interface_extruder need to be set to 0)."
+msgid "The Wipe Tower currently supports the non-soluble supports only\nif they are printed with the current extruder without triggering a tool change.\n(both support_material_extruder and support_material_interface_extruder need to be set to 0)."
msgstr "La Torre di Spurgo attualmente è compatibile con i supporti non solubili solamente se questi sono stampati con l'attuale estrusore senza l'innesco di un cambio attrezzo. (entrambi support_material_extruder e support_material_interface_extruder devono essere impostati a 0)."
#: src/libslic3r/Print.cpp:1400
@@ -7881,34 +7767,26 @@ msgid "There are unprintable objects. Try to adjust support settings to make the
msgstr "Sono presenti oggetti non stampabili. Prova a regolare le impostazioni dei supporti per rendere gli oggetti stampabili."
#: src/slic3r/GUI/DoubleSlider.cpp:1030
-msgid ""
-"There is a color change for extruder that has not been used before.\n"
-"Check your settings to avoid redundant color changes."
-msgstr ""
-"È presente un cambio colore per l'estrusore che non è stato usato prima.\n"
-"Controlla le impostazioni per evitare cambi colore ridondanti."
+msgid "There is a color change for extruder that has not been used before.\nCheck your settings to avoid redundant color changes."
+msgstr "È presente un cambio colore per l'estrusore che non è stato usato prima.\nControlla le impostazioni per evitare cambi colore ridondanti."
#: src/slic3r/GUI/DoubleSlider.cpp:1024
-msgid ""
-"There is a color change for extruder that won't be used till the end of print job.\n"
-"This code won't be processed during G-code generation."
-msgstr ""
-"È presente un cambio colore per l'estrusore che non sarà utilizzato fino alla fine del lavoro di stampa.\n"
-"Questo codice non sarà processato durante la generazione del G-code."
+msgid "There is a color change for extruder that won't be used till the end of print job.\nThis code won't be processed during G-code generation."
+msgstr "È presente un cambio colore per l'estrusore che non sarà utilizzato fino alla fine del lavoro di stampa.\nQuesto codice non sarà processato durante la generazione del G-code."
#: src/slic3r/GUI/DoubleSlider.cpp:1027
-msgid ""
-"There is an extruder change set to the same extruder.\n"
-"This code won't be processed during G-code generation."
-msgstr ""
-"È presente un cambio estrusore impostato nello stesso estrusore.\n"
-"Questo codice non verrà processato durante la generazione del G-code."
+msgid "There is an extruder change set to the same extruder.\nThis code won't be processed during G-code generation."
+msgstr "È presente un cambio estrusore impostato nello stesso estrusore.\nQuesto codice non verrà processato durante la generazione del G-code."
#: src/slic3r/GUI/UpdateDialogs.cpp:225
-#, c-format
+#, possible-c-format
msgid "This %s version: %s"
msgstr "%s versione: %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid "This action is not revertable.\nDo you want to proceed?"
+msgstr "Questa azione non è reversibile.\nVuoi continuare?"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "Questo codice è inserito tra gli oggetti quando si utilizza una stampa sequenziale. Come predefinito, la temperatura di estrusione e del piano sono resettate con il comando non-attesa; in ogni caso se nel codice personalizzato vengono rilevati i comandi M104,M109,M140 o M190, Slic3r non aggiungerà i comandi di temperatura. Si fa presente che puoi usare variabili sostitutive per tutte le impostazioni di Slic3r, quindi puoi inserire un comando \"M109 S[first_layer_temperature]\" quando preferisci."
@@ -7982,30 +7860,13 @@ msgid "This file cannot be loaded in a simple mode. Do you want to switch to an
msgstr "Non è possibile caricare questo file in modalità semplice. Si desidera passare alla modalità avanzata?"
#: src/slic3r/GUI/Plater.cpp:2357
-msgid ""
-"This file contains several objects positioned at multiple heights.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"this file as a single object having multiple parts?"
-msgstr ""
-"Questo file contiene numerosi oggetti posizionati ad altezze multiple. Invece di considerarli come oggetti multipli, devo considerare \n"
-"questo file come un oggetto singolo con parti multiple?"
+msgid "This file contains several objects positioned at multiple heights.\nInstead of considering them as multiple objects, should I consider\nthis file as a single object having multiple parts?"
+msgstr "Questo file contiene numerosi oggetti posizionati ad altezze multiple. Invece di considerarli come oggetti multipli, devo considerare \nquesto file come un oggetto singolo con parti multiple?"
#: src/slic3r/GUI/FirmwareDialog.cpp:332
-#, c-format
-msgid ""
-"This firmware hex file does not match the printer model.\n"
-"The hex file is intended for: %s\n"
-"Printer reported: %s\n"
-"\n"
-"Do you want to continue and flash this hex file anyway?\n"
-"Please only continue if you are sure this is the right thing to do."
-msgstr ""
-"Questo file hex di firmware non è corretto per il modello della stampante. \n"
-"Il file hex è per: %s\n"
-"La stampante è: %s\n"
-"\n"
-"Vuoi continuare ed installare il firmware comunque?\n"
-"Continua solo se sei certo che sia la cosa giusta da fare."
+#, possible-c-format
+msgid "This firmware hex file does not match the printer model.\nThe hex file is intended for: %s\nPrinter reported: %s\n\nDo you want to continue and flash this hex file anyway?\nPlease only continue if you are sure this is the right thing to do."
+msgstr "Questo file hex di firmware non è corretto per il modello della stampante. \nIl file hex è per: %s\nLa stampante è: %s\n\nVuoi continuare ed installare il firmware comunque?\nContinua solo se sei certo che sia la cosa giusta da fare."
#: src/libslic3r/PrintConfig.cpp:314
msgid "This flag enables the automatic cooling logic that adjusts print speed and fan speed according to layer printing time."
@@ -8077,7 +7938,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "Questa è l'altezza minima stampabile per questo estrusore e limita la risoluzione per l'altezza variabile dei layer. Valori tipici sono compresi tra 0.05 mm e 0.1 mm."
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "Questo solitamente è causato da estrusioni molto piccole o da un modello difettoso. Provare a riparare il modello o cambiare il suo orientamento sul piano."
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8085,12 +7946,8 @@ msgid "This matrix describes volumes (in cubic milimetres) required to purge the
msgstr "Questa matrice descrive il volume (in millimetri cubici) necessario per spurgare il filamento nella torre di spurgo per una qualunque coppia di attrezzi."
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:878
-msgid ""
-"This operation is irreversible.\n"
-"Do you want to proceed?"
-msgstr ""
-"Questa operazione è irreversibile.\n"
-"Vuoi continuare?"
+msgid "This operation is irreversible.\nDo you want to proceed?"
+msgstr "Questa operazione è irreversibile.\nVuoi continuare?"
#: src/libslic3r/PrintConfig.cpp:1442
msgid "This option sets the number of perimeters to generate for each layer. Note that Slic3r may increase this number automatically when it detects sloping surfaces which benefit from a higher number of perimeters if the Extra Perimeters option is enabled."
@@ -8153,17 +8010,9 @@ msgid "This vector saves required volumes to change from/to each tool used on th
msgstr "Questo vettore salva il volume necessario per cambiare da/a ogni attrezzo usato per la torre di spurgo. Questi valori vengono usati per semplificare la creazione dei volumi di spurgo completi."
#: src/slic3r/GUI/UpdateDialogs.cpp:216
-#, c-format
-msgid ""
-"This version of %s is not compatible with currently installed configuration bundles.\n"
-"This probably happened as a result of running an older %s after using a newer one.\n"
-"\n"
-"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s."
-msgstr ""
-"Questa versione di %s non è compatibile con gli attuali gruppi di configurazioni installati.\n"
-"Probabilmente è causato dall'esecuzione di una vecchia versione di %s dopo averne utilizzata una più recente.\n"
-"\n"
-"Prova a chiudere %s e riprovare con una versione più recente, o prova ad effettuare nuovamente la configurazione iniziale. Così facendo creerai un'istantanea di backup della configurazione esistente prima di istallare i file compatibili con questo %s."
+#, possible-c-format
+msgid "This version of %s is not compatible with currently installed configuration bundles.\nThis probably happened as a result of running an older %s after using a newer one.\n\nYou may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s."
+msgstr "Questa versione di %s non è compatibile con gli attuali gruppi di configurazioni installati.\nProbabilmente è causato dall'esecuzione di una vecchia versione di %s dopo averne utilizzata una più recente.\n\nProva a chiudere %s e riprovare con una versione più recente, o prova ad effettuare nuovamente la configurazione iniziale. Così facendo creerai un'istantanea di backup della configurazione esistente prima di istallare i file compatibili con questo %s."
#: src/libslic3r/PrintConfig.cpp:2458
msgid "This will apply a gamma correction to the rasterized 2D polygons. A gamma value of zero means thresholding with the threshold in the middle. This behaviour eliminates antialiasing without losing holes in polygons."
@@ -8221,8 +8070,12 @@ msgstr "In oggetti"
msgid "To parts"
msgstr "In parti"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Per utilizzare un file CA personalizzato, importa il tuo file CA sul Certificate Store / Keychain."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
-#, c-format
+#, possible-c-format
msgid "Toggle %c axis mirroring"
msgstr "Attiva / disattiva il mirroring dell'asse %c"
@@ -8319,7 +8172,7 @@ msgstr "Spostamento"
#: src/libslic3r/PrintConfig.cpp:845
msgid "Triangles"
-msgstr "Tiangoli"
+msgstr "Triangoli"
#: src/libslic3r/PrintConfig.cpp:3448
msgid "Try to repair any non-manifold meshes (this option is implicitly added whenever we need to slice the model to perform the requested action)."
@@ -8347,7 +8200,7 @@ msgid "Undo"
msgstr "Annulla"
#: src/slic3r/GUI/GLCanvas3D.cpp:4065
-#, c-format
+#, possible-c-format
msgid "Undo %1$d Action"
msgid_plural "Undo %1$d Actions"
msgstr[0] "Annulla %1$d Azione"
@@ -8388,21 +8241,15 @@ msgid "UNLOCKED LOCK"
msgstr "LUCCHETTO APERTO"
#: src/slic3r/GUI/Tab.cpp:3282
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n"
-"Click to reset all settings for current option group to the system (or default) values."
-msgstr ""
-"L'icona del LUCCHETTO APERTO indica che alcune impostazioni sono state modificate e non sono uguali ai valori di sistema (o predefinite) per il gruppo di opzioni corrente.\n"
-"Clicca qui per reimpostare tutte le impostazioni del gruppo corrente ai valori di sistema (o predefiniti)."
+msgid "UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\nClick to reset all settings for current option group to the system (or default) values."
+msgstr "L'icona del LUCCHETTO APERTO indica che alcune impostazioni sono state modificate e non sono uguali ai valori di sistema (o predefinite) per il gruppo di opzioni corrente.\nClicca qui per reimpostare tutte le impostazioni del gruppo corrente ai valori di sistema (o predefiniti)."
#: src/slic3r/GUI/Tab.cpp:3297
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n"
-"Click to reset current value to the system (or default) value."
+msgid "UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\nClick to reset current value to the system (or default) value."
msgstr "L'icona del LUCCHETTO APERTO indica che il valore è stato cambiato e non è uguale al valore di sistema (o predefinito). Clicca per reimpostare il valore corrente al valore di sistema (o predefinito)."
#: src/slic3r/GUI/Plater.cpp:5203
-#, c-format
+#, possible-c-format
msgid "Unmounting successful. The device %s(%s) can now be safely removed from the computer."
msgstr "Espulsione riuscita. Il dispositivo %s(%s) adesso può essere rimosso in sicurezza dal computer."
@@ -8451,7 +8298,7 @@ msgid "Unsupported selection"
msgstr "Selezione non supportata"
#: src/slic3r/GUI/GLCanvas3D.cpp:955
-#, c-format
+#, possible-c-format
msgid "up to %.2f mm"
msgstr "fino a %.2f mm"
@@ -8713,12 +8560,12 @@ msgid "Welcome"
msgstr "Benvenuto"
#: src/slic3r/GUI/ConfigWizard.cpp:427
-#, c-format
+#, possible-c-format
msgid "Welcome to the %s Configuration Assistant"
msgstr "Benvenuto nell'Assistente di Configurazione di %s"
#: src/slic3r/GUI/ConfigWizard.cpp:429
-#, c-format
+#, possible-c-format
msgid "Welcome to the %s Configuration Wizard"
msgstr "Benvenuto nella Configurazione Guidata di %s"
@@ -8884,18 +8731,8 @@ msgid "World coordinates"
msgstr "Coordinate reali"
#: src/slic3r/GUI/UpdateDialogs.cpp:92
-msgid ""
-"Would you like to install it?\n"
-"\n"
-"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"Vuoi installarlo?\n"
-"\n"
-"Nota: verrà prima creata un'istantanea della configurazione completa. Potrà essere ripristinata in qualunque momento se dovessero presentarsi problemi con la nuova versione.\n"
-"\n"
-"Gruppo di configurazioni aggiornate:"
+msgid "Would you like to install it?\n\nNote that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n\nUpdated configuration bundles:"
+msgstr "Vuoi installarlo?\n\nNota: verrà prima creata un'istantanea della configurazione completa. Potrà essere ripristinata in qualunque momento se dovessero presentarsi problemi con la nuova versione.\n\nGruppo di configurazioni aggiornate:"
#: src/libslic3r/Zipper.cpp:92
msgid "write calledback failed"
@@ -8962,7 +8799,7 @@ msgid "You can't change a type of the last solid part of the object."
msgstr "Non è possibile modificare il tipo dell'ultima parte solida dell'oggetto."
#: src/slic3r/GUI/Plater.cpp:2390
-#, c-format
+#, possible-c-format
msgid "You can't to add the object(s) from %s because of one or some of them is(are) multi-part"
msgstr "Non è possibile aggiungere oggetti da %s perché uno o più sono multi-parte"
@@ -8974,14 +8811,6 @@ msgstr "Non è possibile caricare un progetto SLA con un oggetto multi-parte sul
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "Non è possibile utilizzare la modalità di ridimensionamento non uniforme per una selezione di più oggetti/parti"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "Devi selezionare almeno un filamento per le stampanti selezionate"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "Devi selezionare almeno un materiale per le stampanti selezionate"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "Dovresti aggiornare i driver della scheda video."
@@ -8991,12 +8820,12 @@ msgid "You must install a configuration update."
msgstr "È necessario installare un aggiornamento della configurazione."
#: src/slic3r/GUI/Preferences.cpp:172
-#, c-format
+#, possible-c-format
msgid "You need to restart %s to make the changes effective."
msgstr "È necessario riavviare %s per rendere effettive le modifiche."
#: src/slic3r/GUI/GUI_ObjectList.cpp:3421
-#, c-format
+#, possible-c-format
msgid "You started your selection with %s Item."
msgstr "Hai iniziato la selezione con %s elementi."
@@ -9021,24 +8850,12 @@ msgid "Z offset"
msgstr "Offset Z"
#: src/slic3r/GUI/ConfigManipulation.cpp:60
-msgid ""
-"Zero first layer height is not valid.\n"
-"\n"
-"The first layer height will be reset to 0.01."
-msgstr ""
-"Altezza primo layer a zero non è valida.\n"
-"\n"
-"L'altezza del primo layer verrà reimpostata a 0.01."
+msgid "Zero first layer height is not valid.\n\nThe first layer height will be reset to 0.01."
+msgstr "Altezza primo layer a zero non è valida.\n\nL'altezza del primo layer verrà reimpostata a 0.01."
#: src/slic3r/GUI/ConfigManipulation.cpp:48
-msgid ""
-"Zero layer height is not valid.\n"
-"\n"
-"The layer height will be reset to 0.01."
-msgstr ""
-"Altezza layer zero non valida.\n"
-"\n"
-"L'altezza layer verrà reimpostata a 0.01."
+msgid "Zero layer height is not valid.\n\nThe layer height will be reset to 0.01."
+msgstr "Altezza layer zero non valida.\n\nL'altezza layer verrà reimpostata a 0.01."
#: src/libslic3r/PrintConfig.cpp:2667
msgid "Zig-Zag"
@@ -9062,12 +8879,8 @@ msgid "Zoom to Bed"
msgstr "Zoom sul piano"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
-msgid ""
-"Zoom to selected object\n"
-"or all objects in scene, if none selected"
-msgstr ""
-"Zoom sull'oggetto selezionato\n"
-"o tutti gli oggetti in scena, se nessuno è selezionato"
+msgid "Zoom to selected object\nor all objects in scene, if none selected"
+msgstr "Zoom sull'oggetto selezionato\no tutti gli oggetti in scena, se nessuno è selezionato"
#: src/libslic3r/PrintConfig.cpp:207 src/libslic3r/PrintConfig.cpp:780
#: src/libslic3r/PrintConfig.cpp:1640 src/libslic3r/PrintConfig.cpp:1650
diff --git a/resources/localization/ja/PrusaSlicer.mo b/resources/localization/ja/PrusaSlicer.mo
index 9211b25b0f..14198bdb7a 100644
Binary files a/resources/localization/ja/PrusaSlicer.mo and b/resources/localization/ja/PrusaSlicer.mo differ
diff --git a/resources/localization/ja/PrusaSlicer_ja.po b/resources/localization/ja/PrusaSlicer_ja.po
index 1db540918b..b136ba0daa 100644
--- a/resources/localization/ja/PrusaSlicer_ja.po
+++ b/resources/localization/ja/PrusaSlicer_ja.po
@@ -5,12 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2.1\n"
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"X-Generator: PhraseApp (phraseapp.com)\n"
#: src/slic3r/GUI/MainFrame.cpp:66
msgid " - Remember to check for updates at http://github.com/prusa3d/PrusaSlicer/releases"
@@ -28,7 +23,7 @@ msgid "%"
msgstr "%"
#: src/slic3r/GUI/GLCanvas3D.cpp:963
-#, c-format
+#, possible-c-format
msgid "%.2f - %.2f mm"
msgstr "%.2f〜%.2f mm"
@@ -46,119 +41,97 @@ msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
msgstr "%1%=%2% mmはレイヤーの高さ%3% mmでプリントするには低すぎます"
#: src/slic3r/GUI/PresetHints.cpp:229
-#, c-format
+#, possible-c-format
msgid "%3.2f mm³/s at filament speed %3.2f mm/s."
msgstr "フィラメント速度%3.2f mm/sで%3.2f mm³/ s。"
#: src/slic3r/GUI/Plater.cpp:1152
-#, c-format
+#, possible-c-format
msgid "%d (%d shells)"
msgstr "%d (%d 領域)"
#: src/slic3r/GUI/Plater.cpp:1160
-#, c-format
+#, possible-c-format
msgid "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d facets reversed, %d backwards edges"
msgstr "%d縮退ファセット、%dエッジ修正、%dファセット削除、%dファセット追加、%dファセット反転、%d後方エッジ"
#: src/slic3r/GUI/PresetHints.cpp:270
-#, c-format
+#, possible-c-format
msgid "%d lines: %.2f mm"
msgstr "%dライン：%.2f mm"
#: src/slic3r/GUI/MainFrame.cpp:1027
-#, c-format
+#, possible-c-format
msgid "%d presets successfully imported."
msgstr "%d プリセットを正常にインポートしました。"
#: src/slic3r/GUI/MainFrame.cpp:692
-#, c-format
+#, possible-c-format
msgid "%s &Website"
msgstr "%s &Webサイト"
#: src/slic3r/GUI/UpdateDialogs.cpp:211
-#, c-format
+#, possible-c-format
msgid "%s configuration is incompatible"
msgstr "%s構成に互換性がありません"
#: src/slic3r/GUI/Field.cpp:175
-#, c-format
+#, possible-c-format
msgid "%s doesn't support percentage"
msgstr "%sは比率をサポートしていません"
#: src/slic3r/GUI/MsgDialog.cpp:73
-#, c-format
+#, possible-c-format
msgid "%s error"
msgstr "%sエラー"
#: src/slic3r/GUI/ConfigWizard.cpp:481
-#, c-format
+#, possible-c-format
msgid "%s Family"
msgstr "%sファミリー"
#: src/slic3r/GUI/MsgDialog.cpp:74
-#, c-format
+#, possible-c-format
msgid "%s has encountered an error"
msgstr "%sでエラーが発生しました"
#: src/slic3r/GUI/GUI_App.cpp:138
-#, c-format
-msgid ""
-"%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n"
-"\n"
-"The application will now terminate."
-msgstr ""
-"%sでエラーが発生しました。 メモリ不足が原因である可能性があります。 システムに十分なRAMがあるのにこのエラーが発生している場合、バグの可能性がありますので、ご報告いただければ幸いです。\n"
-"\n"
-"これで、アプリケーションは終了します。"
+#, possible-c-format
+msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it.\n\nThe application will now terminate."
+msgstr "%sでエラーが発生しました。 メモリ不足が原因である可能性があります。 システムに十分なRAMがあるのにこのエラーが発生している場合、バグの可能性がありますので、ご報告いただければ幸いです。\n\nこれで、アプリケーションは終了します。"
#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:222
-#, c-format
+#, possible-c-format
msgid "%s has encountered an error. It was likely caused by running out of memory. If you are sure you have enough RAM on your system, this may also be a bug and we would be glad if you reported it."
msgstr "%sでエラーが発生しました。 メモリ不足の可能性があります。 システムに十分な空きメモリー領域があるのに発生した場合、バグの可能性がありますので、ご報告いただければ幸いです。"
#: src/slic3r/GUI/UpdateDialogs.cpp:308
-#, c-format
+#, possible-c-format
msgid "%s has no configuration updates available."
msgstr "%sには使用可能な構成の更新がありません。"
#: src/slic3r/GUI/UpdateDialogs.cpp:148 src/slic3r/GUI/UpdateDialogs.cpp:210
-#, c-format
+#, possible-c-format
msgid "%s incompatibility"
msgstr "%sと互換性がありません"
#: src/slic3r/GUI/UpdateDialogs.cpp:270
-#, c-format
-msgid ""
-"%s now uses an updated configuration structure.\n"
-"\n"
-"So called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\n"
-"An inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n"
-"\n"
-"Please proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates."
+#, possible-c-format
+msgid "%s now uses an updated configuration structure.\n\nSo called 'System presets' have been introduced, which hold the built-in default settings for various printers. These System presets cannot be modified, instead, users now may create their own presets inheriting settings from one of the System presets.\nAn inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\nPlease proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates."
msgstr "%sは、更新された構成を使用するようになりました。さまざまなプリンターのデフォルト設定を含む、いわゆる「システムプリセット」が導入されました。 これらのシステムプリセットは変更できません。代わりに、ユーザーはシステムプリセットの1つから設定を継承して独自のプリセットを作成できます。新しく作成されたプリセットは、その前身から値を継承するか、変更された値で上書きできます。%sの指示に従って新しい設定を行い、自動プリセット更新を有効にするかどうかを選択します。"
#: src/slic3r/GUI/GUI_App.cpp:820
-#, c-format
+#, possible-c-format
msgid "%s View Mode"
msgstr "%s表示モード"
#: src/slic3r/GUI/UpdateDialogs.cpp:151
-#, c-format
-msgid ""
-"%s will now start updates. Otherwise it won't be able to start.\n"
-"\n"
-"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"%sは更新を開始します。 そうしないと、実行できません。\n"
-" \n"
-"最初に、構成の完全なスナップショットが作成され、新しいバージョンに問題がある場合は回復できます。\n"
-" \n"
-"更新された構成パッケージ："
+#, possible-c-format
+msgid "%s will now start updates. Otherwise it won't be able to start.\n\nNote that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n\nUpdated configuration bundles:"
+msgstr "%sは更新を開始します。 そうしないと、実行できません。\n \n最初に、構成の完全なスナップショットが作成され、新しいバージョンに問題がある場合は回復できます。\n \n更新された構成パッケージ："
#: src/slic3r/GUI/MainFrame.cpp:705
-#, c-format
+#, possible-c-format
msgid "&About %s"
msgstr "%sについて(&A)"
@@ -315,7 +288,7 @@ msgid "3Dconnexion settings"
msgstr "3Dconnexion設定"
#: src/slic3r/GUI/Plater.cpp:5038
-#, c-format
+#, possible-c-format
msgid "3MF file exported to %s"
msgstr "3MFファイルを%sにエクスポートしました"
@@ -331,6 +304,10 @@ msgstr "アクティブなプリントプロファイルの構成値を使用す
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "アクティブなプリンタープロファイルの構成値を使った論理式です。 この論理式が真の場合、このプロファイルはアクティブなプリンタープロファイルと互換性があると見なされます。"
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "現在のシステムプリセットからコピーを作成し、システムプリセットから切り離します。"
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "一般的には、PLAは160〜230℃、ABSは215〜250℃です。"
@@ -344,12 +321,12 @@ msgid "A toolpath outside the print area was detected"
msgstr "プリント可能範囲外のツールパスが検出されました"
#: src/slic3r/GUI/AboutDialog.cpp:199
-#, c-format
+#, possible-c-format
msgid "About %s"
msgstr "%sについて"
#: src/slic3r/GUI/GLCanvas3D.cpp:959
-#, c-format
+#, possible-c-format
msgid "above %.2f mm"
msgstr "%.2fmm以上"
@@ -660,14 +637,12 @@ msgid "Alternate nozzles:"
msgstr "代替ノズル:"
#: src/slic3r/GUI/Plater.cpp:5002
-#, c-format
+#, possible-c-format
msgid "AMF file exported to %s"
msgstr "%sにエクスポートされたAMFファイル"
#: src/slic3r/GUI/GLCanvas3D.cpp:690
-msgid ""
-"An object outside the print area was detected\n"
-"Resolve the current problem to continue slicing"
+msgid "An object outside the print area was detected\nResolve the current problem to continue slicing"
msgstr "プリント領域外のオブジェクトが検出されました。スライスを続行するには、この問題を解決してください"
#: src/slic3r/GUI/GLCanvas3D.cpp:685
@@ -722,12 +697,8 @@ msgid "Are you sure you want to %1% the selected preset?"
msgstr "%1%のプリセットを選択してよろしいですか？"
#: src/slic3r/GUI/FirmwareDialog.cpp:902
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"ファームウェアの書込みをキャンセルしてもよろしいですか？\n"
-"これにより、プリンターが使用できない状態になる可能性があります！"
+msgid "Are you sure you want to cancel firmware flashing?\nThis could leave your printer in an unusable state!"
+msgstr "ファームウェアの書込みをキャンセルしてもよろしいですか？\nこれにより、プリンターが使用できない状態になる可能性があります！"
#: src/slic3r/GUI/DoubleSlider.cpp:1903 src/slic3r/GUI/DoubleSlider.cpp:1924
msgid "Are you sure you want to continue?"
@@ -815,12 +786,12 @@ msgid "Auto-generate points"
msgstr "自動ポイント生成"
#: src/slic3r/GUI/Plater.cpp:1157
-#, c-format
+#, possible-c-format
msgid "Auto-repaired (%d errors)"
msgstr "自動修復( エラー: %d)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:339
-#, c-format
+#, possible-c-format
msgid "Auto-repaired (%d errors):"
msgstr "自動修正（エラー：%d）:"
@@ -861,20 +832,12 @@ msgid "BACK ARROW"
msgstr "戻る矢印"
#: src/slic3r/GUI/Tab.cpp:3290
-msgid ""
-"BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
-"Click to reset all settings for the current option group to the last saved preset."
-msgstr ""
-"戻る矢印アイコンは、現在の設定グループが最後に保存されたプリセットとは異なる設定に変更されたことを示します。\n"
-"クリックすると、現在の設定グループのすべての設定が最後に保存されたプリセットに戻されます。"
+msgid "BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\nClick to reset all settings for the current option group to the last saved preset."
+msgstr "戻る矢印アイコンは、現在の設定グループが最後に保存されたプリセットとは異なる設定に変更されたことを示します。\nクリックすると、現在の設定グループのすべての設定が最後に保存されたプリセットに戻されます。"
#: src/slic3r/GUI/Tab.cpp:3304
-msgid ""
-"BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\n"
-"Click to reset current value to the last saved preset."
-msgstr ""
-"戻る矢印アイコンは、値が変更され、最後に保存されたプリセットと等しくないことを示します。\n"
-"クリックすると、現在の値が最後に保存されたプリセットにリセットされます。"
+msgid "BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\nClick to reset current value to the last saved preset."
+msgstr "戻る矢印アイコンは、値が変更され、最後に保存されたプリセットと等しくないことを示します。\nクリックすると、現在の値が最後に保存されたプリセットにリセットされます。"
#: src/slic3r/GUI/Preferences.cpp:55
msgid "Background processing"
@@ -1080,6 +1043,18 @@ msgstr "取り消し中..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "%1%の押出し幅を計算できません：変数 \"%2%\"にアクセスできません。"
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid "Cannot insert a new layer range after the current layer range.\nCurrent layer range overlaps with the next layer range."
+msgstr "現在のレイヤー範囲の後に新しいレイヤー範囲を挿入できません。\n現在のレイヤー範囲は次のレイヤー範囲と重複しています。"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid "Cannot insert a new layer range after the current layer range.\nThe next layer range is too thin to be split to two\nwithout violating the minimum layer height."
+msgstr "現在のレイヤー範囲の後に新しいレイヤー範囲を挿入できません。\n次のレイヤー範囲は薄すぎて、\n最小レイヤー高さに違反せずに2つに分割できません。"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid "Cannot insert a new layer range between the current and the next layer range.\nThe gap between the current layer range and the next layer range\nis thinner than the minimum layer height allowed."
+msgstr "現在のレイヤー範囲と次のレイヤー範囲の間に新しいレイヤー範囲を挿入できません。\n現在のレイヤー範囲と次のレイヤー範囲の間のギャップは、\n許容される最小レイヤー高さよりも薄くなっています。"
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "システムプロファイルを上書きできません。"
@@ -1137,7 +1112,7 @@ msgid "Change Extruders"
msgstr "エクストルーダーの変更"
#: src/slic3r/GUI/GUI_ObjectSettings.cpp:152
-#, c-format
+#, possible-c-format
msgid "Change Option %s"
msgstr "オプション%s変更"
@@ -1258,7 +1233,7 @@ msgid "Color change (\"%1%\") for Extruder %2%"
msgstr "エクストルーダー%2%の色の変更（ \"%1%\"）"
#: src/slic3r/GUI/GLCanvas3D.cpp:995
-#, c-format
+#, possible-c-format
msgid "Color change for Extruder %d at %.2f mm"
msgstr "エクストルーダー %d の色のチェンジを %.2f mmで行う。"
@@ -1549,21 +1524,18 @@ msgid "Cubic"
msgstr "立方"
#: src/slic3r/GUI/wxExtensions.cpp:704
-#, c-format
+#, possible-c-format
msgid "Current mode is %s"
msgstr "現在のモードは%sです"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "現在のプリセット継承元"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "現在の設定はデフォルト設定から継承されます。"
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr "現在のプリセット継承元：%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "現在のバージョン:"
@@ -1671,7 +1643,7 @@ msgid "Default filament profile associated with the current printer profile. On
msgstr "現在のプリンタープロファイルに関連付けられているデフォルトのフィラメントプロファイル。 現在のプリンタープロファイルを選択すると、このフィラメントプロファイルがアクティブになります。"
#: src/slic3r/GUI/Tab.cpp:2919
-#, c-format
+#, possible-c-format
msgid "Default preset (%s)"
msgstr "デフォルトプリセット(%s)"
@@ -1776,7 +1748,7 @@ msgid "Delete Object"
msgstr "オブジェクト削除"
#: src/slic3r/GUI/GUI_ObjectSettings.cpp:101
-#, c-format
+#, possible-c-format
msgid "Delete Option %s"
msgstr "オプション%s削除"
@@ -1863,6 +1835,18 @@ msgstr "方形で選択解除"
msgid "Deselects all objects"
msgstr "全てのオブジェクトの選択解除"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "システムプリセットから取り外す"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "プリセットを切り離す"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "取り外しました"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "ブリッジ外周の検出"
@@ -2001,21 +1985,10 @@ msgid "Do not rearrange the given models before merging and keep their original
msgstr "元のXY座標を残して、マージする前にモデルを再配置しないでください。"
#: src/slic3r/GUI/Field.cpp:240
-#, c-format
-msgid ""
-"Do you mean %s%% instead of %s %s?\n"
-"Select YES if you want to change this value to %s%%, \n"
-"or NO if you are sure that %s %s is a correct value."
+#, possible-c-format
+msgid "Do you mean %s%% instead of %s %s?\nSelect YES if you want to change this value to %s%%, \nor NO if you are sure that %s %s is a correct value."
msgstr "%s%sではなく%s%%ですか？この値を%s %%に変更するなら「はい」を、%s%sでよろしいなら「いいえ」を選択してください。"
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "デフォルトのフィラメントを自動的に選択しますか？"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "デフォルトの材料を自動的に選択しますか？"
-
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "保存したツールの変更をすべて削除しますか？"
@@ -2032,6 +2005,14 @@ msgstr "リトライしますか"
msgid "Do you want to save your manually edited support points?"
msgstr "マニュアル編集したサポートポイントを保存しますか？"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "これらのFFFプリンターモデルのデフォルトフィラメントを選択しますか？"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "これらのプリンターモデルにデフォルトのSLAマテリアルを選択しますか？"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "整列させない"
@@ -2048,6 +2029,10 @@ msgstr "ブリッジ部のサポート禁止"
msgid "Downgrade"
msgstr "ダウングレード"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "保護シールド"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2123,6 +2108,23 @@ msgstr "マーカーの編集-マウスの右ボタン"
msgid "Editing"
msgstr "編集中"
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "SDカード/USBメモリーを取り出す(&t)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "SDカード/USBメモリーを取り出す"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "Gコードをエクスポートした後に、SDカード/USBメモリーを取り出します。"
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, possible-c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "デバイス %s(%s) の取り出しに失敗しました。"
+
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
msgstr "最初の層の広がり補正"
@@ -2260,7 +2262,7 @@ msgid "Error"
msgstr "エラー"
#: src/slic3r/GUI/FirmwareDialog.cpp:645
-#, c-format
+#, possible-c-format
msgid "Error accessing port at %s: %s"
msgstr "%sポートへのアクセスエラー：%s"
@@ -2269,12 +2271,12 @@ msgid "Error during reload"
msgstr "リロード中にエラー発生"
#: src/slic3r/GUI/Plater.cpp:5043
-#, c-format
+#, possible-c-format
msgid "Error exporting 3MF file %s"
msgstr "3MFファイル%sのエクスポートエラー"
#: src/slic3r/GUI/Plater.cpp:5005
-#, c-format
+#, possible-c-format
msgid "Error exporting AMF file %s"
msgstr "AMFファイル%sのエクスポートエラー"
@@ -2303,7 +2305,7 @@ msgid "Error! Invalid model"
msgstr "エラー!無効なモデル"
#: src/slic3r/GUI/FirmwareDialog.cpp:647
-#, c-format
+#, possible-c-format
msgid "Error: %s"
msgstr "エラー: %s"
@@ -2333,7 +2335,7 @@ msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm"
msgstr "ノズル径%3% mmで過剰な%1%=%2% mmをプリント可能"
#: src/slic3r/GUI/UpdateDialogs.cpp:191 src/slic3r/GUI/UpdateDialogs.cpp:246
-#, c-format
+#, possible-c-format
msgid "Exit %s"
msgstr "%s終了"
@@ -2413,6 +2415,10 @@ msgstr "現在のプレートをAMFとしてエクスポート"
msgid "Export current plate as G-code"
msgstr "現在のプレートをGコードとしてエクスポート"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "現在のプレートをGコードとしてSDカード/USBメモリーにエクスポート"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "現在のプレートをSTLとしてエクスポート"
@@ -2434,6 +2440,10 @@ msgstr "モデルのフルパス名とパーツソースを3mfおよびamfファ
msgid "Export G-code"
msgstr "Gコードのエクスポート"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "GコードをSDカード/USBメモリーにエクスポート"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "OBJのエクスポート"
@@ -2563,7 +2573,7 @@ msgstr "エクストルーダー"
#: src/slic3r/GUI/DoubleSlider.cpp:1134 src/slic3r/GUI/DoubleSlider.cpp:1170
#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1704
#: src/slic3r/GUI/Tab.cpp:2320 src/libslic3r/GCode/PreviewData.cpp:445
-#, c-format
+#, possible-c-format
msgid "Extruder %d"
msgstr "エクストルーダー %d"
@@ -2935,19 +2945,13 @@ msgid "For support enforcers only"
msgstr "強制サポートのみ"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
-msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr "左ボタンの場合：システム（デフォルト）プリセットでないことを示し、右側ボタンの場合：設定が変更されていないことを示します。"
+#: src/slic3r/GUI/Tab.cpp:3267
+msgid "for the left button: indicates a non-system (or non-default) preset,\nfor the right button: indicates that the settings hasn't been modified."
+msgstr "左ボタンの場合：システム（デフォルト）プリセットでないことを示し、\n右側ボタンの場合：設定が変更されていないことを示します。"
#: src/slic3r/GUI/ConfigManipulation.cpp:136
-msgid ""
-"For the Wipe Tower to work with the soluble supports, the support layers\n"
-"need to be synchronized with the object layers."
-msgstr ""
-"ワイプタワーを可溶性のサポートと連携させるには、\n"
-"サポートレイヤーをオブジェクトレイヤーと同期させる必要があります。"
+msgid "For the Wipe Tower to work with the soluble supports, the support layers\nneed to be synchronized with the object layers."
+msgstr "ワイプタワーを可溶性のサポートと連携させるには、\nサポートレイヤーをオブジェクトレイヤーと同期させる必要があります。"
#: src/libslic3r/Print.cpp:1396
msgid "For the Wipe Tower to work with the soluble supports, the support layers need to be synchronized with the object layers."
@@ -2990,12 +2994,8 @@ msgid "G-code"
msgstr "Gコード"
#: src/slic3r/GUI/DoubleSlider.cpp:1021
-msgid ""
-"G-code associated to this tick mark is in a conflict with print mode.\n"
-"Editing it will cause changes of Slider data."
-msgstr ""
-"このチェックマークに関連付けられているGコードは、プリントモードと競合しています。\n"
-"編集すると、スライダーデータが変更されます。"
+msgid "G-code associated to this tick mark is in a conflict with print mode.\nEditing it will cause changes of Slider data."
+msgstr "このチェックマークに関連付けられているGコードは、プリントモードと競合しています。\n編集すると、スライダーデータが変更されます。"
#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:130
msgid "G-code file exported to %1%"
@@ -3198,7 +3198,7 @@ msgid "Heights at which a filament change is to occur."
msgstr "フィラメントを切り替える高さ。"
#: src/slic3r/GUI/ConfigWizard.cpp:433
-#, c-format
+#, possible-c-format
msgid "Hello, welcome to %s! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
msgstr "こんにちは、%sへようこそ！ この%sは初期設定に役立ちます。 いくつかの設定を行うだけで、プリントの準備ができます。"
@@ -3320,9 +3320,7 @@ msgid "Hostname, IP or URL"
msgstr "ホスト名、IPアドレス、もしくはURL"
#: src/slic3r/GUI/Tab.cpp:139
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
+msgid "Hover the cursor over buttons to find more information \nor click this button."
msgstr "カーソルをボタンの上に置くと、詳細情報が表示されます。またはこのボタンをクリックします。"
#: src/libslic3r/PrintConfig.cpp:2812
@@ -3349,17 +3347,6 @@ msgstr "HTTPS CAファイル"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "HTTPS CAファイルはオプションです。 HTTPSを自己署名証明書で使用する場合にのみ必要です。"
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"HTTPS CAファイル：\n"
-" このシステムでは、%sはシステムの証明書ストアまたはキーチェーンからのHTTPS証明書を使用します。\n"
-" カスタムCAファイルを使用するには、CAファイルを証明書ストア/キーチェーンにインポートしてください。"
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "デフォルトのサイズと相対的なアイコンのサイズ"
@@ -3373,12 +3360,12 @@ msgid "If checked, supports will be generated automatically based on the overhan
msgstr "オンにすると、オーバーハングのしきい値に基づいてサポートが自動的に生成されます。 チェックしない場合、サポートは「強制サポート」ボリューム内でのみ生成されます。"
#: src/slic3r/GUI/ConfigWizard.cpp:773
-#, c-format
+#, possible-c-format
msgid "If enabled, %s checks for new application versions online. When a new version becomes available, a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done."
msgstr "有効にすると、%sはプログラムの新バージョンをオンラインでチェックします。 新しいバージョンが利用可能になると、次のアプリケーションの起動時にメッセージが表示されます（プログラムの使用中は表示されません）。 これは単なる通知であり、自動インストールは行われません。"
#: src/slic3r/GUI/ConfigWizard.cpp:783
-#, c-format
+#, possible-c-format
msgid "If enabled, %s downloads updates of built-in system presets in the background.These updates are downloaded into a separate temporary location.When a new preset version becomes available it is offered at application startup."
msgstr "有効にすると、%sはバックグラウンドでビルトインシステムプリセットアップデートをダウンロードします。 これらの更新は一時的な場所にダウンロードされます。 新しいプリセットが利用可能な場合、プログラムの起動時に警告が表示されます。"
@@ -3387,12 +3374,8 @@ msgid "If enabled, all printing extruders will be primed at the front edge of th
msgstr "有効にすると、すべてのプリントエクストルーダーは、プリント開始時にプリントベッドの前端で準備されます。"
#: src/slic3r/GUI/ConfigWizard.cpp:805
-msgid ""
-"If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\n"
-"If not enabled, the Reload from disk command will ask to select each file using an open file dialog."
-msgstr ""
-"有効にした場合、「ディスクからリロード」コマンドを使用して、起動時にファイルを自動的に検索してロードできます。\n"
-"有効になっていない場合、「ディスクからリロード」コマンドは、ファイルを開くダイアログを使用して各ファイルの選択を要求します。"
+msgid "If enabled, allows the Reload from disk command to automatically find and load the files when invoked.\nIf not enabled, the Reload from disk command will ask to select each file using an open file dialog."
+msgstr "有効にした場合、「ディスクからリロード」コマンドを使用して、起動時にファイルを自動的に検索してロードできます。\n有効になっていない場合、「ディスクからリロード」コマンドは、ファイルを開くダイアログを使用して各ファイルの選択を要求します。"
#: src/slic3r/GUI/Preferences.cpp:74
msgid "If enabled, allows the Reload from disk command to automatically find and load the files when invoked."
@@ -3410,6 +3393,10 @@ msgstr "有効にすると、Slic3rはビルトインシステムプリセット
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "有効にすると、3DシーンはRetina解像度でレンダリングされます。 3Dパフォーマンスに問題がある場合は、このオプションを無効にしてください。"
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "有効にすると、スカートは最も高いプリントオブジェクトと同じ高さになります。 これにより、ABS/ASAにおいて、外気による過度の冷却に起因するプリントベッドからの反りや剥離を減らすことができます。"
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "有効にすると、ツール変更がない場合にワイプタワーをプリントしなくなります。 ワイプタワーの高さが同期しなくなりますので、ツールチェンジのあるレイヤーでは、エクストルーダーがプリント面より下方に移動してワイプタワーをプリントするケースもあります。 この場合、プリントした部分との衝突がないことをご自身で確認しておく必要があります。"
@@ -3527,7 +3514,7 @@ msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "既存のプレートを保持しながらSTL/OBJ/AMF/3MFを設定なしでインポート"
#: src/slic3r/GUI/GUI_ObjectList.cpp:3422
-#, c-format
+#, possible-c-format
msgid "In this mode you can select only other %s Items%s"
msgstr "このモードでは、他の%sアイテム%sのみを選択できます"
@@ -3536,7 +3523,7 @@ msgid "Incompatible bundles:"
msgstr "互換性のないパッケージ："
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75
-#, c-format
+#, possible-c-format
msgid "Incompatible with this %s"
msgstr "この%sと互換性がありません"
@@ -3554,12 +3541,8 @@ msgstr "中空オブジェクトのインデックス作成"
#. TRN Description for "UNLOCKED LOCK"
#: src/slic3r/GUI/Tab.cpp:3258
-msgid ""
-"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values."
-msgstr ""
-"一部の設定が変更され、現在のオプショングループのシステム（またはデフォルト）値と等しくないことを示します。\n"
-"開いたカギアイコンをクリックして、現在のオプショングループのすべての設定をシステム（またはデフォルト）値にリセットします。"
+msgid "indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\nClick the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values."
+msgstr "一部の設定が変更され、現在のオプショングループのシステム（またはデフォルト）値と等しくないことを示します。\n開いたカギアイコンをクリックして、現在のオプショングループのすべての設定をシステム（またはデフォルト）値にリセットします。"
#. TRN Description for "LOCKED LOCK"
#: src/slic3r/GUI/Tab.cpp:3254
@@ -3568,10 +3551,8 @@ msgstr "設定が現在の設定グループのシステム（デフォルト）
#. TRN Description for "BACK ARROW"
#: src/slic3r/GUI/Tab.cpp:3270
-msgid ""
-"indicates that the settings were changed and are not equal to the last saved preset for the current option group.\n"
-"Click the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
-msgstr "設定が変更され、現在のオプショングループに最後に保存されたプリセットと等しくないことを示します。戻る矢印アイコンをクリックして、現在のオプショングループのすべての設定を最後に保存されたプリセットに戻します。"
+msgid "indicates that the settings were changed and are not equal to the last saved preset for the current option group.\nClick the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
+msgstr "設定が変更され、現在のオプショングループに最後に保存されたプリセットと等しくないことを示します。\n戻る矢印アイコンをクリックして、現在のオプショングループのすべての設定を最後に保存されたプリセットに戻します。"
#: src/slic3r/GUI/ConfigManipulation.cpp:211
#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
@@ -3638,7 +3619,7 @@ msgstr "構成スナップショットの点検/有効化"
#: src/slic3r/GUI/ObjectDataViewModel.cpp:60
#: src/slic3r/GUI/ObjectDataViewModel.cpp:216
-#, c-format
+#, possible-c-format
msgid "Instance %d"
msgstr "インスタンス%d"
@@ -3764,7 +3745,7 @@ msgid "Jump to height"
msgstr "高さにジャンプ"
#: src/slic3r/GUI/DoubleSlider.cpp:955
-#, c-format
+#, possible-c-format
msgid "Jump to height %s or Set extruder sequence for the entire print"
msgstr "高さ%sにジャンプするか、プリント全体のエクストルーダーシーケンスを設定します"
@@ -4100,6 +4081,10 @@ msgstr "最大"
msgid "Max bridge length"
msgstr "最長ブリッジ長さ"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "柱の上の最大ブリッジ数"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "最大結合距離"
@@ -4268,6 +4253,10 @@ msgstr "Yの最大ジャーク"
msgid "Maximum jerk Z"
msgstr "Zの最大ジャーク"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "柱の上に置くことができるブリッジの最大数。 ブリッジはサポートポイントのピンヘッドを保持し、小さな枝として柱に接続します。"
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "このフィラメントに許容される最大体積押出し速度。プリントの最大体積押出し速度を、プリントとフィラメントの体積押出し速度の最小値にに制限します。 制限なしに設定するにはゼロを入力します。"
@@ -4421,7 +4410,7 @@ msgid "Mirror vertically"
msgstr "垂直にミラーリング"
#: src/slic3r/Utils/AstroBox.cpp:68 src/slic3r/Utils/OctoPrint.cpp:68
-#, c-format
+#, possible-c-format
msgid "Mismatched type of print host: %s"
msgstr "プリントホストのタイプの不一致：%s"
@@ -4549,6 +4538,10 @@ msgstr "モデル修正完了"
msgid "Model repaired successfully"
msgstr "モデルの修復完了"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "現在のプロファイルの編集が保存されます。"
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "変更あり"
@@ -4642,7 +4635,7 @@ msgid "Multi-part object detected"
msgstr "マルチパートオブジェクトを検出"
#: src/slic3r/GUI/FirmwareDialog.cpp:419 src/slic3r/GUI/FirmwareDialog.cpp:454
-#, c-format
+#, possible-c-format
msgid "Multiple %s devices found. Please only connect one at a time for flashing."
msgstr "複数の%sデバイスが見つかりました。 更新するには一度に1つずつ接続してください。"
@@ -4651,14 +4644,8 @@ msgid "Multiple Extruders"
msgstr "複数のエクストルーダー"
#: src/slic3r/GUI/Plater.cpp:2410
-msgid ""
-"Multiple objects were loaded for a multi-material printer.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"these files to represent a single object having multiple parts?"
-msgstr ""
-"マルチマテリアルプリンター用に複数のオブジェクトがロードされました。\n"
-"これらは複数のオブジェクトではなく、\n"
-"複数のパーツからなる単一のオブジェクトとしますか？"
+msgid "Multiple objects were loaded for a multi-material printer.\nInstead of considering them as multiple objects, should I consider\nthese files to represent a single object having multiple parts?"
+msgstr "マルチマテリアルプリンター用に複数のオブジェクトがロードされました。\nこれらは複数のオブジェクトではなく、\n複数のパーツからなる単一のオブジェクトとしますか？"
#: src/libslic3r/PrintConfig.cpp:3439
msgid "Multiply copies by creating a grid."
@@ -4706,7 +4693,7 @@ msgid "New project, clear plater"
msgstr "新しいプロジェクト、プレート上のモデルの削除"
#: src/slic3r/GUI/UpdateDialogs.cpp:38
-#, c-format
+#, possible-c-format
msgid "New version of %s is available"
msgstr "新バージョン%sがあります"
@@ -4922,6 +4909,11 @@ msgstr "現在のオブジェクトの"
msgid "Offset"
msgstr "オフセット"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, possible-c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "このシステムでは、%sはシステムの証明書ストアまたはキーチェーンからのHTTPS証明書を使用します。"
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "1レイヤーモード"
@@ -4984,7 +4976,7 @@ msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "プロジェクトSTL/OBJ/AMF/3MFを設定を含めて開き、プレートをクリアします"
#: src/slic3r/GUI/MainFrame.cpp:693
-#, c-format
+#, possible-c-format
msgid "Open the %s website in your browser"
msgstr "ブラウザで%sウェブサイトを開きます"
@@ -5240,7 +5232,7 @@ msgid "Perimeters"
msgstr "外周"
#: src/slic3r/GUI/ConfigWizard.cpp:860
-#, c-format
+#, possible-c-format
msgid "Pick another vendor supported by %s"
msgstr "%sがサポートする別のベンダーを選択してください"
@@ -5334,7 +5326,7 @@ msgid "Preparing infill"
msgstr "インフィルの準備"
#: src/slic3r/GUI/Tab.cpp:2920
-#, c-format
+#, possible-c-format
msgid "Preset (%s)"
msgstr "プリセット(%s)"
@@ -5342,10 +5334,10 @@ msgstr "プリセット(%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "\"%1%\"というプリセット名は既に存在します。"
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - コピー"
+msgid "Copy"
+msgstr "コピー"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5360,29 +5352,17 @@ msgid "Press to activate selection rectangle"
msgstr "押すと選択範囲がアクティブになります"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
-msgid ""
-"Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\n"
-"selected objects around their own center"
-msgstr ""
-"押して、選択したオブジェクトの中心でスケーリング\n"
-"（ギズモスケール）または回転（ギズモ回転）"
+msgid "Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\nselected objects around their own center"
+msgstr "押して、選択したオブジェクトの中心でスケーリング\n（ギズモスケール）または回転（ギズモ回転）"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:161
-msgid ""
-"Press to select multiple objects\n"
-"or move multiple objects with mouse"
-msgstr ""
-"マウスを押して複数のオブジェクトを選択します\n"
-"または複数のオブジェクトを移動します"
+msgid "Press to select multiple objects\nor move multiple objects with mouse"
+msgstr "マウスを押して複数のオブジェクトを選択します\nまたは複数のオブジェクトを移動します"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:195
#, no-c-format
-msgid ""
-"Press to snap by 5% in Gizmo scale\n"
-"or to snap by 1mm in Gizmo move"
-msgstr ""
-"ギズモスケールで5％スナップする\n"
-"またはギズモ移動で1mmずつスナップする"
+msgid "Press to snap by 5% in Gizmo scale\nor to snap by 1mm in Gizmo move"
+msgstr "ギズモスケールで5％スナップする\nまたはギズモ移動で1mmずつスナップする"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 src/slic3r/GUI/Plater.cpp:4105
#: src/slic3r/GUI/Tab.cpp:2390
@@ -5509,12 +5489,12 @@ msgstr "異なるノズル直径の複数のエクストルーダーでのプリ
#. TRN "Processing input_file_basename"
#: src/slic3r/GUI/MainFrame.cpp:849
-#, c-format
+#, possible-c-format
msgid "Processing %s"
msgstr "%s実行中"
#: src/slic3r/GUI/Plater.cpp:2283
-#, c-format
+#, possible-c-format
msgid "Processing input file %s"
msgstr "入力ファイル%sを処理中"
@@ -5557,10 +5537,8 @@ msgid "PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap co
msgstr "PrusaSlicerは、Alessandro RanellucciとRepRapコミュニティによるSlic3rをベースにしています。"
#: src/slic3r/GUI/GLCanvas3DManager.cpp:284
-#, c-format
-msgid ""
-"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
-"while OpenGL version %s, render %s, vendor %s was detected."
+#, possible-c-format
+msgid "PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \nwhile OpenGL version %s, render %s, vendor %s was detected."
msgstr "OpenGLバージョン%s、レンダー%s、ベンダー%sが検出されました。PrusaSlicerには、OpenGL 2.0が機能するグラフィックドライバーが必要です。"
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
@@ -5568,14 +5546,8 @@ msgid "PrusaSlicer version"
msgstr "PrusaSlicerバージョン"
#: src/slic3r/GUI/ConfigWizard.cpp:815
-msgid ""
-"PrusaSlicer's user interfaces comes in three variants:\n"
-"Simple, Advanced, and Expert.\n"
-"The Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively."
-msgstr ""
-"PrusaSlicerのユーザーインターフェイスには、次の3つのバリエーションがあります。\n"
-"シンプル、高度、エキスパート。\n"
-"シンプルモードでは、通常の3Dプリントするときに最も一般的に使用される設定のみが表示されます。 他の2つは上級ユーザーやエキスパートユーザー向けに微調整できる項目を提供します。"
+msgid "PrusaSlicer's user interfaces comes in three variants:\nSimple, Advanced, and Expert.\nThe Simple mode shows only the most frequently used settings relevant for regular 3D printing. The other two offer progressively more sophisticated fine-tuning, they are suitable for advanced and expert users, respectively."
+msgstr "PrusaSlicerのユーザーインターフェイスには、次の3つのバリエーションがあります。\nシンプル、高度、エキスパート。\nシンプルモードでは、通常の3Dプリントするときに最も一般的に使用される設定のみが表示されます。 他の2つは上級ユーザーやエキスパートユーザー向けに微調整できる項目を提供します。"
#: src/libslic3r/PrintConfig.cpp:2254
msgid "Purging after toolchange will done inside this object's infills. This lowers the amount of waste but may result in longer print time due to additional travel moves."
@@ -5609,7 +5581,7 @@ msgstr "品質/スピード"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1530
#: src/slic3r/GUI/GUI_ObjectList.cpp:1536
#: src/slic3r/GUI/GUI_ObjectList.cpp:1849
-#, c-format
+#, possible-c-format
msgid "Quick Add Settings (%s)"
msgstr "クイック追加設定(%s)"
@@ -5622,7 +5594,7 @@ msgid "Quick Slice and Save As"
msgstr "クイックスライスと名前を付けて保存"
#: src/slic3r/GUI/MainFrame.cpp:540
-#, c-format
+#, possible-c-format
msgid "Quit %s"
msgstr "%sを終了"
@@ -5643,14 +5615,8 @@ msgid "Ramming customization"
msgstr "ラミングのカスタマイズ"
#: src/slic3r/GUI/WipeTowerDialog.cpp:41
-msgid ""
-"Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n"
-"\n"
-"This is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc."
-msgstr ""
-"ラミングとは、単一エクストルーダーMMプリンターでツールを交換する直前の急速吐出動作を指します。 その目的は、フィラメントを抜く時に新しいフィラメントの挿入を妨げないようにすることと、再挿入のときにエラーにならないよう、フィラメントの先端部を適切な形にすることです。 この処理は重要であり、材料が変わると、良好な先端形状が得られるラミング条件の変更が必要となったりします。 このため、ラミング中の吐出速度は調整できるようになっています。\n"
-"\n"
-"これはエキスパートレベルの設定です。不適切な調整は、ジャムや、ドライブギアがフィラメントを削ったりする可能性があります。"
+msgid "Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself be reinserted later. This phase is important and different materials can require different extrusion speeds to get the good shape. For this reason, the extrusion rates during ramming are adjustable.\n\nThis is an expert-level setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc."
+msgstr "ラミングとは、単一エクストルーダーMMプリンターでツールを交換する直前の急速吐出動作を指します。 その目的は、フィラメントを抜く時に新しいフィラメントの挿入を妨げないようにすることと、再挿入のときにエラーにならないよう、フィラメントの先端部を適切な形にすることです。 この処理は重要であり、材料が変わると、良好な先端形状が得られるラミング条件の変更が必要となったりします。 このため、ラミング中の吐出速度は調整できるようになっています。\n\nこれはエキスパートレベルの設定です。不適切な調整は、ジャムや、ドライブギアがフィラメントを削ったりする可能性があります。"
#: src/slic3r/GUI/WipeTowerDialog.cpp:91
msgid "Ramming line spacing"
@@ -5709,7 +5675,7 @@ msgid "Recent projects"
msgstr "最近のプロジェクト"
#: src/slic3r/GUI/PresetHints.cpp:263
-#, c-format
+#, possible-c-format
msgid "Recommended object thin wall thickness for layer height %.2f and"
msgstr "レイヤー高さ%.2fでの推奨オブジェクトの薄壁厚と"
@@ -5744,7 +5710,7 @@ msgid "Redo"
msgstr "再実行"
#: src/slic3r/GUI/GLCanvas3D.cpp:4065
-#, c-format
+#, possible-c-format
msgid "Redo %1$d Action"
msgid_plural "Redo %1$d Actions"
msgstr[0] ""
@@ -5862,9 +5828,9 @@ msgstr "選択したポイントを削除"
msgid "Remove the selected object"
msgstr "選択オブジェクトを削除"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "ユーザープロファイルの削除-最初からインストールします（スナップショットは事前に作成されます）"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "ユーザープロファイルを削除します（スナップショットは事前に作成されます）"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -5935,22 +5901,22 @@ msgid "Report an I&ssue"
msgstr "問題を報告する(&s)"
#: src/slic3r/GUI/MainFrame.cpp:703
-#, c-format
+#, possible-c-format
msgid "Report an issue on %s"
msgstr "%sに関する問題を報告する"
#: src/slic3r/Utils/PresetUpdater.cpp:713
-#, c-format
+#, possible-c-format
msgid "requires max. %s"
msgstr "最大%sが必要"
#: src/slic3r/Utils/PresetUpdater.cpp:710
-#, c-format
+#, possible-c-format
msgid "requires min. %s"
msgstr "最小%sが必要"
#: src/slic3r/Utils/PresetUpdater.cpp:705
-#, c-format
+#, possible-c-format
msgid "requires min. %s and max. %s"
msgstr "最小%sと最大%sが必要です"
@@ -6117,7 +6083,7 @@ msgid "Rotation angle around the Z axis in degrees."
msgstr "Z軸周りの回転角度(度)。"
#: src/slic3r/GUI/GUI_App.cpp:797
-#, c-format
+#, possible-c-format
msgid "Run %s"
msgstr "%s実行"
@@ -6146,12 +6112,12 @@ msgstr "プリントする(&e)"
#. TRN Preset
#: src/slic3r/GUI/Tab.cpp:3417
-#, c-format
+#, possible-c-format
msgid "Save %s as:"
msgstr "形式を変更して%sを保存:"
#: src/slic3r/GUI/MainFrame.cpp:826
-#, c-format
+#, possible-c-format
msgid "Save %s file as:"
msgstr "%sファイルを別の名前で保存："
@@ -6173,7 +6139,7 @@ msgstr "指定したファイルに構成を保存します。"
#. TRN "Save current Settings"
#: src/slic3r/GUI/Tab.cpp:133
-#, c-format
+#, possible-c-format
msgid "Save current %s"
msgstr "現在の%sを保存"
@@ -6244,9 +6210,7 @@ msgid "Scale factors"
msgstr "寸法係数"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:196
-msgid ""
-"Scale selection to fit print volume\n"
-"in Gizmo scale"
+msgid "Scale selection to fit print volume\nin Gizmo scale"
msgstr "ギズモスケールでプリントボリュームに合わせて選択範囲を拡大/縮小します"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1724
@@ -6382,14 +6346,8 @@ msgid "Select what kind of support do you need"
msgstr "必要なサポートの種類を選択してください"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
-msgid ""
-"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
-msgstr ""
-"保存したツールの変更をすべて削除する場合は、「はい」を選択します。\n"
-"すべてのツールの変更を色の変更に切り替えたい場合は「いいえ」、\n"
-"または「キャンセル」で変更せずにそのままにします"
+msgid "Select YES if you want to delete all saved tool changes, \nNO if you want all tool changes switch to color changes, \nor CANCEL to leave it unchanged."
+msgstr "保存したツールの変更をすべて削除する場合は、「はい」を選択します。\nすべてのツールの変更を色の変更に切り替えたい場合は「いいえ」、\nまたは「キャンセル」で変更せずにそのままにします"
#: src/slic3r/GUI/Selection.cpp:146
msgid "Selection-Add"
@@ -6530,7 +6488,7 @@ msgid "Set number of instances"
msgstr "インスタンス数の設定"
#: src/slic3r/GUI/Plater.cpp:4756
-#, c-format
+#, possible-c-format
msgid "Set numbers of copies to %d"
msgstr "コピーの数を%dに設定"
@@ -6619,12 +6577,8 @@ msgid "Set upper thumb to current slider thumb"
msgstr "上部のつまみを現在のスライダーのつまみに設定します"
#: src/libslic3r/PrintConfig.cpp:3509
-msgid ""
-"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n"
-"For example. loglevel=2 logs fatal, error and warning level messages."
-msgstr ""
-"ログレベルの選択：0：致命的なエラー、1：エラー、2：警告、3：情報、4：デバッグ、5：トレース\n"
-"たとえば。 loglevel = 2は、致命的なエラー、エラー、および警告メッセージを記録します。"
+msgid "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\nFor example. loglevel=2 logs fatal, error and warning level messages."
+msgstr "ログレベルの選択：0：致命的なエラー、1：エラー、2：警告、3：情報、4：デバッグ、5：トレース\nたとえば。 loglevel = 2は、致命的なエラー、エラー、および警告メッセージを記録します。"
#: src/slic3r/GUI/BedShapeDialog.cpp:155
msgid "Settings"
@@ -6795,10 +6749,7 @@ msgid "Single Extruder Multi Material"
msgstr "シングルエクストルーダー・マルチマテリアル"
#: src/slic3r/GUI/Tab.cpp:1867
-msgid ""
-"Single Extruder Multi Material is selected, \n"
-"and all extruders must have the same diameter.\n"
-"Do you want to change the diameter for all extruders to first extruder nozzle diameter value?"
+msgid "Single Extruder Multi Material is selected, \nand all extruders must have the same diameter.\nDo you want to change the diameter for all extruders to first extruder nozzle diameter value?"
msgstr "1つのエクストルーダーのマルチマテリアルプリンターが選択されているため、すべてのエクストルーダーの直径が同じでなければなりません。最初のエクストルーダーの直径で、すべてのエクストルーダーノズルの直径を設定しますか？"
#: src/slic3r/GUI/Tab.cpp:2307
@@ -7254,7 +7205,7 @@ msgid "stealth mode"
msgstr "静音モード"
#: src/slic3r/GUI/Plater.cpp:4985
-#, c-format
+#, possible-c-format
msgid "STL file exported to %s"
msgstr "%sにエクスポートされたSTLファイル"
@@ -7405,12 +7356,8 @@ msgid "Supports stealth mode"
msgstr "静音モードサポート"
#: src/slic3r/GUI/ConfigManipulation.cpp:159
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters"
-msgstr ""
-"以下の機能が有効になっている場合、サポートはより良く機能します。\n"
-"-ブリッジング境界の検出"
+msgid "Supports work better, if the following feature is enabled:\n- Detect bridging perimeters"
+msgstr "以下の機能が有効になっている場合、サポートはより良く機能します。\n-ブリッジング境界の検出"
#: src/slic3r/GUI/Preferences.cpp:87
msgid "Suppress \" - default - \" presets"
@@ -7445,25 +7392,17 @@ msgid "Switch to Preview"
msgstr "プレビューに切替え"
#: src/slic3r/GUI/wxExtensions.cpp:703
-#, c-format
+#, possible-c-format
msgid "Switch to the %s mode"
msgstr "%sモードに切替え"
#: src/slic3r/GUI/GUI_App.cpp:882
-msgid ""
-"Switching the language will trigger application restart.\n"
-"You will lose content of the plater."
+msgid "Switching the language will trigger application restart.\nYou will lose content of the plater."
msgstr "言語を切り替えると、アプリケーションが再起動します。プレートの内容が失われます。"
#: src/slic3r/GUI/WipeTowerDialog.cpp:365
-msgid ""
-"Switching to simple settings will discard changes done in the advanced mode!\n"
-"\n"
-"Do you want to proceed?"
-msgstr ""
-"簡易な設定に切り替えると、上級モードで行われた変更が破棄されます！\n"
-"\n"
-"続行しますか？"
+msgid "Switching to simple settings will discard changes done in the advanced mode!\n\nDo you want to proceed?"
+msgstr "簡易な設定に切り替えると、上級モードで行われた変更が破棄されます！\n\n続行しますか？"
#: src/slic3r/GUI/Tab.cpp:1014
msgid "symbolic profile name"
@@ -7528,27 +7467,22 @@ msgid "The %1% infill pattern is not supposed to work at 100%% density."
msgstr "インフィル(中塗り)パターン%1%は、塗りつぶし密度100%%では機能しません。"
#: src/slic3r/GUI/FirmwareDialog.cpp:548
-#, c-format
+#, possible-c-format
msgid "The %s device could not have been found"
msgstr "%sデバイスが見つかりませんでした"
#: src/slic3r/GUI/FirmwareDialog.cpp:436
-#, c-format
-msgid ""
-"The %s device was not found.\n"
-"If the device is connected, please press the Reset button next to the USB connector ..."
-msgstr ""
-"%sデバイスが見つかりませんでした。\n"
-"デバイスが接続されている場合は、USBコネクタの横にあるリセットボタンを押してください..."
+#, possible-c-format
+msgid "The %s device was not found.\nIf the device is connected, please press the Reset button next to the USB connector ..."
+msgstr "%sデバイスが見つかりませんでした。\nデバイスが接続されている場合は、USBコネクタの横にあるリセットボタンを押してください..."
+
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "現在のカスタムプリセットは、親システムプリセットから切り離されます。"
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
-msgid ""
-"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
-"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n"
-"once the rotation is embedded into the object coordinates."
-msgstr ""
-"現在操作されているオブジェクトは傾斜しています（回転角度が90°の倍数ではありません）。\n"
-"回転がオブジェクト座標に埋め込まれると、傾斜オブジェクトの不均一なスケーリングはワールド座標系でのみ可能になります。"
+msgid "The currently manipulated object is tilted (rotation angles are not multiples of 90°).\nNon-uniform scaling of tilted objects is only possible in the World coordinate system,\nonce the rotation is embedded into the object coordinates."
+msgstr "現在操作されているオブジェクトは傾斜しています（回転角度が90°の倍数ではありません）。\n回転がオブジェクト座標に埋め込まれると、傾斜オブジェクトの不均一なスケーリングはワールド座標系でのみ可能になります。"
#: src/libslic3r/PrintConfig.cpp:2726
msgid "The default angle for connecting support sticks and junctions."
@@ -7603,6 +7537,14 @@ msgstr "最初のレイヤーは、設定された値によってXY平面で縮
msgid "the following characters are not allowed:"
msgstr "次の文字は使用できません:"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "次のFFFプリンターモデルには、フィラメントが選択されていません："
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "次のSLAプリンターモデルには材料が選択されていません："
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "以下のサフィックスは許可されていません :"
@@ -7656,13 +7598,8 @@ msgid "The object will be raised by this number of layers, and support material
msgstr "オブジェクトは、このレイヤー数だけ持ち上げられ、その下にサポート材が生成されます。"
#: src/libslic3r/PrintConfig.cpp:2424
-msgid ""
-"The percentage of the bed area. \n"
-"If the print area exceeds the specified value, \n"
-"then a slow tilt will be used, otherwise - a fast tilt"
-msgstr ""
-"ベッド領域の占有率。\n"
-"プリント領域が指定された値を超える場合、ティルト動作を遅くします。それ以外では-速いティルトとなります"
+msgid "The percentage of the bed area. \nIf the print area exceeds the specified value, \nthen a slow tilt will be used, otherwise - a fast tilt"
+msgstr "ベッド領域の占有率。\nプリント領域が指定された値を超える場合、ティルト動作を遅くします。それ以外では-速いティルトとなります"
#: src/slic3r/GUI/GUI_App.cpp:932
msgid "The presets on the following tabs were modified"
@@ -7696,19 +7633,13 @@ msgstr "選択したオブジェクトには複数のボリューム/マテリ
msgid "The selected object couldn't be split because it contains only one part."
msgstr "選択したオブジェクトには、1つのパーツしか含まれていないため、分割できませんでした。"
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "選択したプロジェクトはもう利用できません"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid "The selected project is no longer available.\nDo you want to remove it from the recent projects list?"
+msgstr "選択したプロジェクトは使用できなくなりました。\n最近のプロジェクトリストから削除しますか？"
#: src/slic3r/GUI/DoubleSlider.cpp:998
-msgid ""
-"The sequential print is on.\n"
-"It's impossible to apply any custom G-code for objects printing sequentually.\n"
-"This code won't be processed during G-code generation."
-msgstr ""
-"シーケンシャルプリントがオンになっています。\n"
-"連続してプリントするオブジェクトにカスタムGコードを適用することはできません。\n"
-"このコードは、Gコード生成中に処理されません。"
+msgid "The sequential print is on.\nIt's impossible to apply any custom G-code for objects printing sequentually.\nThis code won't be processed during G-code generation."
+msgstr "シーケンシャルプリントがオンになっています。\n連続してプリントするオブジェクトにカスタムGコードを適用することはできません。\nこのコードは、Gコード生成中に処理されません。"
#: src/libslic3r/PrintConfig.cpp:2846
msgid "The slope of the pad wall relative to the bed plane. 90 degrees means straight walls."
@@ -7724,22 +7655,8 @@ msgstr "吸込み速度（エクストルーダーモーターにのみ適用）
#: src/slic3r/GUI/ConfigManipulation.cpp:81
#, no-c-format
-msgid ""
-"The Spiral Vase mode requires:\n"
-"- one perimeter\n"
-"- no top solid layers\n"
-"- 0% fill density\n"
-"- no support material\n"
-"- Ensure vertical shell thickness enabled\n"
-"- Detect thin walls disabled"
-msgstr ""
-"スパイラル花瓶(ベイス)モードには以下が必要です。\n"
-"-1つの外周\n"
-"-上部ソリッドレイヤーなし\n"
-"-充填密度0％\n"
-"-サポート材設定なし\n"
-"-垂直シェルの厚さを有効にしてください\n"
-"-薄い壁を無効にする"
+msgid "The Spiral Vase mode requires:\n- one perimeter\n- no top solid layers\n- 0% fill density\n- no support material\n- Ensure vertical shell thickness enabled\n- Detect thin walls disabled"
+msgstr "スパイラル花瓶(ベイス)モードには以下が必要です。\n-1つの外周\n-上部ソリッドレイヤーなし\n-充填密度0％\n-サポート材設定なし\n-垂直シェルの厚さを有効にしてください\n-薄い壁を無効にする"
#: src/libslic3r/Print.cpp:1237
msgid "The Spiral Vase option can only be used when printing a single object."
@@ -7776,10 +7693,7 @@ msgid "The vertical distance between object and support material interface. Sett
msgstr "オブジェクトとサポートマテリアルインターフェース間の垂直距離。 これを0に設定すると、Slic3rは最初のオブジェクトレイヤーのブリッジフローと速度を使用しなくなります。"
#: src/slic3r/GUI/Tab.cpp:2575
-msgid ""
-"The Wipe option is not available when using the Firmware Retraction mode.\n"
-"\n"
-"Shall I disable it in order to enable Firmware Retraction?"
+msgid "The Wipe option is not available when using the Firmware Retraction mode.\n\nShall I disable it in order to enable Firmware Retraction?"
msgstr "ファームウェア引き込みモードを使用している場合、ワイプオプションは使用できません。ファームウェア引き込みを有効にするために無効にしますか？"
#: src/libslic3r/Print.cpp:1268
@@ -7787,13 +7701,8 @@ msgid "The Wipe Tower currently does not support volumetric E (use_volumetric_e=
msgstr "ワイプタワーは現在のところ体積出力E(use_volumetric_e = 0)をサポートしていません。"
#: src/slic3r/GUI/ConfigManipulation.cpp:115
-msgid ""
-"The Wipe Tower currently supports the non-soluble supports only\n"
-"if they are printed with the current extruder without triggering a tool change.\n"
-"(both support_material_extruder and support_material_interface_extruder need to be set to 0)."
-msgstr ""
-"現在のところ、非溶解性サポートのワイプタワーは、ツールの変更をトリガーせずに現在のエクストルーダーでプリントされる場合のみサポートします。\n"
-"（support_material_extruderとsupport_material_interface_extruderの両方を0に設定する必要があります）。"
+msgid "The Wipe Tower currently supports the non-soluble supports only\nif they are printed with the current extruder without triggering a tool change.\n(both support_material_extruder and support_material_interface_extruder need to be set to 0)."
+msgstr "現在のところ、非溶解性サポートのワイプタワーは、ツールの変更をトリガーせずに現在のエクストルーダーでプリントされる場合のみサポートします。\n（support_material_extruderとsupport_material_interface_extruderの両方を0に設定する必要があります）。"
#: src/libslic3r/Print.cpp:1400
msgid "The Wipe Tower currently supports the non-soluble supports only if they are printed with the current extruder without triggering a tool change. (both support_material_extruder and support_material_interface_extruder need to be set to 0)."
@@ -7840,34 +7749,26 @@ msgid "There are unprintable objects. Try to adjust support settings to make the
msgstr "プリントがうまくいかないオブジェクトがあります。 サポート設定を調整して、オブジェクトがプリント可能な状態にしてください。"
#: src/slic3r/GUI/DoubleSlider.cpp:1030
-msgid ""
-"There is a color change for extruder that has not been used before.\n"
-"Check your settings to avoid redundant color changes."
-msgstr ""
-"まだ使用されていないエクストルーダーの色に変化があります。\n"
-"冗長な色の変更を避けるために設定を確認してください。"
+msgid "There is a color change for extruder that has not been used before.\nCheck your settings to avoid redundant color changes."
+msgstr "まだ使用されていないエクストルーダーの色に変化があります。\n冗長な色の変更を避けるために設定を確認してください。"
#: src/slic3r/GUI/DoubleSlider.cpp:1024
-msgid ""
-"There is a color change for extruder that won't be used till the end of print job.\n"
-"This code won't be processed during G-code generation."
-msgstr ""
-"エクストルーダーの色が変更され、プリントジョブが終了するまで使用されません。\n"
-"このコードは、Gコード生成中に処理されません。"
+msgid "There is a color change for extruder that won't be used till the end of print job.\nThis code won't be processed during G-code generation."
+msgstr "エクストルーダーの色が変更され、プリントジョブが終了するまで使用されません。\nこのコードは、Gコード生成中に処理されません。"
#: src/slic3r/GUI/DoubleSlider.cpp:1027
-msgid ""
-"There is an extruder change set to the same extruder.\n"
-"This code won't be processed during G-code generation."
-msgstr ""
-"同じエクストルーダーに設定されたエクストルーダーの変更があります。\n"
-"このコードは、Gコード生成中に処理されません。"
+msgid "There is an extruder change set to the same extruder.\nThis code won't be processed during G-code generation."
+msgstr "同じエクストルーダーに設定されたエクストルーダーの変更があります。\nこのコードは、Gコード生成中に処理されません。"
#: src/slic3r/GUI/UpdateDialogs.cpp:225
-#, c-format
+#, possible-c-format
msgid "This %s version: %s"
msgstr "この%sのバージョン: %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid "This action is not revertable.\nDo you want to proceed?"
+msgstr "この操作は元に戻せません。\n続行しますか？"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "このコードは、オブジェクト別の順次プリンティングを使用するとき、オブジェクト間に挿入されます。 デフォルトでは、エクストルーダーとベッドの温度は非待機コマンドを使用します(M104/M140)。 ただし、このカスタムコードでM104、M109、M140またはM190が記述された場合、Slic3rは温度コマンドを追加しません。 すべてのSlic3r代替変数を使用できるため、「M109 S [first_layer_temperature]」コマンドを必要な場所に記述できます。"
@@ -7941,31 +7842,13 @@ msgid "This file cannot be loaded in a simple mode. Do you want to switch to an
msgstr "このファイルは簡易モードでは読込めません。 上級モードに切り替えますか？"
#: src/slic3r/GUI/Plater.cpp:2357
-msgid ""
-"This file contains several objects positioned at multiple heights.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"this file as a single object having multiple parts?"
-msgstr ""
-"このファイルには、複数の高さに配置されたいくつかのオブジェクトが含まれています。\n"
-"それらを複数のオブジェクトと見なすのではなく、\n"
-"複数のパーツから構成される単一のオブジェクトと見なすべきですか？"
+msgid "This file contains several objects positioned at multiple heights.\nInstead of considering them as multiple objects, should I consider\nthis file as a single object having multiple parts?"
+msgstr "このファイルには、複数の高さに配置されたいくつかのオブジェクトが含まれています。\nそれらを複数のオブジェクトと見なすのではなく、\n複数のパーツから構成される単一のオブジェクトと見なすべきですか？"
#: src/slic3r/GUI/FirmwareDialog.cpp:332
-#, c-format
-msgid ""
-"This firmware hex file does not match the printer model.\n"
-"The hex file is intended for: %s\n"
-"Printer reported: %s\n"
-"\n"
-"Do you want to continue and flash this hex file anyway?\n"
-"Please only continue if you are sure this is the right thing to do."
-msgstr ""
-"このファームウェアhexファイルは、プリンターモデルと一致しません。\n"
-"16進ファイルの対象：%s\n"
-"報告されたプリンター：%s\n"
-"\n"
-"ともかくこのhexファイルでファームウェアの書換えを続けますか？\n"
-"絶対に間違いないと確信している場合にのみ続行してください。"
+#, possible-c-format
+msgid "This firmware hex file does not match the printer model.\nThe hex file is intended for: %s\nPrinter reported: %s\n\nDo you want to continue and flash this hex file anyway?\nPlease only continue if you are sure this is the right thing to do."
+msgstr "このファームウェアhexファイルは、プリンターモデルと一致しません。\n16進ファイルの対象：%s\n報告されたプリンター：%s\n\nともかくこのhexファイルでファームウェアの書換えを続けますか？\n絶対に間違いないと確信している場合にのみ続行してください。"
#: src/libslic3r/PrintConfig.cpp:314
msgid "This flag enables the automatic cooling logic that adjusts print speed and fan speed according to layer printing time."
@@ -8037,7 +7920,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "このエクストルーダーの最小プリント可能なレイヤー高さ。 可変レイヤー高の解像度を制限します。一般的な値は0.05mmと0.1mmの間です。"
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "これは通常、無視できるほど少量の押出量またはモデルの欠陥が原因です。 ベッド上のモデルの修復または向きを再配置してみてください。"
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8045,12 +7928,8 @@ msgid "This matrix describes volumes (in cubic milimetres) required to purge the
msgstr "この行列は、任意のツールチェンジ間においてワイプタワーの新しいフィラメントをパージするために必要な体積（立方ミリメートル）を示しています。"
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:878
-msgid ""
-"This operation is irreversible.\n"
-"Do you want to proceed?"
-msgstr ""
-"この操作は元に戻せません。\n"
-"続行しますか？"
+msgid "This operation is irreversible.\nDo you want to proceed?"
+msgstr "この操作は元に戻せません。\n続行しますか？"
#: src/libslic3r/PrintConfig.cpp:1442
msgid "This option sets the number of perimeters to generate for each layer. Note that Slic3r may increase this number automatically when it detects sloping surfaces which benefit from a higher number of perimeters if the Extra Perimeters option is enabled."
@@ -8113,16 +7992,9 @@ msgid "This vector saves required volumes to change from/to each tool used on th
msgstr "このベクトル列には、ワイプタワーで使用される各フィラメント間で変更するために必要なボリュームが保存されます。 これらの値は、以下の完全なパージボリュームの作成を簡素化するために使用されます。"
#: src/slic3r/GUI/UpdateDialogs.cpp:216
-#, c-format
-msgid ""
-"This version of %s is not compatible with currently installed configuration bundles.\n"
-"This probably happened as a result of running an older %s after using a newer one.\n"
-"\n"
-"You may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s."
-msgstr ""
-"このバージョン%sは、現在インストールされているセットアップパッケージと互換性がありません。\n"
-"これは、新しいバージョンを使用した後に古いバージョンの%sを実行したことが原因である可能性があります。 \n"
-"%sを終了して新しいバージョンで再試行するか、再起動してデフォルト構成をロードしてください。 このバージョン%sと互換性のある設定をインストールする前に、現在の構成のバックアップが作成されます。"
+#, possible-c-format
+msgid "This version of %s is not compatible with currently installed configuration bundles.\nThis probably happened as a result of running an older %s after using a newer one.\n\nYou may either exit %s and try again with a newer version, or you may re-run the initial configuration. Doing so will create a backup snapshot of the existing configuration before installing files compatible with this %s."
+msgstr "このバージョン%sは、現在インストールされているセットアップパッケージと互換性がありません。\nこれは、新しいバージョンを使用した後に古いバージョンの%sを実行したことが原因である可能性があります。 \n%sを終了して新しいバージョンで再試行するか、再起動してデフォルト構成をロードしてください。 このバージョン%sと互換性のある設定をインストールする前に、現在の構成のバックアップが作成されます。"
#: src/libslic3r/PrintConfig.cpp:2458
msgid "This will apply a gamma correction to the rasterized 2D polygons. A gamma value of zero means thresholding with the threshold in the middle. This behaviour eliminates antialiasing without losing holes in polygons."
@@ -8180,8 +8052,12 @@ msgstr "オブジェクト"
msgid "To parts"
msgstr "パーツへ"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "カスタムCAファイルを使用するには、CAファイルを証明書ストア/キーチェーンにインポートしてください。"
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
-#, c-format
+#, possible-c-format
msgid "Toggle %c axis mirroring"
msgstr "%c軸のミラーリングを切替え"
@@ -8306,7 +8182,7 @@ msgid "Undo"
msgstr "やり直し"
#: src/slic3r/GUI/GLCanvas3D.cpp:4065
-#, c-format
+#, possible-c-format
msgid "Undo %1$d Action"
msgid_plural "Undo %1$d Actions"
msgstr[0] ""
@@ -8346,21 +8222,15 @@ msgid "UNLOCKED LOCK"
msgstr "開いたカギ"
#: src/slic3r/GUI/Tab.cpp:3282
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n"
-"Click to reset all settings for current option group to the system (or default) values."
-msgstr ""
-"カギが開いたアイコンは、一部の設定が変更され、現在のオプショングループのシステム（またはデフォルト）値と等しくないことを示します。\n"
-"クリックすると、現在のオプショングループのすべての設定がシステム（またはデフォルト）値にリセットされます。"
+msgid "UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\nClick to reset all settings for current option group to the system (or default) values."
+msgstr "カギが開いたアイコンは、一部の設定が変更され、現在のオプショングループのシステム（またはデフォルト）値と等しくないことを示します。\nクリックすると、現在のオプショングループのすべての設定がシステム（またはデフォルト）値にリセットされます。"
#: src/slic3r/GUI/Tab.cpp:3297
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\n"
-"Click to reset current value to the system (or default) value."
+msgid "UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system (or default) value.\nClick to reset current value to the system (or default) value."
msgstr "カギが開いたアイコンは、値が変更され、システム（またはデフォルト）値と等しくないことを示します。クリックすると、現在の値がシステム（またはデフォルト）値にリセットされます。"
#: src/slic3r/GUI/Plater.cpp:5203
-#, c-format
+#, possible-c-format
msgid "Unmounting successful. The device %s(%s) can now be safely removed from the computer."
msgstr "アンマウントに成功しました。 デバイス%s(%s)をコンピューターから安全に取り出せます。"
@@ -8409,7 +8279,7 @@ msgid "Unsupported selection"
msgstr "サポートしないところの選択"
#: src/slic3r/GUI/GLCanvas3D.cpp:955
-#, c-format
+#, possible-c-format
msgid "up to %.2f mm"
msgstr "最大%.2f mm"
@@ -8671,12 +8541,12 @@ msgid "Welcome"
msgstr "ようこそ"
#: src/slic3r/GUI/ConfigWizard.cpp:427
-#, c-format
+#, possible-c-format
msgid "Welcome to the %s Configuration Assistant"
msgstr "%s構成アシスタントへようこそ"
#: src/slic3r/GUI/ConfigWizard.cpp:429
-#, c-format
+#, possible-c-format
msgid "Welcome to the %s Configuration Wizard"
msgstr "%s構成ウィザードへようこそ"
@@ -8842,12 +8712,7 @@ msgid "World coordinates"
msgstr "ワールド座標"
#: src/slic3r/GUI/UpdateDialogs.cpp:92
-msgid ""
-"Would you like to install it?\n"
-"\n"
-"Note that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n"
-"\n"
-"Updated configuration bundles:"
+msgid "Would you like to install it?\n\nNote that a full configuration snapshot will be created first. It can then be restored at any time should there be a problem with the new version.\n\nUpdated configuration bundles:"
msgstr "インストールしますか？まず完全な設定スナップショットが作成されます。 新しいバージョンに問題がある場合はいつでも復元できます。アップデートされた設定に含まれるもの："
#: src/libslic3r/Zipper.cpp:92
@@ -8915,7 +8780,7 @@ msgid "You can't change a type of the last solid part of the object."
msgstr "オブジェクトの最後のソリッドパーツのタイプを変更することはできません。"
#: src/slic3r/GUI/Plater.cpp:2390
-#, c-format
+#, possible-c-format
msgid "You can't to add the object(s) from %s because of one or some of them is(are) multi-part"
msgstr "オブジェクトの1つまたはいくつかはマルチパートであるため、%sからオブジェクトを追加できません"
@@ -8927,14 +8792,6 @@ msgstr "複数のパーツで構成されたオブジェクトを使用してSLA
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "複数のオブジェクト/パーツの選択で軸別のスケールモードを使用することはできません"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "選択したプリンターに対して少なくとも1つのフィラメントを選択する必要があります"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "選択したプリンターに対して少なくとも1つの材料を選択する必要があります"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "グラフィックカードドライバを更新する必要がある場合があります。"
@@ -8944,12 +8801,12 @@ msgid "You must install a configuration update."
msgstr "構成の更新をインストールする必要があります。"
#: src/slic3r/GUI/Preferences.cpp:172
-#, c-format
+#, possible-c-format
msgid "You need to restart %s to make the changes effective."
msgstr "変更を有効にするには、%sを再起動する必要があります。"
#: src/slic3r/GUI/GUI_ObjectList.cpp:3421
-#, c-format
+#, possible-c-format
msgid "You started your selection with %s Item."
msgstr "%sアイテムで選択を開始しました。"
@@ -8974,24 +8831,12 @@ msgid "Z offset"
msgstr "Zオフセット"
#: src/slic3r/GUI/ConfigManipulation.cpp:60
-msgid ""
-"Zero first layer height is not valid.\n"
-"\n"
-"The first layer height will be reset to 0.01."
-msgstr ""
-"最初のレイヤーのゼロの高さは無効です。\n"
-" \n"
-"最初のレイヤーの高さは0.01にリセットされます。"
+msgid "Zero first layer height is not valid.\n\nThe first layer height will be reset to 0.01."
+msgstr "最初のレイヤーのゼロの高さは無効です。\n \n最初のレイヤーの高さは0.01にリセットされます。"
#: src/slic3r/GUI/ConfigManipulation.cpp:48
-msgid ""
-"Zero layer height is not valid.\n"
-"\n"
-"The layer height will be reset to 0.01."
-msgstr ""
-"レイヤーの高さゼロは無効です。\n"
-" \n"
-"レイヤーの高さは0.01にリセットされます。"
+msgid "Zero layer height is not valid.\n\nThe layer height will be reset to 0.01."
+msgstr "レイヤーの高さゼロは無効です。\n \nレイヤーの高さは0.01にリセットされます。"
#: src/libslic3r/PrintConfig.cpp:2667
msgid "Zig-Zag"
@@ -9015,12 +8860,8 @@ msgid "Zoom to Bed"
msgstr "ベッドの大きさにズーム"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
-msgid ""
-"Zoom to selected object\n"
-"or all objects in scene, if none selected"
-msgstr ""
-"オブジェクトが選択されていない場合、シーン内のすべてのオブジェクト\n"
-"もしくは選択されているオブジェクトをズーム表示します"
+msgid "Zoom to selected object\nor all objects in scene, if none selected"
+msgstr "オブジェクトが選択されていない場合、シーン内のすべてのオブジェクト\nもしくは選択されているオブジェクトをズーム表示します"
#: src/libslic3r/PrintConfig.cpp:207 src/libslic3r/PrintConfig.cpp:780
#: src/libslic3r/PrintConfig.cpp:1640 src/libslic3r/PrintConfig.cpp:1650
diff --git a/resources/localization/ko/PrusaSlicer.mo b/resources/localization/ko/PrusaSlicer.mo
index 867fdc1e93..a1e06ababe 100644
Binary files a/resources/localization/ko/PrusaSlicer.mo and b/resources/localization/ko/PrusaSlicer.mo differ
diff --git a/resources/localization/ko/PrusaSlicer_ko_KR.po b/resources/localization/ko/PrusaSlicer_ko_KR.po
index 71bc4488a3..db96beba52 100644
--- a/resources/localization/ko/PrusaSlicer_ko_KR.po
+++ b/resources/localization/ko/PrusaSlicer_ko_KR.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-06 09:54+0200\n"
-"PO-Revision-Date: 2019-08-25 09:43+0900\n"
+"PO-Revision-Date: 2020-02-28 09:34+0900\n"
"Last-Translator: lee hak-min \n"
"Language-Team: ulsanether\n"
"Language: ko_KR\n"
@@ -385,7 +385,7 @@ msgid ""
"(both support_material_extruder and support_material_interface_extruder need "
"to be set to 0)."
msgstr ""
-"와이프 타워는 현재 비수용성 지원만 지원합니다.\n"
+"와이프 타워(프라임 타워)는 현재 비수용성 지원만 지원합니다.\n"
"공구 교환을 트리거하지 않고 현재 압출기로 인쇄된 경우\n"
"(support_material_extruder support_material_interface_extruder 모두 0으로 설"
"정해야 합니다)."
@@ -397,14 +397,14 @@ msgstr "와이프 타워를 활성화하기 위해 이러한 설정을 조정해
#: src/slic3r/GUI/ConfigManipulation.cpp:112
#: src/slic3r/GUI/ConfigManipulation.cpp:132
msgid "Wipe Tower"
-msgstr "와이프 타워(Wipe Tower)"
+msgstr "와이프 타워(프라임 타워)"
#: src/slic3r/GUI/ConfigManipulation.cpp:128
msgid ""
"For the Wipe Tower to work with the soluble supports, the support layers\n"
"need to be synchronized with the object layers."
msgstr ""
-"와이프 타워가 가용성 지지체와 함께 작동 하려면 서포트 레이어를 객체(object) "
+"와이프 타워(프라임 타워)가 가용성 지지체와 함께 작동 하려면 서포트 레이어를 객체(object) "
"레이어와 동기화 해야 합니다."
#: src/slic3r/GUI/ConfigManipulation.cpp:131
@@ -532,7 +532,7 @@ msgstr "변종"
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75
#, c-format
msgid "Incompatible with this %s"
-msgstr "%s 과 호환되지 않습니다"
+msgstr "%s 와 호환되지 않습니다"
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:78
msgid "Activate"
@@ -1207,13 +1207,13 @@ msgstr "다중 압출기 인쇄를 위해 마지막 색상 변경 데이터가
#: src/slic3r/GUI/DoubleSlider.cpp:1889
msgid ""
-"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL for do nothing"
+"Select YES if you want to delete all saved tool changes,\n"
+"NO if you want all tool changes switch to color changes,\n"
+"or CANCEL for do nothing"
msgstr ""
-"저장된 도구 변경 내용을 모두 삭제하려면 YES를 선택합니다. \n"
-"\t아니오 모든 도구 변경 이 색상 변경으로 전환하려면 \n"
-"\t또는 아무것도 하지 않는 취소"
+"저장된 도구 변경 내용을 모두 삭제하려면 YES를 선택합니다.\n"
+"아니오 모든 도구 변경 이 색상 변경으로 전환하려면\n"
+"또는 아무것도 하지 않는 취소"
#: src/slic3r/GUI/DoubleSlider.cpp:1892
msgid "Do you want to delete all saved tool changes?"
@@ -1751,7 +1751,7 @@ msgstr "이 개체를 비우기"
#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
msgid "Preview hollowed and drilled model"
-msgstr "미리 보기 중이 비어 있고 드릴된 모델"
+msgstr "공동화된 모델 미리보기"
#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
msgid "Offset"
@@ -1805,7 +1805,7 @@ msgstr "배수 구멍 삭제"
#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:786
msgid "Hollowing parameter change"
-msgstr "공동화 매개변수 변경"
+msgstr "공동화 변수 변경"
#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:858
msgid "Change drainage hole diameter"
@@ -5411,16 +5411,18 @@ msgstr "CA 인증서 파일 열기"
#: src/slic3r/GUI/Tab.cpp:1741
#, c-format
msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate "
+"On this system, %s uses HTTPS certificates from the system Certificate "
"Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate "
+msgstr ""
+"이 시스템에서 %s는 시스템 인증서 저장소나 키체인의 HTTPS 인증서를 사용 "
+"합니다.\n"
+
+#: src/slic3r/GUI/Tab.cpp:1741
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate "
"Store / Keychain."
msgstr ""
-"HTTPS CA 파일:\n"
-" \t이 시스템에서 %s는 시스템 인증서 저장소나 키체인의 HTTPS 인증서를 사용 "
-"합니다.\n"
-" \t사용자 지정 CA 파일을 사용 하려면 CA 파일을 인증서 저장소/키체인에 가져"
+"사용자 지정 CA 파일을 사용 하려면 CA 파일을 인증서 저장소/키체인에 가져"
"오십시오."
#: src/slic3r/GUI/Tab.cpp:1781 src/slic3r/GUI/Tab.cpp:2025
@@ -5717,8 +5719,8 @@ msgstr "흰색 글머리 기호"
#. TRN Description for "WHITE BULLET"
#: src/slic3r/GUI/Tab.cpp:3235
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"왼쪽 단추의 경우: 비시스템(또는 기본이 아닌) 사전 설정을 나타냅니다.\n"
"오른쪽 버튼: 설정이 수정되지 않았음을 나타냅니다."
@@ -6478,7 +6480,7 @@ msgstr "인쇄 z"
#: src/libslic3r/GCode.cpp:639
msgid ""
"This is usually caused by negligibly small extrusions or by a faulty model. "
-"Try to repair the model or change its orientation on the bed."
+"Try to repair the model or change its orientation on the bed."
msgstr ""
"이는 일반적으로 무시할 수 있는 작은 돌출 또는 결함이 있는 모델에 의해 발생합"
"니다. 모델을 수리하거나 배드에서 방향을 변경하십시오."
@@ -9346,7 +9348,7 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:2185
msgid "Use volumetric E"
-msgstr "용적 E 사용"
+msgstr "용적(volumetric) E 사용"
#: src/libslic3r/PrintConfig.cpp:2186
msgid ""
@@ -9605,11 +9607,11 @@ msgstr "느리게"
#: src/libslic3r/PrintConfig.cpp:2425
msgid "Slow tilt"
-msgstr "슬로우 틸트"
+msgstr "천천히 기울이기"
#: src/libslic3r/PrintConfig.cpp:2426
msgid "Time of the slow tilt"
-msgstr "느린 기울기의 시간"
+msgstr "천천히 기울이는 속도"
#: src/libslic3r/PrintConfig.cpp:2433
msgid "Area fill"
@@ -9668,7 +9670,7 @@ msgstr "병 볼륨"
#: src/libslic3r/PrintConfig.cpp:2492
msgid "ml"
-msgstr "광년"
+msgstr ""
#: src/libslic3r/PrintConfig.cpp:2497 src/libslic3r/PrintConfig.cpp:2498
msgid "Bottle weight"
@@ -9684,7 +9686,7 @@ msgstr "g /ml"
#: src/libslic3r/PrintConfig.cpp:2513
msgid "money/bottle"
-msgstr "돈 /병"
+msgstr "가격 /병"
#: src/libslic3r/PrintConfig.cpp:2518
msgid "Faded layers"
@@ -10037,11 +10039,11 @@ msgid ""
"Performance vs accuracy of calculation. Lower values may produce unwanted "
"artifacts."
msgstr ""
-"성능 대 계산의 정확성. 값이 낮을수록 원치 않는 아티팩트가 생성될 수 있습니다."
+"성능 계산의 정확성. 값이 낮을수록 원치 않는 아티팩트가 생성될 수 있습니다."
#: src/libslic3r/PrintConfig.cpp:2935
msgid "Hollowing closing distance"
-msgstr "공동화된 닫힘 반경"
+msgstr "속비움된 닫힘 반경"
#: src/libslic3r/PrintConfig.cpp:3315
msgid "Export OBJ"
diff --git a/resources/localization/nl/PrusaSlicer.mo b/resources/localization/nl/PrusaSlicer.mo
index 68dab14a0f..6c68f3922b 100644
Binary files a/resources/localization/nl/PrusaSlicer.mo and b/resources/localization/nl/PrusaSlicer.mo differ
diff --git a/resources/localization/nl/PrusaSlicer_nl.po b/resources/localization/nl/PrusaSlicer_nl.po
index 8dbac533e5..d0f065e527 100644
--- a/resources/localization/nl/PrusaSlicer_nl.po
+++ b/resources/localization/nl/PrusaSlicer_nl.po
@@ -7,27 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-19 13:53+0100\n"
-"PO-Revision-Date: 2020-02-20 21:20+0100\n"
+"POT-Creation-Date: 2020-03-11 15:15+0100\n"
+"PO-Revision-Date: 2020-03-13 10:54+0100\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
"Last-Translator: Simon Tillema \n"
"Language: nl\n"
-#: src/slic3r/GUI/AboutDialog.cpp:39 src/slic3r/GUI/AboutDialog.cpp:291
+#: src/slic3r/GUI/AboutDialog.cpp:41 src/slic3r/GUI/AboutDialog.cpp:294
msgid "Portions copyright"
msgstr "Gedeeltelijk auteursrecht"
-#: src/slic3r/GUI/AboutDialog.cpp:127 src/slic3r/GUI/AboutDialog.cpp:256
+#: src/slic3r/GUI/AboutDialog.cpp:129 src/slic3r/GUI/AboutDialog.cpp:258
msgid "Copyright"
msgstr "Auteursrecht"
#. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:129
+#: src/slic3r/GUI/AboutDialog.cpp:131
msgid ""
"License agreements of all following programs (libraries) are part of "
"application license agreement"
@@ -35,25 +35,25 @@ msgstr ""
"Licentieovereenkomsten van alle programma's (en onderdelen) zijn deel van de "
"applicatielicentieovereenkomst"
-#: src/slic3r/GUI/AboutDialog.cpp:199
+#: src/slic3r/GUI/AboutDialog.cpp:201
#, c-format
msgid "About %s"
msgstr "Over %s"
-#: src/slic3r/GUI/AboutDialog.cpp:231 src/slic3r/GUI/MainFrame.cpp:64
+#: src/slic3r/GUI/AboutDialog.cpp:233 src/slic3r/GUI/MainFrame.cpp:65
msgid "Version"
msgstr "Versie"
#. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:258
+#: src/slic3r/GUI/AboutDialog.cpp:260
msgid "is licensed under the"
msgstr "is gelicenseerd onder de"
-#: src/slic3r/GUI/AboutDialog.cpp:259
+#: src/slic3r/GUI/AboutDialog.cpp:261
msgid "GNU Affero General Public License, version 3"
msgstr "GNU Affero General Public License, versie 3"
-#: src/slic3r/GUI/AboutDialog.cpp:260
+#: src/slic3r/GUI/AboutDialog.cpp:262
msgid ""
"PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap "
"community."
@@ -61,7 +61,7 @@ msgstr ""
"PrusaSlicer is gebaseerd op 'Slic3r' van Alessandro Ranellucci en de RepRap "
"community."
-#: src/slic3r/GUI/AboutDialog.cpp:261
+#: src/slic3r/GUI/AboutDialog.cpp:263
msgid ""
"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, "
"Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and "
@@ -81,7 +81,7 @@ msgstr ""
"de fout handmatig te verwijderen om het te herstellen. Dit heeft geen effect "
"op uw gebruikersprofielen."
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:118
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:109
msgid ""
"Copying of the temporary G-code to the output G-code failed. Maybe the SD "
"card is write locked?"
@@ -89,25 +89,59 @@ msgstr ""
"Kopiëren van de tijdelijke G-code naar de output is mislukt. Is de SD-kaart "
"geblokkeerd?"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:120
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:470
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:112
+msgid ""
+"Copying of the temporary G-code to the output G-code failed. There might be "
+"problem with target device, please try exporting again or using different "
+"device. The corrupted output G-code is at %1%.tmp."
+msgstr ""
+"Kopiëren van de tijdelijke G-code naar de output mislukt. Er is mogelijk een "
+"probleem met het doelapparaat. Probeer opnieuw te exporteren of gebruik een "
+"ander apparaat. De beschadigde output-G-code is in %1%.tmp."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:115
+msgid ""
+"Renaming of the G-code after copying to the selected destination folder has "
+"failed. Current path is %1%.tmp. Please try exporting again."
+msgstr ""
+"Hernoemen van de G-code na het kopiëren naar de geselecteerde map is "
+"mislukt. Het huidige pad is %1%.tmp. Probeer opnieuw te exporteren."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:118
+msgid ""
+"Copying of the temporary G-code has finished but the original code at %1% "
+"couldn't be opened during copy check. The output G-code is at %2%.tmp."
+msgstr ""
+"Kopiëren van de tijdelijke G-code is afgerond, maar de originele code in %1% "
+"kon niet geopend worden tijdens het controleren. De output is in %1%.tmp."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:121
+msgid ""
+"Copying of the temporary G-code has finished but the exported code couldn't "
+"be opened during copy check. The output G-code is at %1%.tmp."
+msgstr ""
+"Kopiëren van de tijdelijke G-code is afgerond, maar de geëxporteerde code "
+"kon niet geopend worden voor controle. De output is in %1%.tmp."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:128
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:478
msgid "Running post-processing scripts"
msgstr "Uitvoeren van nabewerkingsscripts"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:122
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:130
msgid "G-code file exported to %1%"
msgstr "gcode-bestand geëxporteerd naar %1%"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:126
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:176
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:134
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:184
msgid "Slicing complete"
msgstr "Slicen compleet"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:172
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:180
msgid "Masked SLA file exported to %1%"
msgstr "Verborgen SLA-bestand geëxporteerd naar %1%"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:214
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:222
#, c-format
msgid ""
"%s has encountered an error. It was likely caused by running out of memory. "
@@ -118,16 +152,16 @@ msgstr ""
"zeker weet dat u genoeg RAM heeft, kan dit ook een andere systeemfout zijn. "
"We waarderen het als u dit meldt."
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:472
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:480
msgid "Copying of the temporary G-code to the output G-code failed"
msgstr "Kopiëren van de tijdelijke G-code naar de output is mislukt"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:497
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:505
msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue"
msgstr ""
"Plannen van de upload naar '%1%'. Zie Venster -> Printhost uploadwachtrij"
-#: src/slic3r/GUI/BedShapeDialog.cpp:66 src/slic3r/GUI/GUI_ObjectList.cpp:2055
+#: src/slic3r/GUI/BedShapeDialog.cpp:66 src/slic3r/GUI/GUI_ObjectList.cpp:2075
msgid "Shape"
msgstr "Vorm"
@@ -137,7 +171,7 @@ msgstr "Rechthoekig"
#: src/slic3r/GUI/BedShapeDialog.cpp:77
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:232 src/slic3r/GUI/Plater.cpp:160
-#: src/slic3r/GUI/Tab.cpp:2326
+#: src/slic3r/GUI/Tab.cpp:2308
msgid "Size"
msgstr "Grootte"
@@ -161,10 +195,10 @@ msgstr ""
msgid "Circular"
msgstr "Rond"
-#: src/slic3r/GUI/BedShapeDialog.cpp:92 src/slic3r/GUI/ConfigWizard.cpp:218
-#: src/slic3r/GUI/ConfigWizard.cpp:970 src/slic3r/GUI/ConfigWizard.cpp:984
+#: src/slic3r/GUI/BedShapeDialog.cpp:92 src/slic3r/GUI/ConfigWizard.cpp:233
+#: src/slic3r/GUI/ConfigWizard.cpp:985 src/slic3r/GUI/ConfigWizard.cpp:999
#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:87
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:135
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:142
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:333
#: src/slic3r/GUI/ObjectDataViewModel.cpp:94
#: src/slic3r/GUI/WipeTowerDialog.cpp:85 src/libslic3r/PrintConfig.cpp:75
@@ -189,15 +223,15 @@ msgstr "Rond"
#: src/libslic3r/PrintConfig.cpp:2450 src/libslic3r/PrintConfig.cpp:2484
#: src/libslic3r/PrintConfig.cpp:2623 src/libslic3r/PrintConfig.cpp:2632
#: src/libslic3r/PrintConfig.cpp:2641 src/libslic3r/PrintConfig.cpp:2651
-#: src/libslic3r/PrintConfig.cpp:2695 src/libslic3r/PrintConfig.cpp:2705
-#: src/libslic3r/PrintConfig.cpp:2717 src/libslic3r/PrintConfig.cpp:2737
-#: src/libslic3r/PrintConfig.cpp:2747 src/libslic3r/PrintConfig.cpp:2757
-#: src/libslic3r/PrintConfig.cpp:2775 src/libslic3r/PrintConfig.cpp:2790
-#: src/libslic3r/PrintConfig.cpp:2804 src/libslic3r/PrintConfig.cpp:2815
-#: src/libslic3r/PrintConfig.cpp:2828 src/libslic3r/PrintConfig.cpp:2873
-#: src/libslic3r/PrintConfig.cpp:2883 src/libslic3r/PrintConfig.cpp:2892
-#: src/libslic3r/PrintConfig.cpp:2902 src/libslic3r/PrintConfig.cpp:2918
-#: src/libslic3r/PrintConfig.cpp:2942
+#: src/libslic3r/PrintConfig.cpp:2705 src/libslic3r/PrintConfig.cpp:2715
+#: src/libslic3r/PrintConfig.cpp:2727 src/libslic3r/PrintConfig.cpp:2747
+#: src/libslic3r/PrintConfig.cpp:2757 src/libslic3r/PrintConfig.cpp:2767
+#: src/libslic3r/PrintConfig.cpp:2785 src/libslic3r/PrintConfig.cpp:2800
+#: src/libslic3r/PrintConfig.cpp:2814 src/libslic3r/PrintConfig.cpp:2825
+#: src/libslic3r/PrintConfig.cpp:2838 src/libslic3r/PrintConfig.cpp:2883
+#: src/libslic3r/PrintConfig.cpp:2893 src/libslic3r/PrintConfig.cpp:2902
+#: src/libslic3r/PrintConfig.cpp:2912 src/libslic3r/PrintConfig.cpp:2928
+#: src/libslic3r/PrintConfig.cpp:2952
msgid "mm"
msgstr "mm"
@@ -235,13 +269,13 @@ msgid "Load..."
msgstr "Laad..."
#: src/slic3r/GUI/BedShapeDialog.cpp:190 src/slic3r/GUI/BedShapeDialog.cpp:269
-#: src/slic3r/GUI/Tab.cpp:3114
+#: src/slic3r/GUI/Tab.cpp:3144
msgid "Remove"
msgstr "Verwijder"
#: src/slic3r/GUI/BedShapeDialog.cpp:223 src/slic3r/GUI/BedShapeDialog.cpp:302
-msgid "Not found: "
-msgstr "Niet gevonden: "
+msgid "Not found:"
+msgstr "Niet gevonden:"
#: src/slic3r/GUI/BedShapeDialog.cpp:251
msgid "Model"
@@ -279,7 +313,7 @@ msgstr "Kies een PNG- of SVG-bestand als textuur voor het bed:"
msgid "Choose an STL file to import bed model from:"
msgstr "Kies een STL-bestand als vorm voor het bed:"
-#: src/slic3r/GUI/BedShapeDialog.hpp:59 src/slic3r/GUI/ConfigWizard.cpp:929
+#: src/slic3r/GUI/BedShapeDialog.hpp:59 src/slic3r/GUI/ConfigWizard.cpp:944
msgid "Bed Shape"
msgstr "Vorm van het bed"
@@ -338,7 +372,7 @@ msgstr ""
"De laagdikte wordt ingesteld op 0.01."
#: src/slic3r/GUI/ConfigManipulation.cpp:49
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27 src/slic3r/GUI/Tab.cpp:1051
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27 src/slic3r/GUI/Tab.cpp:1109
#: src/libslic3r/PrintConfig.cpp:71
msgid "Layer height"
msgstr "Laagdikte"
@@ -448,9 +482,9 @@ msgid "Shall I switch to rectilinear fill pattern?"
msgstr "Moet omgeschakeld worden naar een rechtlijnig vulpatroon?"
#: src/slic3r/GUI/ConfigManipulation.cpp:211
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:94
-#: src/slic3r/GUI/GUI_ObjectList.cpp:612 src/slic3r/GUI/Plater.cpp:522
-#: src/slic3r/GUI/Tab.cpp:1093 src/slic3r/GUI/Tab.cpp:1094
+#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
+#: src/slic3r/GUI/GUI_ObjectList.cpp:620 src/slic3r/GUI/Plater.cpp:532
+#: src/slic3r/GUI/Tab.cpp:1151 src/slic3r/GUI/Tab.cpp:1152
#: src/libslic3r/PrintConfig.cpp:203 src/libslic3r/PrintConfig.cpp:416
#: src/libslic3r/PrintConfig.cpp:436 src/libslic3r/PrintConfig.cpp:776
#: src/libslic3r/PrintConfig.cpp:790 src/libslic3r/PrintConfig.cpp:827
@@ -505,7 +539,7 @@ msgstr "Actief"
msgid "PrusaSlicer version"
msgstr "PrusaSlicer-versie"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Preset.cpp:1519
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Preset.cpp:1551
msgid "print"
msgstr "print"
@@ -513,11 +547,11 @@ msgstr "print"
msgid "filaments"
msgstr "filamenten"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53 src/slic3r/GUI/Preset.cpp:1523
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53 src/slic3r/GUI/Preset.cpp:1555
msgid "printer"
msgstr "printer"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57 src/slic3r/GUI/Tab.cpp:973
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57 src/slic3r/GUI/Tab.cpp:1027
msgid "vendor"
msgstr "leverancier"
@@ -554,48 +588,48 @@ msgstr "Activeer"
msgid "Configuration Snapshots"
msgstr "Configuratiesnapshots"
-#: src/slic3r/GUI/ConfigWizard.cpp:218
+#: src/slic3r/GUI/ConfigWizard.cpp:233
msgid "nozzle"
msgstr "nozzle"
-#: src/slic3r/GUI/ConfigWizard.cpp:222
+#: src/slic3r/GUI/ConfigWizard.cpp:237
msgid "Alternate nozzles:"
msgstr "Alternatieve nozzles:"
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:304
msgid "All standard"
msgstr "Alle standaard"
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:304
msgid "Standard"
msgstr "Standaard"
-#: src/slic3r/GUI/ConfigWizard.cpp:290 src/slic3r/GUI/ConfigWizard.cpp:573
-#: src/slic3r/GUI/Tab.cpp:3164
+#: src/slic3r/GUI/ConfigWizard.cpp:305 src/slic3r/GUI/ConfigWizard.cpp:588
+#: src/slic3r/GUI/Tab.cpp:3203
msgid "All"
msgstr "Alle"
-#: src/slic3r/GUI/ConfigWizard.cpp:291 src/slic3r/GUI/ConfigWizard.cpp:574
-#: src/slic3r/GUI/Plater.cpp:494 src/slic3r/GUI/Plater.cpp:634
+#: src/slic3r/GUI/ConfigWizard.cpp:306 src/slic3r/GUI/ConfigWizard.cpp:589
+#: src/slic3r/GUI/Plater.cpp:504 src/slic3r/GUI/Plater.cpp:644
#: src/libslic3r/ExtrusionEntity.cpp:309
msgid "None"
msgstr "Geen"
-#: src/slic3r/GUI/ConfigWizard.cpp:427
+#: src/slic3r/GUI/ConfigWizard.cpp:442
#, c-format
msgid "Welcome to the %s Configuration Assistant"
msgstr "Welkom bij de %s configuratie-assistent"
-#: src/slic3r/GUI/ConfigWizard.cpp:429
+#: src/slic3r/GUI/ConfigWizard.cpp:444
#, c-format
msgid "Welcome to the %s Configuration Wizard"
msgstr "Welkom bij de %s configuratiewizard"
-#: src/slic3r/GUI/ConfigWizard.cpp:431
+#: src/slic3r/GUI/ConfigWizard.cpp:446
msgid "Welcome"
msgstr "Welkom"
-#: src/slic3r/GUI/ConfigWizard.cpp:433
+#: src/slic3r/GUI/ConfigWizard.cpp:448
#, c-format
msgid ""
"Hello, welcome to %s! This %s helps you with the initial configuration; just "
@@ -604,7 +638,7 @@ msgstr ""
"Hallo, welkom bij %s! Deze '%s' helpt met de eerste setup; nog een paar "
"instellingen en de printer kan gebruikt worden."
-#: src/slic3r/GUI/ConfigWizard.cpp:438
+#: src/slic3r/GUI/ConfigWizard.cpp:453
msgid ""
"Remove user profiles - install from scratch (a snapshot will be taken "
"beforehand)"
@@ -612,52 +646,52 @@ msgstr ""
"Verwijder alle gebruiksprofielen; installeer vanaf scratch (vooraf wordt een "
"snapshot genomen)"
-#: src/slic3r/GUI/ConfigWizard.cpp:481
+#: src/slic3r/GUI/ConfigWizard.cpp:496
#, c-format
msgid "%s Family"
msgstr "%s serie"
-#: src/slic3r/GUI/ConfigWizard.cpp:565
+#: src/slic3r/GUI/ConfigWizard.cpp:580
msgid "Vendor:"
msgstr "Leverancier:"
-#: src/slic3r/GUI/ConfigWizard.cpp:566
+#: src/slic3r/GUI/ConfigWizard.cpp:581
msgid "Profile:"
msgstr "Profiel:"
-#: src/slic3r/GUI/ConfigWizard.cpp:603 src/slic3r/GUI/ConfigWizard.cpp:631
+#: src/slic3r/GUI/ConfigWizard.cpp:618 src/slic3r/GUI/ConfigWizard.cpp:646
msgid "(All)"
msgstr "(Alle)"
-#: src/slic3r/GUI/ConfigWizard.cpp:732
+#: src/slic3r/GUI/ConfigWizard.cpp:747
msgid "Custom Printer Setup"
msgstr "Custom printersetup"
-#: src/slic3r/GUI/ConfigWizard.cpp:732
+#: src/slic3r/GUI/ConfigWizard.cpp:747
msgid "Custom Printer"
msgstr "Custom printer"
-#: src/slic3r/GUI/ConfigWizard.cpp:734
+#: src/slic3r/GUI/ConfigWizard.cpp:749
msgid "Define a custom printer profile"
msgstr "Definieer een custom-printerprofiel"
-#: src/slic3r/GUI/ConfigWizard.cpp:736
+#: src/slic3r/GUI/ConfigWizard.cpp:751
msgid "Custom profile name:"
msgstr "Custom-profielnaam:"
-#: src/slic3r/GUI/ConfigWizard.cpp:761
+#: src/slic3r/GUI/ConfigWizard.cpp:776
msgid "Automatic updates"
msgstr "Automatische updates"
-#: src/slic3r/GUI/ConfigWizard.cpp:761
+#: src/slic3r/GUI/ConfigWizard.cpp:776
msgid "Updates"
msgstr "Updates"
-#: src/slic3r/GUI/ConfigWizard.cpp:769 src/slic3r/GUI/Preferences.cpp:64
+#: src/slic3r/GUI/ConfigWizard.cpp:784 src/slic3r/GUI/Preferences.cpp:64
msgid "Check for application updates"
msgstr "Controleer op programma-updates"
-#: src/slic3r/GUI/ConfigWizard.cpp:773
+#: src/slic3r/GUI/ConfigWizard.cpp:788
#, c-format
msgid ""
"If enabled, %s checks for new application versions online. When a new "
@@ -670,11 +704,11 @@ msgstr ""
"volgende keer opstarten (nooit tijdens gebruik van het programma). Dit is "
"slechts een melding; er zal geen automatische installatie plaatsvinden."
-#: src/slic3r/GUI/ConfigWizard.cpp:779 src/slic3r/GUI/Preferences.cpp:80
+#: src/slic3r/GUI/ConfigWizard.cpp:794 src/slic3r/GUI/Preferences.cpp:80
msgid "Update built-in Presets automatically"
msgstr "Update ingebouwde presets automatisch"
-#: src/slic3r/GUI/ConfigWizard.cpp:783
+#: src/slic3r/GUI/ConfigWizard.cpp:798
#, c-format
msgid ""
"If enabled, %s downloads updates of built-in system presets in the "
@@ -687,7 +721,7 @@ msgstr ""
"locatie. Wanneer een nieuwe versie beschikbaar komt zal deze getoond worden "
"bij het opstarten."
-#: src/slic3r/GUI/ConfigWizard.cpp:786
+#: src/slic3r/GUI/ConfigWizard.cpp:801
msgid ""
"Updates are never applied without user's consent and never overwrite user's "
"customized settings."
@@ -695,7 +729,7 @@ msgstr ""
"Updates worden nooit geïnstalleerd en overschreven zonder toestemming van de "
"gebruiker."
-#: src/slic3r/GUI/ConfigWizard.cpp:791
+#: src/slic3r/GUI/ConfigWizard.cpp:806
msgid ""
"Additionally a backup snapshot of the whole configuration is created before "
"an update is applied."
@@ -703,19 +737,19 @@ msgstr ""
"Voor een update wordt geïnstalleerd wordt daarnaast een backup-snapshot van "
"de hele configuratie gemaakt."
-#: src/slic3r/GUI/ConfigWizard.cpp:798 src/slic3r/GUI/GUI_ObjectList.cpp:1660
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3950 src/slic3r/GUI/Plater.cpp:3203
-#: src/slic3r/GUI/Plater.cpp:3912 src/slic3r/GUI/Plater.cpp:3941
+#: src/slic3r/GUI/ConfigWizard.cpp:813 src/slic3r/GUI/GUI_ObjectList.cpp:1680
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3984 src/slic3r/GUI/Plater.cpp:3282
+#: src/slic3r/GUI/Plater.cpp:3986 src/slic3r/GUI/Plater.cpp:4015
msgid "Reload from disk"
msgstr "Herlaad vanaf schijf"
-#: src/slic3r/GUI/ConfigWizard.cpp:801
+#: src/slic3r/GUI/ConfigWizard.cpp:816
msgid ""
"Export full pathnames of models and parts sources into 3mf and amf files"
msgstr ""
"Exporteer hele padnamen van modellen en onderdelen in .3MF- en .AMF-bestanden"
-#: src/slic3r/GUI/ConfigWizard.cpp:805
+#: src/slic3r/GUI/ConfigWizard.cpp:820
msgid ""
"If enabled, allows the Reload from disk command to automatically find and "
"load the files when invoked.\n"
@@ -727,11 +761,11 @@ msgstr ""
"Als dit niet is ingeschakeld zal het commando vragen elk bestand te "
"selecteren door een bestandsvenster te openen."
-#: src/slic3r/GUI/ConfigWizard.cpp:813
+#: src/slic3r/GUI/ConfigWizard.cpp:828
msgid "View mode"
msgstr "Weergavemodus"
-#: src/slic3r/GUI/ConfigWizard.cpp:815
+#: src/slic3r/GUI/ConfigWizard.cpp:830
msgid ""
"PrusaSlicer's user interfaces comes in three variants:\n"
"Simple, Advanced, and Expert.\n"
@@ -745,68 +779,68 @@ msgstr ""
"andere twee bieden meer geavanceerde finetuning. Ze zijn geschikt voor "
"respectievelijk gevorderde en deskundige gebruikers."
-#: src/slic3r/GUI/ConfigWizard.cpp:820
+#: src/slic3r/GUI/ConfigWizard.cpp:835
msgid "Simple mode"
msgstr "Eenvoudige modus"
-#: src/slic3r/GUI/ConfigWizard.cpp:821
+#: src/slic3r/GUI/ConfigWizard.cpp:836
msgid "Advanced mode"
msgstr "Geavanceerde modus"
-#: src/slic3r/GUI/ConfigWizard.cpp:822
+#: src/slic3r/GUI/ConfigWizard.cpp:837
msgid "Expert mode"
msgstr "Expertmodus"
-#: src/slic3r/GUI/ConfigWizard.cpp:856
+#: src/slic3r/GUI/ConfigWizard.cpp:871
msgid "Other Vendors"
msgstr "Overige leveranciers"
-#: src/slic3r/GUI/ConfigWizard.cpp:860
+#: src/slic3r/GUI/ConfigWizard.cpp:875
#, c-format
msgid "Pick another vendor supported by %s"
msgstr "Kies een andere leverancier die ondersteund wordt door %s"
-#: src/slic3r/GUI/ConfigWizard.cpp:891
+#: src/slic3r/GUI/ConfigWizard.cpp:906
msgid "Firmware Type"
msgstr "Firmwaretype"
-#: src/slic3r/GUI/ConfigWizard.cpp:891 src/slic3r/GUI/Tab.cpp:1949
+#: src/slic3r/GUI/ConfigWizard.cpp:906 src/slic3r/GUI/Tab.cpp:1969
msgid "Firmware"
msgstr "Firmware"
-#: src/slic3r/GUI/ConfigWizard.cpp:895
+#: src/slic3r/GUI/ConfigWizard.cpp:910
msgid "Choose the type of firmware used by your printer."
msgstr "Kies het firmwaretype dat de printer gebruikt."
-#: src/slic3r/GUI/ConfigWizard.cpp:929
+#: src/slic3r/GUI/ConfigWizard.cpp:944
msgid "Bed Shape and Size"
msgstr "Grootte en vorm van het bed"
-#: src/slic3r/GUI/ConfigWizard.cpp:932
+#: src/slic3r/GUI/ConfigWizard.cpp:947
msgid "Set the shape of your printer's bed."
msgstr "Stel de vorm van het printbed in."
-#: src/slic3r/GUI/ConfigWizard.cpp:952
+#: src/slic3r/GUI/ConfigWizard.cpp:967
msgid "Filament and Nozzle Diameters"
msgstr "Filament- en nozzlediameters"
-#: src/slic3r/GUI/ConfigWizard.cpp:952
+#: src/slic3r/GUI/ConfigWizard.cpp:967
msgid "Print Diameters"
msgstr "Printdiameters"
-#: src/slic3r/GUI/ConfigWizard.cpp:966
+#: src/slic3r/GUI/ConfigWizard.cpp:981
msgid "Enter the diameter of your printer's hot end nozzle."
msgstr "Voer de nozzlediameter in."
-#: src/slic3r/GUI/ConfigWizard.cpp:969
+#: src/slic3r/GUI/ConfigWizard.cpp:984
msgid "Nozzle Diameter:"
msgstr "Nozzlediameter:"
-#: src/slic3r/GUI/ConfigWizard.cpp:979
+#: src/slic3r/GUI/ConfigWizard.cpp:994
msgid "Enter the diameter of your filament."
msgstr "Voer de filamentdiameter in."
-#: src/slic3r/GUI/ConfigWizard.cpp:980
+#: src/slic3r/GUI/ConfigWizard.cpp:995
msgid ""
"Good precision is required, so use a caliper and do multiple measurements "
"along the filament, then compute the average."
@@ -814,35 +848,35 @@ msgstr ""
"Nauwkeurigheid is belangrijk. Gebruik een schuifmaat en meet de diameter op "
"meerdere plekken over de gehele rol. Bereken daarna het gemiddelde."
-#: src/slic3r/GUI/ConfigWizard.cpp:983
+#: src/slic3r/GUI/ConfigWizard.cpp:998
msgid "Filament Diameter:"
msgstr "Filamentdiameter:"
-#: src/slic3r/GUI/ConfigWizard.cpp:1017
+#: src/slic3r/GUI/ConfigWizard.cpp:1032
msgid "Extruder and Bed Temperatures"
msgstr "Extruder- en bedtemperaturen"
-#: src/slic3r/GUI/ConfigWizard.cpp:1017
+#: src/slic3r/GUI/ConfigWizard.cpp:1032
msgid "Temperatures"
msgstr "Temperaturen"
-#: src/slic3r/GUI/ConfigWizard.cpp:1033
+#: src/slic3r/GUI/ConfigWizard.cpp:1048
msgid "Enter the temperature needed for extruding your filament."
msgstr "Voer de benodigde temperatuur in om het filament te extruderen."
-#: src/slic3r/GUI/ConfigWizard.cpp:1034
+#: src/slic3r/GUI/ConfigWizard.cpp:1049
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "Een vuistregel is 180 - 230 °C voor PLA en 220 - 260 °C voor ABS."
-#: src/slic3r/GUI/ConfigWizard.cpp:1037
+#: src/slic3r/GUI/ConfigWizard.cpp:1052
msgid "Extrusion Temperature:"
msgstr "Extrusietemperatuur:"
-#: src/slic3r/GUI/ConfigWizard.cpp:1038 src/slic3r/GUI/ConfigWizard.cpp:1052
+#: src/slic3r/GUI/ConfigWizard.cpp:1053 src/slic3r/GUI/ConfigWizard.cpp:1067
msgid "°C"
msgstr "°C"
-#: src/slic3r/GUI/ConfigWizard.cpp:1047
+#: src/slic3r/GUI/ConfigWizard.cpp:1062
msgid ""
"Enter the bed temperature needed for getting your filament to stick to your "
"heated bed."
@@ -850,7 +884,7 @@ msgstr ""
"Voer de temperatuur van het bed in om het filament goed te laten hechten aan "
"het bed."
-#: src/slic3r/GUI/ConfigWizard.cpp:1048
+#: src/slic3r/GUI/ConfigWizard.cpp:1063
msgid ""
"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
"no heated bed."
@@ -858,105 +892,105 @@ msgstr ""
"Een vuistregel is 60 °C voor PLA en 110 °C voor ABS. Stel in op 0 als de "
"printer geen verwarmd bed heeft."
-#: src/slic3r/GUI/ConfigWizard.cpp:1051
+#: src/slic3r/GUI/ConfigWizard.cpp:1066
msgid "Bed Temperature:"
msgstr "Bedtemperatuur:"
-#: src/slic3r/GUI/ConfigWizard.cpp:1471 src/slic3r/GUI/ConfigWizard.cpp:2013
+#: src/slic3r/GUI/ConfigWizard.cpp:1486 src/slic3r/GUI/ConfigWizard.cpp:2028
msgid "Filaments"
msgstr "Filamenten"
-#: src/slic3r/GUI/ConfigWizard.cpp:1471 src/slic3r/GUI/ConfigWizard.cpp:2015
+#: src/slic3r/GUI/ConfigWizard.cpp:1486 src/slic3r/GUI/ConfigWizard.cpp:2030
msgid "SLA Materials"
msgstr "SLA-materialen"
-#: src/slic3r/GUI/ConfigWizard.cpp:1525
+#: src/slic3r/GUI/ConfigWizard.cpp:1540
msgid "FFF Technology Printers"
msgstr "FFF-technologie printers"
-#: src/slic3r/GUI/ConfigWizard.cpp:1530
+#: src/slic3r/GUI/ConfigWizard.cpp:1545
msgid "SLA Technology Printers"
msgstr "SLA-technologie printers"
-#: src/slic3r/GUI/ConfigWizard.cpp:1751 src/slic3r/GUI/DoubleSlider.cpp:1903
-#: src/slic3r/GUI/DoubleSlider.cpp:1924 src/slic3r/GUI/GUI.cpp:240
+#: src/slic3r/GUI/ConfigWizard.cpp:1766 src/slic3r/GUI/DoubleSlider.cpp:1905
+#: src/slic3r/GUI/DoubleSlider.cpp:1926 src/slic3r/GUI/GUI.cpp:246
msgid "Notice"
msgstr "Let op"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
+#: src/slic3r/GUI/ConfigWizard.cpp:1775
msgid "You have to select at least one filament for selected printers"
msgstr "Selecteer tenminste één filament voor de geselecteerde printer(s)"
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
+#: src/slic3r/GUI/ConfigWizard.cpp:1776
msgid "Do you want to automatic select default filaments?"
msgstr "Wilt u automatisch de standaard filamenten selecteren?"
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
+#: src/slic3r/GUI/ConfigWizard.cpp:1786
msgid "You have to select at least one material for selected printers"
msgstr "Selecteer tenminste één materiaal voor de geselecteerde printer(s)"
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
+#: src/slic3r/GUI/ConfigWizard.cpp:1787
msgid "Do you want to automatic select default materials?"
msgstr "Wilt u automatisch de standaard materialen selecteren?"
-#: src/slic3r/GUI/ConfigWizard.cpp:1976
+#: src/slic3r/GUI/ConfigWizard.cpp:1991
msgid "Select all standard printers"
msgstr "Selecteer alle standaard printers"
-#: src/slic3r/GUI/ConfigWizard.cpp:1979
+#: src/slic3r/GUI/ConfigWizard.cpp:1994
msgid "< &Back"
msgstr "< Terug"
-#: src/slic3r/GUI/ConfigWizard.cpp:1980
+#: src/slic3r/GUI/ConfigWizard.cpp:1995
msgid "&Next >"
msgstr "Volgende >"
-#: src/slic3r/GUI/ConfigWizard.cpp:1981
+#: src/slic3r/GUI/ConfigWizard.cpp:1996
msgid "&Finish"
msgstr "Voltooien"
-#: src/slic3r/GUI/ConfigWizard.cpp:1982 src/slic3r/GUI/FirmwareDialog.cpp:151
+#: src/slic3r/GUI/ConfigWizard.cpp:1997 src/slic3r/GUI/FirmwareDialog.cpp:151
#: src/slic3r/GUI/ProgressStatusBar.cpp:26
msgid "Cancel"
msgstr "Annuleren"
-#: src/slic3r/GUI/ConfigWizard.cpp:1995
+#: src/slic3r/GUI/ConfigWizard.cpp:2010
msgid "Prusa FFF Technology Printers"
msgstr "Prusa FFF-technologie printers"
-#: src/slic3r/GUI/ConfigWizard.cpp:1998
+#: src/slic3r/GUI/ConfigWizard.cpp:2013
msgid "Prusa MSLA Technology Printers"
msgstr "Prusa MSLA-technologie printers"
-#: src/slic3r/GUI/ConfigWizard.cpp:2013
+#: src/slic3r/GUI/ConfigWizard.cpp:2028
msgid "Filament Profiles Selection"
msgstr "Profielselectie voor filament"
-#: src/slic3r/GUI/ConfigWizard.cpp:2013 src/slic3r/GUI/GUI_ObjectList.cpp:3549
+#: src/slic3r/GUI/ConfigWizard.cpp:2028 src/slic3r/GUI/GUI_ObjectList.cpp:3581
msgid "Type:"
msgstr "Type:"
-#: src/slic3r/GUI/ConfigWizard.cpp:2015
+#: src/slic3r/GUI/ConfigWizard.cpp:2030
msgid "SLA Material Profiles Selection"
msgstr "Profielselectie voor SLA materialen"
-#: src/slic3r/GUI/ConfigWizard.cpp:2015
+#: src/slic3r/GUI/ConfigWizard.cpp:2030
msgid "Layer height:"
msgstr "Laagdikte:"
-#: src/slic3r/GUI/ConfigWizard.cpp:2109
+#: src/slic3r/GUI/ConfigWizard.cpp:2124
msgid "Configuration Assistant"
msgstr "Configuratie-assistent"
-#: src/slic3r/GUI/ConfigWizard.cpp:2110
+#: src/slic3r/GUI/ConfigWizard.cpp:2125
msgid "Configuration &Assistant"
msgstr "Configuratie-assistent"
-#: src/slic3r/GUI/ConfigWizard.cpp:2112
+#: src/slic3r/GUI/ConfigWizard.cpp:2127
msgid "Configuration Wizard"
msgstr "Configuratiewizard"
-#: src/slic3r/GUI/ConfigWizard.cpp:2113
+#: src/slic3r/GUI/ConfigWizard.cpp:2128
msgid "Configuration &Wizard"
msgstr "Configuratiewizard"
@@ -964,37 +998,37 @@ msgstr "Configuratiewizard"
msgid "Place bearings in slots and resume printing"
msgstr "Plaats inserts in gaten en ga door met printen"
-#: src/slic3r/GUI/DoubleSlider.cpp:948
+#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Een-laagsmodus"
-#: src/slic3r/GUI/DoubleSlider.cpp:950
+#: src/slic3r/GUI/DoubleSlider.cpp:952
msgid "Discard all custom changes"
msgstr "Alle aangepaste wijzigingen afwijzen"
-#: src/slic3r/GUI/DoubleSlider.cpp:953
+#: src/slic3r/GUI/DoubleSlider.cpp:955
#, c-format
msgid "Jump to height %s or Set extruder sequence for the entire print"
msgstr "Ga naar hoogte %s of stel extrudervolgorde voor de hele print in"
-#: src/slic3r/GUI/DoubleSlider.cpp:955 src/slic3r/GUI/DoubleSlider.cpp:1527
-#: src/slic3r/GUI/DoubleSlider.cpp:1649
+#: src/slic3r/GUI/DoubleSlider.cpp:957 src/slic3r/GUI/DoubleSlider.cpp:1529
+#: src/slic3r/GUI/DoubleSlider.cpp:1651
msgid "Jump to height"
msgstr "Ga naar hoogte"
-#: src/slic3r/GUI/DoubleSlider.cpp:958
+#: src/slic3r/GUI/DoubleSlider.cpp:960
msgid "Edit current color - Right click the colored slider segment"
msgstr "Wijzig huidige kleur; klik op het gekleurde segment"
-#: src/slic3r/GUI/DoubleSlider.cpp:968
+#: src/slic3r/GUI/DoubleSlider.cpp:970
msgid "Print mode"
msgstr "Printmodus"
-#: src/slic3r/GUI/DoubleSlider.cpp:982
+#: src/slic3r/GUI/DoubleSlider.cpp:984
msgid "Add extruder change - Left click"
msgstr "Voeg extruderwissel toe; linkermuisknop"
-#: src/slic3r/GUI/DoubleSlider.cpp:984
+#: src/slic3r/GUI/DoubleSlider.cpp:986
msgid ""
"Add color change - Left click for predefined color or Shift + Left click for "
"custom color selection"
@@ -1002,23 +1036,23 @@ msgstr ""
"Voeg kleurwissel toe; linkermuisknop voor ingestelde kleur of SHIFT + "
"linkermuisknop voor custom kleurselectie"
-#: src/slic3r/GUI/DoubleSlider.cpp:986
+#: src/slic3r/GUI/DoubleSlider.cpp:988
msgid "Add color change - Left click"
msgstr "Voeg kleurwissel toe; linkermuisknop"
-#: src/slic3r/GUI/DoubleSlider.cpp:987
+#: src/slic3r/GUI/DoubleSlider.cpp:989
msgid "or press \"+\" key"
msgstr "of druk op de '+'-toets"
-#: src/slic3r/GUI/DoubleSlider.cpp:989
+#: src/slic3r/GUI/DoubleSlider.cpp:991
msgid "Add another code - Ctrl + Left click"
msgstr "Voeg nog een code toe; CTRL + linkermuisknop"
-#: src/slic3r/GUI/DoubleSlider.cpp:990
+#: src/slic3r/GUI/DoubleSlider.cpp:992
msgid "Add another code - Right click"
msgstr "Voeg nog een code toe; rechtermuisknop"
-#: src/slic3r/GUI/DoubleSlider.cpp:996
+#: src/slic3r/GUI/DoubleSlider.cpp:998
msgid ""
"The sequential print is on.\n"
"It's impossible to apply any custom G-code for objects printing "
@@ -1030,27 +1064,27 @@ msgstr ""
"achtereenvolgens printen.\n"
"Deze code wordt niet uitgevoerd bij de generatie van de G-code."
-#: src/slic3r/GUI/DoubleSlider.cpp:1003
+#: src/slic3r/GUI/DoubleSlider.cpp:1005
msgid "Color change (\"%1%\")"
msgstr "Kleurwissel (%1%)"
-#: src/slic3r/GUI/DoubleSlider.cpp:1004
+#: src/slic3r/GUI/DoubleSlider.cpp:1006
msgid "Color change (\"%1%\") for Extruder %2%"
msgstr "Kleurwissel (%1%) voor extruder %2%"
-#: src/slic3r/GUI/DoubleSlider.cpp:1007
+#: src/slic3r/GUI/DoubleSlider.cpp:1009
msgid "Pause print (\"%1%\")"
msgstr "Pauzeer print (%1%)"
-#: src/slic3r/GUI/DoubleSlider.cpp:1009
+#: src/slic3r/GUI/DoubleSlider.cpp:1011
msgid "Extruder (tool) is changed to Extruder \"%1%\""
msgstr "Extruder (tool) is veranderd naar extruder %1%"
-#: src/slic3r/GUI/DoubleSlider.cpp:1017
+#: src/slic3r/GUI/DoubleSlider.cpp:1019
msgid "Note"
msgstr "Let op"
-#: src/slic3r/GUI/DoubleSlider.cpp:1019
+#: src/slic3r/GUI/DoubleSlider.cpp:1021
msgid ""
"G-code associated to this tick mark is in a conflict with print mode.\n"
"Editing it will cause changes of Slider data."
@@ -1059,7 +1093,7 @@ msgstr ""
"printmodus.\n"
"Dit aanpassen zal de gegevens van de schuif ook aanpassen."
-#: src/slic3r/GUI/DoubleSlider.cpp:1022
+#: src/slic3r/GUI/DoubleSlider.cpp:1024
msgid ""
"There is a color change for extruder that won't be used till the end of "
"print job.\n"
@@ -1069,7 +1103,7 @@ msgstr ""
"van de print.\n"
"Deze code wordt niet toegevoegd bij de generatie van de G-code."
-#: src/slic3r/GUI/DoubleSlider.cpp:1025
+#: src/slic3r/GUI/DoubleSlider.cpp:1027
msgid ""
"There is an extruder change set to the same extruder.\n"
"This code won't be processed during G-code generation."
@@ -1077,7 +1111,7 @@ msgstr ""
"Er is een extruderwissel naar dezelfde extruder ingesteld.\n"
"Deze code wordt niet toegevoegd bij de generatie van de G-code."
-#: src/slic3r/GUI/DoubleSlider.cpp:1028
+#: src/slic3r/GUI/DoubleSlider.cpp:1030
msgid ""
"There is a color change for extruder that has not been used before.\n"
"Check your settings to avoid redundant color changes."
@@ -1085,157 +1119,157 @@ msgstr ""
"Er is een kleurwissel voor een extruder die niet eerder gebruikt is.\n"
"Controleer de instellingen om overbodige kleurwisselingen te voorkomen."
-#: src/slic3r/GUI/DoubleSlider.cpp:1033
+#: src/slic3r/GUI/DoubleSlider.cpp:1035
msgid "Delete tick mark - Left click or press \"-\" key"
msgstr "Verwijder markering; linkermuisknop of druk op de '-'-knop"
-#: src/slic3r/GUI/DoubleSlider.cpp:1035
+#: src/slic3r/GUI/DoubleSlider.cpp:1037
msgid "Edit tick mark - Ctrl + Left click"
msgstr "Bewerk markering; CTRL + linkermuisknop"
-#: src/slic3r/GUI/DoubleSlider.cpp:1036
+#: src/slic3r/GUI/DoubleSlider.cpp:1038
msgid "Edit tick mark - Right click"
msgstr "Bewerk markering; rechtermuisknop"
-#: src/slic3r/GUI/DoubleSlider.cpp:1132 src/slic3r/GUI/DoubleSlider.cpp:1168
-#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1700
-#: src/slic3r/GUI/Tab.cpp:2322 src/libslic3r/GCode/PreviewData.cpp:445
+#: src/slic3r/GUI/DoubleSlider.cpp:1134 src/slic3r/GUI/DoubleSlider.cpp:1170
+#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1720
+#: src/slic3r/GUI/Tab.cpp:2304 src/libslic3r/GCode/PreviewData.cpp:445
#, c-format
msgid "Extruder %d"
msgstr "Extruder %d"
-#: src/slic3r/GUI/DoubleSlider.cpp:1133 src/slic3r/GUI/GUI_ObjectList.cpp:1701
+#: src/slic3r/GUI/DoubleSlider.cpp:1135 src/slic3r/GUI/GUI_ObjectList.cpp:1721
msgid "active"
msgstr "actief"
-#: src/slic3r/GUI/DoubleSlider.cpp:1142
+#: src/slic3r/GUI/DoubleSlider.cpp:1144
msgid "Switch code to Change extruder"
msgstr "Code om van extruder te wisselen"
-#: src/slic3r/GUI/DoubleSlider.cpp:1142 src/slic3r/GUI/GUI_ObjectList.cpp:1667
+#: src/slic3r/GUI/DoubleSlider.cpp:1144 src/slic3r/GUI/GUI_ObjectList.cpp:1687
msgid "Change extruder"
msgstr "Wissel extruder"
-#: src/slic3r/GUI/DoubleSlider.cpp:1143
+#: src/slic3r/GUI/DoubleSlider.cpp:1145
msgid "Change extruder (N/A)"
msgstr "Wissel extruder (n.v.t.)"
-#: src/slic3r/GUI/DoubleSlider.cpp:1145
+#: src/slic3r/GUI/DoubleSlider.cpp:1147
msgid "Use another extruder"
msgstr "Gebruik een andere extruder"
-#: src/slic3r/GUI/DoubleSlider.cpp:1169
+#: src/slic3r/GUI/DoubleSlider.cpp:1171
msgid "used"
msgstr "gebruikt"
-#: src/slic3r/GUI/DoubleSlider.cpp:1177
+#: src/slic3r/GUI/DoubleSlider.cpp:1179
msgid "Switch code to Color change (%1%) for:"
msgstr "Code om naar kleur %1% te wisselen voor:"
-#: src/slic3r/GUI/DoubleSlider.cpp:1178
+#: src/slic3r/GUI/DoubleSlider.cpp:1180
msgid "Add color change (%1%) for:"
msgstr "Voeg kleurwissel (%1%) toe voor:"
-#: src/slic3r/GUI/DoubleSlider.cpp:1475
+#: src/slic3r/GUI/DoubleSlider.cpp:1477
msgid "Add color change"
msgstr "Voeg kleurwissel toe"
-#: src/slic3r/GUI/DoubleSlider.cpp:1485
+#: src/slic3r/GUI/DoubleSlider.cpp:1487
msgid "Add pause print"
msgstr "Voeg printpauze toe"
-#: src/slic3r/GUI/DoubleSlider.cpp:1488
+#: src/slic3r/GUI/DoubleSlider.cpp:1490
msgid "Add custom G-code"
msgstr "Voeg custom G-code toe"
-#: src/slic3r/GUI/DoubleSlider.cpp:1506
+#: src/slic3r/GUI/DoubleSlider.cpp:1508
msgid "Edit color"
msgstr "Bewerk kleur"
-#: src/slic3r/GUI/DoubleSlider.cpp:1507
+#: src/slic3r/GUI/DoubleSlider.cpp:1509
msgid "Edit pause print message"
msgstr "Bewerk printpauze-bericht"
-#: src/slic3r/GUI/DoubleSlider.cpp:1508
+#: src/slic3r/GUI/DoubleSlider.cpp:1510
msgid "Edit custom G-code"
msgstr "Bewerk custom G-code"
-#: src/slic3r/GUI/DoubleSlider.cpp:1514
+#: src/slic3r/GUI/DoubleSlider.cpp:1516
msgid "Delete color change"
msgstr "Verwijder kleurwissel"
-#: src/slic3r/GUI/DoubleSlider.cpp:1515
+#: src/slic3r/GUI/DoubleSlider.cpp:1517
msgid "Delete tool change"
msgstr "Verwijder toolwissel"
-#: src/slic3r/GUI/DoubleSlider.cpp:1516
+#: src/slic3r/GUI/DoubleSlider.cpp:1518
msgid "Delete pause print"
msgstr "Verwijder printpauze"
-#: src/slic3r/GUI/DoubleSlider.cpp:1517
+#: src/slic3r/GUI/DoubleSlider.cpp:1519
msgid "Delete custom G-code"
msgstr "Verwijder custom G-code"
-#: src/slic3r/GUI/DoubleSlider.cpp:1530
+#: src/slic3r/GUI/DoubleSlider.cpp:1532
msgid "Set extruder sequence for the entire print"
msgstr "Stel extrudervolgorde in voor de hele print"
-#: src/slic3r/GUI/DoubleSlider.cpp:1616
+#: src/slic3r/GUI/DoubleSlider.cpp:1618
msgid "Enter custom G-code used on current layer"
msgstr "Voer custom G-code in voor de huidige laag"
-#: src/slic3r/GUI/DoubleSlider.cpp:1617
+#: src/slic3r/GUI/DoubleSlider.cpp:1619
msgid "Custom G-code on current layer (%1% mm)."
msgstr "Custom G-code voor huidige laag (%1% mm)."
-#: src/slic3r/GUI/DoubleSlider.cpp:1632
+#: src/slic3r/GUI/DoubleSlider.cpp:1634
msgid "Enter short message shown on Printer display when a print is paused"
msgstr ""
"Voer een kort bericht in om te tonen op het printscherm tijdens een pauze"
-#: src/slic3r/GUI/DoubleSlider.cpp:1633
+#: src/slic3r/GUI/DoubleSlider.cpp:1635
msgid "Message for pause print on current layer (%1% mm)."
msgstr "Kort bericht voor printpauze bij huidige laag (%1% mm)."
-#: src/slic3r/GUI/DoubleSlider.cpp:1648
+#: src/slic3r/GUI/DoubleSlider.cpp:1650
msgid "Enter the height you want to jump to"
msgstr "Voer de hoogte in waar u naartoe wilt"
-#: src/slic3r/GUI/DoubleSlider.cpp:1897
+#: src/slic3r/GUI/DoubleSlider.cpp:1899
msgid "The last color change data was saved for a single extruder printing."
msgstr ""
"De laatste gegevens van de kleurwissel zijn opgeslagen voor enkel-"
"extruderprinters."
-#: src/slic3r/GUI/DoubleSlider.cpp:1898 src/slic3r/GUI/DoubleSlider.cpp:1914
+#: src/slic3r/GUI/DoubleSlider.cpp:1900 src/slic3r/GUI/DoubleSlider.cpp:1916
msgid "The last color change data was saved for a multi extruder printing."
msgstr ""
"De laatste gegevens van de kleurwissel zijn opgeslagen voor een multi-"
"extruderprinter."
-#: src/slic3r/GUI/DoubleSlider.cpp:1900
+#: src/slic3r/GUI/DoubleSlider.cpp:1902
msgid "Your current changes will delete all saved color changes."
msgstr "De huidige wijzigingen zullen alle kleurwisselingen verwijderen."
-#: src/slic3r/GUI/DoubleSlider.cpp:1901 src/slic3r/GUI/DoubleSlider.cpp:1922
+#: src/slic3r/GUI/DoubleSlider.cpp:1903 src/slic3r/GUI/DoubleSlider.cpp:1924
msgid "Are you sure you want to continue?"
msgstr "Weet u zeker dat u wilt doorgaan?"
-#: src/slic3r/GUI/DoubleSlider.cpp:1915
+#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged"
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
-"Selecteer JA als u alle opgeslagen toolwisselingen wilt verwijdere,\n"
-"Selecteer NEE als u alle toolwisselingen wil omzetten in kleurwisselingen\n"
-"of Annuleer om het ongewijzigd te laten"
+"Selecteer JA als u alle toolwisselingen wil opslaan,\n"
+"of NEE als u alle toolwisselingen wilt veranderen in kleurwisselingen\n"
+"of klik op annuleren om wijzingen ongedaan te maken."
-#: src/slic3r/GUI/DoubleSlider.cpp:1918
+#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "Wilt u alle opgeslagen toolwisselingen verwijderen?"
-#: src/slic3r/GUI/DoubleSlider.cpp:1920
+#: src/slic3r/GUI/DoubleSlider.cpp:1922
msgid ""
"The last color change data was saved for a multi extruder printing with tool "
"changes for whole print."
@@ -1243,7 +1277,7 @@ msgstr ""
"De laatste gegevens van de kleurwisseling zijn opgeslagen voor een multi-"
"extruderprinter met toolwisselingen voor de hele print."
-#: src/slic3r/GUI/DoubleSlider.cpp:1921
+#: src/slic3r/GUI/DoubleSlider.cpp:1923
msgid "Your current changes will delete all saved extruder (tool) changes."
msgstr ""
"De huidige wijzigingen worden verwijderd voor alle extruder "
@@ -1285,7 +1319,7 @@ msgstr "standaardwaarde"
msgid "parameter name"
msgstr "parameternaam"
-#: src/slic3r/GUI/Field.cpp:150 src/slic3r/GUI/OptionsGroup.cpp:580
+#: src/slic3r/GUI/Field.cpp:150 src/slic3r/GUI/OptionsGroup.cpp:598
msgid "N/A"
msgstr "n.v.t."
@@ -1295,7 +1329,7 @@ msgid "%s doesn't support percentage"
msgstr "%s ondersteunt geen percentage"
#: src/slic3r/GUI/Field.cpp:195 src/slic3r/GUI/Field.cpp:226
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:376
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:380
msgid "Invalid numeric input."
msgstr "Ongeldige numerieke invoer."
@@ -1400,8 +1434,8 @@ msgstr "Firmwareflasher"
msgid "Firmware image:"
msgstr "Firmwarebestand:"
-#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/Tab.cpp:1660
-#: src/slic3r/GUI/Tab.cpp:1723
+#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/Tab.cpp:1705
+#: src/slic3r/GUI/Tab.cpp:1767
msgid "Browse"
msgstr "Zoek"
@@ -1434,7 +1468,7 @@ msgid "Advanced: Output log"
msgstr "Geavanceerd: Output logboek"
#: src/slic3r/GUI/FirmwareDialog.cpp:852
-#: src/slic3r/GUI/Mouse3DController.cpp:364
+#: src/slic3r/GUI/Mouse3DController.cpp:336
#: src/slic3r/GUI/PrintHostDialogs.cpp:161
msgid "Close"
msgstr "Sluit"
@@ -1455,7 +1489,7 @@ msgstr "Bevestiging"
msgid "Cancelling..."
msgstr "Annuleren..."
-#: src/slic3r/GUI/GLCanvas3D.cpp:234 src/slic3r/GUI/GLCanvas3D.cpp:4568
+#: src/slic3r/GUI/GLCanvas3D.cpp:234 src/slic3r/GUI/GLCanvas3D.cpp:4572
msgid "Variable layer height"
msgstr "Variabele laagdikte"
@@ -1579,147 +1613,147 @@ msgstr "boven %.2f mm"
msgid "%.2f - %.2f mm"
msgstr "%.2f - %.2f mm"
-#: src/slic3r/GUI/GLCanvas3D.cpp:990
+#: src/slic3r/GUI/GLCanvas3D.cpp:995
#, c-format
msgid "Color change for Extruder %d at %.2f mm"
msgstr "Kleurwissel voor extruder %d op %.2f mm"
-#: src/slic3r/GUI/GLCanvas3D.cpp:1300
+#: src/slic3r/GUI/GLCanvas3D.cpp:1305
msgid "Seq."
msgstr "Volgorde"
-#: src/slic3r/GUI/GLCanvas3D.cpp:1696
+#: src/slic3r/GUI/GLCanvas3D.cpp:1701
msgid "Variable layer height - Reset"
msgstr "Variabele laagdikte - reset"
-#: src/slic3r/GUI/GLCanvas3D.cpp:1704
+#: src/slic3r/GUI/GLCanvas3D.cpp:1709
msgid "Variable layer height - Adaptive"
msgstr "Variabele laagdikte - adaptief"
-#: src/slic3r/GUI/GLCanvas3D.cpp:1712
+#: src/slic3r/GUI/GLCanvas3D.cpp:1717
msgid "Variable layer height - Smooth all"
msgstr "Variable laagdikte - egaliseer alles"
-#: src/slic3r/GUI/GLCanvas3D.cpp:2048
+#: src/slic3r/GUI/GLCanvas3D.cpp:2053
msgid "Mirror Object"
msgstr "Spiegel object"
-#: src/slic3r/GUI/GLCanvas3D.cpp:2916
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:573
+#: src/slic3r/GUI/GLCanvas3D.cpp:2921
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:570
msgid "Gizmo-Move"
msgstr "Verplaatsen"
-#: src/slic3r/GUI/GLCanvas3D.cpp:2996
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:575
+#: src/slic3r/GUI/GLCanvas3D.cpp:3001
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:572
msgid "Gizmo-Rotate"
msgstr "Roteren"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3500
+#: src/slic3r/GUI/GLCanvas3D.cpp:3505
msgid "Move Object"
msgstr "Verplaats object"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4042
+#: src/slic3r/GUI/GLCanvas3D.cpp:4046
msgid "Undo History"
msgstr "Geschiedenis ongedaan maken"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4042
+#: src/slic3r/GUI/GLCanvas3D.cpp:4046
msgid "Redo History"
msgstr "Geschiedenis opnieuw doen"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4060
+#: src/slic3r/GUI/GLCanvas3D.cpp:4064
#, c-format
msgid "Undo %1$d Action"
msgid_plural "Undo %1$d Actions"
msgstr[0] "Maak %1$d actie ongedaan"
msgstr[1] "Maak %1$d acties ongedaan"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4060
+#: src/slic3r/GUI/GLCanvas3D.cpp:4064
#, c-format
msgid "Redo %1$d Action"
msgid_plural "Redo %1$d Actions"
msgstr[0] "Doe %1$d actie opnieuw"
msgstr[1] "Doe %1$d acties opnieuw"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4462
+#: src/slic3r/GUI/GLCanvas3D.cpp:4466
msgid "Add..."
msgstr "Voeg toe..."
-#: src/slic3r/GUI/GLCanvas3D.cpp:4470 src/slic3r/GUI/GUI_ObjectList.cpp:1714
-#: src/slic3r/GUI/Plater.cpp:3909 src/slic3r/GUI/Plater.cpp:3931
-#: src/slic3r/GUI/Tab.cpp:3114
+#: src/slic3r/GUI/GLCanvas3D.cpp:4474 src/slic3r/GUI/GUI_ObjectList.cpp:1734
+#: src/slic3r/GUI/Plater.cpp:3983 src/slic3r/GUI/Plater.cpp:4005
+#: src/slic3r/GUI/Tab.cpp:3144
msgid "Delete"
msgstr "Verwijder"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4479 src/slic3r/GUI/KBShortcutsDialog.cpp:129
-#: src/slic3r/GUI/Plater.cpp:4647
+#: src/slic3r/GUI/GLCanvas3D.cpp:4483 src/slic3r/GUI/KBShortcutsDialog.cpp:131
+#: src/slic3r/GUI/Plater.cpp:4725
msgid "Delete all"
msgstr "Verwijder alles"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4488 src/slic3r/GUI/KBShortcutsDialog.cpp:157
-#: src/slic3r/GUI/Plater.cpp:2732
+#: src/slic3r/GUI/GLCanvas3D.cpp:4492 src/slic3r/GUI/KBShortcutsDialog.cpp:159
+#: src/slic3r/GUI/Plater.cpp:2806
msgid "Arrange"
msgstr "Schikken"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4488 src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/GLCanvas3D.cpp:4492 src/slic3r/GUI/KBShortcutsDialog.cpp:160
msgid "Arrange selection"
msgstr "Schik selectie"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4500
+#: src/slic3r/GUI/GLCanvas3D.cpp:4504
msgid "Copy"
msgstr "Kopieer"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4509
+#: src/slic3r/GUI/GLCanvas3D.cpp:4513
msgid "Paste"
msgstr "Plak"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4521 src/slic3r/GUI/Plater.cpp:3766
-#: src/slic3r/GUI/Plater.cpp:3778 src/slic3r/GUI/Plater.cpp:3918
+#: src/slic3r/GUI/GLCanvas3D.cpp:4525 src/slic3r/GUI/Plater.cpp:3840
+#: src/slic3r/GUI/Plater.cpp:3852 src/slic3r/GUI/Plater.cpp:3992
msgid "Add instance"
msgstr "Voeg instantie toe"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4532 src/slic3r/GUI/Plater.cpp:3920
+#: src/slic3r/GUI/GLCanvas3D.cpp:4536 src/slic3r/GUI/Plater.cpp:3994
msgid "Remove instance"
msgstr "Verwijder instantie"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4545
+#: src/slic3r/GUI/GLCanvas3D.cpp:4549
msgid "Split to objects"
msgstr "Verdeel in objecten"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4555 src/slic3r/GUI/GUI_ObjectList.cpp:1485
+#: src/slic3r/GUI/GLCanvas3D.cpp:4559 src/slic3r/GUI/GUI_ObjectList.cpp:1503
msgid "Split to parts"
msgstr "Verdeel in onderdelen"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4619 src/slic3r/GUI/KBShortcutsDialog.cpp:130
-#: src/slic3r/GUI/MainFrame.cpp:581
+#: src/slic3r/GUI/GLCanvas3D.cpp:4623 src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/MainFrame.cpp:628
msgid "Undo"
msgstr "Maak ongedaan"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4619 src/slic3r/GUI/GLCanvas3D.cpp:4652
+#: src/slic3r/GUI/GLCanvas3D.cpp:4623 src/slic3r/GUI/GLCanvas3D.cpp:4656
msgid "Click right mouse button to open History"
msgstr "Open de geschiedenis met de rechtermuisknop"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4636
+#: src/slic3r/GUI/GLCanvas3D.cpp:4640
msgid "Next Undo action: %1%"
msgstr "Volgende ongedaan maken: %1%"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4652 src/slic3r/GUI/KBShortcutsDialog.cpp:131
-#: src/slic3r/GUI/MainFrame.cpp:584
+#: src/slic3r/GUI/GLCanvas3D.cpp:4656 src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/MainFrame.cpp:631
msgid "Redo"
msgstr "Doe opnieuw"
-#: src/slic3r/GUI/GLCanvas3D.cpp:4668
+#: src/slic3r/GUI/GLCanvas3D.cpp:4672
msgid "Next Redo action: %1%"
msgstr "Volgende opnieuw doen: %1%"
-#: src/slic3r/GUI/GLCanvas3D.cpp:6593
+#: src/slic3r/GUI/GLCanvas3D.cpp:6586
msgid "Selection-Add from rectangle"
msgstr "Selectie - Voeg toe van boxselectie"
-#: src/slic3r/GUI/GLCanvas3D.cpp:6612
+#: src/slic3r/GUI/GLCanvas3D.cpp:6605
msgid "Selection-Remove from rectangle"
msgstr "Selectie - Verwijder van boxselectie"
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:284
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:306
#, c-format
msgid ""
"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
@@ -1728,11 +1762,11 @@ msgstr ""
"PrusaSlicer vereist een grafische driver die OpenGL 2.0 kan draaien,\n"
"terwijl OpenGL-versie %s, render %s, leverancier %s is gedetecteerd."
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:309
msgid "You may need to update your graphics card driver."
msgstr "U moet mogelijk uw grafische kaart updaten."
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:290
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:312
msgid ""
"As a workaround, you may run PrusaSlicer with a software rendered 3D "
"graphics by running prusa-slicer.exe with the --sw_renderer parameter."
@@ -1741,12 +1775,12 @@ msgstr ""
"renderprogramma door prusa-slicer.exe uit te voeren met de --sw_renderer "
"parameter."
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:292
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:314
msgid "Unsupported OpenGL version"
msgstr "Niet-ondersteunde OpenGL-versie"
#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:42
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:144 src/libslic3r/PrintConfig.cpp:3402
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:144 src/libslic3r/PrintConfig.cpp:3412
msgid "Cut"
msgstr "Snij door"
@@ -1770,78 +1804,78 @@ msgstr "Toepassen"
msgid "Place on face"
msgstr "Plaats op vlak"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40
msgid "Hollow this object"
msgstr "Dit object uithollen"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
msgid "Preview hollowed and drilled model"
msgstr "Toon voorbeeld van uitgehold model met gat"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
msgid "Offset"
msgstr "Shelldikte"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
msgid "Quality"
msgstr "Kwaliteit"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45
-#: src/libslic3r/PrintConfig.cpp:2934
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44
+#: src/libslic3r/PrintConfig.cpp:2944
msgid "Closing distance"
msgstr "Sluitafstand"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45
msgid "Hole diameter"
msgstr "Gatdiameter"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46
msgid "Hole depth"
msgstr "Gatdiepte"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47
msgid "Remove selected holes"
msgstr "Verwijder geselecteerde gaten"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48
msgid "Remove all holes"
msgstr "Verwijder alle gaten"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
msgid "Clipping of view"
msgstr "Weergave samenvoegen"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:59
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58
msgid "Reset direction"
msgstr "Reset-richting"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:52
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51
msgid "Show supports"
msgstr "Toon support"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:413
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:423
msgid "Add drainage hole"
msgstr "Voeg afvoergat toe"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:530
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:541
msgid "Delete drainage hole"
msgstr "Verwijder afvoergat"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:798
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:815
msgid "Hollowing parameter change"
msgstr "Verandering van uitholparameter"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:870
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:887
msgid "Change drainage hole diameter"
msgstr "Verander afvoergatdiameter"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:960
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:979
msgid "Hollow and drill"
msgstr "Uithollen en gat toevoegen"
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:1040
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:1061
msgid "Move drainage hole"
msgstr "Verplaats afvoergat"
@@ -1853,7 +1887,7 @@ msgstr "Verplaats"
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:480
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:499
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:517
-#: src/libslic3r/PrintConfig.cpp:3451
+#: src/libslic3r/PrintConfig.cpp:3461
msgid "Rotate"
msgstr "Roteer"
@@ -1861,195 +1895,195 @@ msgstr "Roteer"
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:230
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:500
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:518
-#: src/libslic3r/PrintConfig.cpp:3466
+#: src/libslic3r/PrintConfig.cpp:3476
msgid "Scale"
msgstr "Verschaal"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47
msgid "Head diameter"
msgstr "Kopdiameter"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
msgid "Lock supports under new islands"
msgstr "Vergrendel support onder nieuwe eilanden"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1350
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1361
msgid "Remove selected points"
msgstr "Verwijder geselecteerde punten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
msgid "Remove all points"
msgstr "Verwijdere alle punten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1364
msgid "Apply changes"
msgstr "Wijzigingen toepassen"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
msgid "Discard changes"
msgstr "Wijzigingen afwijzen"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
msgid "Minimal points distance"
msgstr "Minimale puntafstand"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
-#: src/libslic3r/PrintConfig.cpp:2764
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
+#: src/libslic3r/PrintConfig.cpp:2774
msgid "Support points density"
msgstr "Dichtheid van supportpunten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1367
msgid "Auto-generate points"
msgstr "Genereer automatisch punten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56
msgid "Manual editing"
msgstr "Handmatig bewerken"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:479
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:484
msgid "Add support point"
msgstr "Voeg supportpunt toe"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:615
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:621
msgid "Delete support point"
msgstr "Verwijder supportpunt"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:804
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:810
msgid "Change point head diameter"
msgstr "Wijzig puntkopdiameter"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:872
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:878
msgid "Support parameter change"
msgstr "Wijzig supportparameter"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:978
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:986
msgid "SLA Support Points"
msgstr "SLA-supportpunten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:999
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1007
msgid "SLA gizmo turned on"
-msgstr "SLA Gizmo aangezet"
+msgstr "SLA-bewerker aangezet"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1024
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1035
msgid "Do you want to save your manually edited support points?"
msgstr "Wilt u handmatig aangepaste supportpunten opslaan?"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1025
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1036
msgid "Save changes?"
msgstr "Wijzigingen opslaan?"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1037
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1048
msgid "SLA gizmo turned off"
-msgstr "SLA Gizmo uitgezet"
+msgstr "SLA-bewerker uitgezet"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1076
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1087
msgid "Move support point"
msgstr "Verplaats supportpunt"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1175
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1186
msgid "Support points edit"
msgstr "Bewerk supportpunten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1247
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1258
msgid "Autogeneration will erase all manually edited points."
msgstr ""
"Automatisch genereren zal alle handmatig aangepaste punten verwijderen."
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1248
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1259
msgid "Are you sure you want to do it?"
msgstr "Weet u zeker dat u dit wilt doen?"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1249 src/slic3r/GUI/GUI.cpp:246
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1260 src/slic3r/GUI/GUI.cpp:258
#: src/slic3r/GUI/Tab.cpp:3074 src/slic3r/GUI/WipeTowerDialog.cpp:45
#: src/slic3r/GUI/WipeTowerDialog.cpp:366
msgid "Warning"
msgstr "Waarschuwing"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1252
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1263
msgid "Autogenerate support points"
msgstr "Automatisch gegenereerde supportpunten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1313
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1324
msgid "SLA gizmo keyboard shortcuts"
msgstr "SLA sneltoetsen"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1324
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1335
msgid "Note: some shortcuts work in (non)editing mode only."
msgstr "Let op: sommige sneltoetsen werken alleen in bewerkmodus."
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1342
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1345
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1346
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357
msgid "Left click"
msgstr "Linkermuisknop"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1342
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
msgid "Add point"
msgstr "Voeg punt toe"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1343
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
msgid "Right click"
msgstr "Rechtermuisknop"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1343
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
msgid "Remove point"
msgstr "Verwijder punt"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1344
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1347
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1348
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1358
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1359
msgid "Drag"
msgstr "Versleep"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1344
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
msgid "Move point"
msgstr "Verplaats punt"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1345
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
msgid "Add point to selection"
msgstr "Voeg punt toe aan selectie"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1346
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357
msgid "Remove point from selection"
msgstr "Verwijder punt uit selectie"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1347
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1358
msgid "Select by rectangle"
msgstr "Selecteer met boxselectie"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1348
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1359
msgid "Deselect by rectangle"
msgstr "Deselecteer met boxselectie"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1349
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1360
msgid "Select all points"
msgstr "Selecteer alle punten"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1351
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1362
msgid "Mouse wheel"
msgstr "Scrollwieltje"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1351
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1362
msgid "Move clipping plane"
msgstr "Verplaats snijvlak"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1352
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1363
msgid "Reset clipping plane"
msgstr "Reset snijvlak"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1366
msgid "Switch to editing mode"
msgstr "Schakel over naar bewerkmodus"
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:500
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:497
msgid "Gizmo-Place on Face"
msgstr "Plaats op vlak"
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:574
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:571
msgid "Gizmo-Scale"
msgstr "Verschalen"
@@ -2072,137 +2106,137 @@ msgstr ""
msgid "Fatal error"
msgstr "Fatale fout"
-#: src/slic3r/GUI/GUI_App.cpp:442
+#: src/slic3r/GUI/GUI_App.cpp:438
msgid "Changing of an application language"
msgstr "Veranderen van de taal van het programma"
-#: src/slic3r/GUI/GUI_App.cpp:450 src/slic3r/GUI/GUI_App.cpp:459
+#: src/slic3r/GUI/GUI_App.cpp:441 src/slic3r/GUI/GUI_App.cpp:449
msgid "Recreating"
msgstr "Opnieuw aanmaken"
-#: src/slic3r/GUI/GUI_App.cpp:466
+#: src/slic3r/GUI/GUI_App.cpp:454
msgid "Loading of current presets"
msgstr "Laden van huidige presets"
-#: src/slic3r/GUI/GUI_App.cpp:474
+#: src/slic3r/GUI/GUI_App.cpp:459
msgid "Loading of a mode view"
msgstr "Laden van de weergavemodus"
-#: src/slic3r/GUI/GUI_App.cpp:555
+#: src/slic3r/GUI/GUI_App.cpp:538
msgid "Choose one file (3MF/AMF):"
msgstr "Kies een 3MF- of AMF-bestand:"
-#: src/slic3r/GUI/GUI_App.cpp:567
+#: src/slic3r/GUI/GUI_App.cpp:550
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Kies één of meer STL-, OBJ-, AMF-, 3MF-, of PRUSA-bestanden:"
-#: src/slic3r/GUI/GUI_App.cpp:629
+#: src/slic3r/GUI/GUI_App.cpp:611
msgid "Select the language"
-msgstr "Selecteer taal"
+msgstr "Taalselectie"
-#: src/slic3r/GUI/GUI_App.cpp:629
+#: src/slic3r/GUI/GUI_App.cpp:611
msgid "Language"
msgstr "Taal"
-#: src/slic3r/GUI/GUI_App.cpp:797
+#: src/slic3r/GUI/GUI_App.cpp:779
#, c-format
msgid "Run %s"
msgstr "Voer %s uit"
-#: src/slic3r/GUI/GUI_App.cpp:800
+#: src/slic3r/GUI/GUI_App.cpp:782
msgid "&Configuration Snapshots"
msgstr "Configuratiesnapshots"
-#: src/slic3r/GUI/GUI_App.cpp:800
+#: src/slic3r/GUI/GUI_App.cpp:782
msgid "Inspect / activate configuration snapshots"
msgstr "Inspecteer/activeer configuratiesnapshots"
-#: src/slic3r/GUI/GUI_App.cpp:801
+#: src/slic3r/GUI/GUI_App.cpp:783
msgid "Take Configuration &Snapshot"
msgstr "Neem configuratiesnapshot"
-#: src/slic3r/GUI/GUI_App.cpp:801
+#: src/slic3r/GUI/GUI_App.cpp:783
msgid "Capture a configuration snapshot"
msgstr "Neem een configuratiesnapshot op"
-#: src/slic3r/GUI/GUI_App.cpp:802
+#: src/slic3r/GUI/GUI_App.cpp:784
msgid "Check for updates"
msgstr "Controleer op updates"
-#: src/slic3r/GUI/GUI_App.cpp:802
+#: src/slic3r/GUI/GUI_App.cpp:784
msgid "Check for configuration updates"
msgstr "Controleer op configuratie-updates"
-#: src/slic3r/GUI/GUI_App.cpp:804
+#: src/slic3r/GUI/GUI_App.cpp:786
msgid "&Preferences"
msgstr "Voorkeuren"
-#: src/slic3r/GUI/GUI_App.cpp:810
+#: src/slic3r/GUI/GUI_App.cpp:792
msgid "Application preferences"
msgstr "Programmavoorkeuren"
-#: src/slic3r/GUI/GUI_App.cpp:813 src/slic3r/GUI/wxExtensions.cpp:753
+#: src/slic3r/GUI/GUI_App.cpp:795 src/slic3r/GUI/wxExtensions.cpp:756
msgid "Simple"
msgstr "Eenvoudig"
-#: src/slic3r/GUI/GUI_App.cpp:813
+#: src/slic3r/GUI/GUI_App.cpp:795
msgid "Simple View Mode"
msgstr "Eenvoudige weergave"
-#: src/slic3r/GUI/GUI_App.cpp:814 src/slic3r/GUI/GUI_ObjectList.cpp:102
-#: src/slic3r/GUI/GUI_ObjectList.cpp:620 src/slic3r/GUI/Tab.cpp:1089
-#: src/slic3r/GUI/Tab.cpp:1104 src/slic3r/GUI/Tab.cpp:1203
-#: src/slic3r/GUI/Tab.cpp:1206 src/slic3r/GUI/Tab.cpp:1472
-#: src/slic3r/GUI/Tab.cpp:1969 src/slic3r/GUI/Tab.cpp:3651
-#: src/slic3r/GUI/wxExtensions.cpp:754 src/libslic3r/PrintConfig.cpp:88
+#: src/slic3r/GUI/GUI_App.cpp:796 src/slic3r/GUI/GUI_ObjectList.cpp:104
+#: src/slic3r/GUI/GUI_ObjectList.cpp:628 src/slic3r/GUI/Tab.cpp:1147
+#: src/slic3r/GUI/Tab.cpp:1162 src/slic3r/GUI/Tab.cpp:1261
+#: src/slic3r/GUI/Tab.cpp:1264 src/slic3r/GUI/Tab.cpp:1525
+#: src/slic3r/GUI/Tab.cpp:1989 src/slic3r/GUI/Tab.cpp:3719
+#: src/slic3r/GUI/wxExtensions.cpp:757 src/libslic3r/PrintConfig.cpp:88
#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:223
#: src/libslic3r/PrintConfig.cpp:1037 src/libslic3r/PrintConfig.cpp:2276
#: src/libslic3r/PrintConfig.cpp:2448
msgid "Advanced"
msgstr "Geavanceerd"
-#: src/slic3r/GUI/GUI_App.cpp:814
+#: src/slic3r/GUI/GUI_App.cpp:796
msgid "Advanced View Mode"
msgstr "Geavanceerde weergave"
-#: src/slic3r/GUI/GUI_App.cpp:815 src/slic3r/GUI/wxExtensions.cpp:755
+#: src/slic3r/GUI/GUI_App.cpp:797 src/slic3r/GUI/wxExtensions.cpp:758
msgid "Expert"
msgstr "Expert"
-#: src/slic3r/GUI/GUI_App.cpp:815
+#: src/slic3r/GUI/GUI_App.cpp:797
msgid "Expert View Mode"
msgstr "Expertweergave"
-#: src/slic3r/GUI/GUI_App.cpp:820
+#: src/slic3r/GUI/GUI_App.cpp:802
msgid "Mode"
msgstr "Modus"
-#: src/slic3r/GUI/GUI_App.cpp:820
+#: src/slic3r/GUI/GUI_App.cpp:802
#, c-format
msgid "%s View Mode"
msgstr "%s-weergavemodus"
-#: src/slic3r/GUI/GUI_App.cpp:822
+#: src/slic3r/GUI/GUI_App.cpp:804
msgid "&Language"
msgstr "Taal"
-#: src/slic3r/GUI/GUI_App.cpp:824
+#: src/slic3r/GUI/GUI_App.cpp:806
msgid "Flash printer &firmware"
msgstr "Flash printerfirmware"
-#: src/slic3r/GUI/GUI_App.cpp:824
+#: src/slic3r/GUI/GUI_App.cpp:806
msgid "Upload a firmware image into an Arduino based printer"
msgstr "Upload een firmwarebestand op een Arduino-gebaseerde printer"
-#: src/slic3r/GUI/GUI_App.cpp:839
+#: src/slic3r/GUI/GUI_App.cpp:821
msgid "Taking configuration snapshot"
msgstr "Neem configuratiesnapshot"
-#: src/slic3r/GUI/GUI_App.cpp:839
+#: src/slic3r/GUI/GUI_App.cpp:821
msgid "Snapshot name"
msgstr "Snapshotnaam"
-#: src/slic3r/GUI/GUI_App.cpp:882
+#: src/slic3r/GUI/GUI_App.cpp:868
msgid ""
"Switching the language will trigger application restart.\n"
"You will lose content of the plater."
@@ -2210,45 +2244,47 @@ msgstr ""
"Het veranderen van de taal zorgt dat het programma opnieuw opstart.\n"
"U verliest de geladen inhoud zoals getoond in de 3D-weergave."
-#: src/slic3r/GUI/GUI_App.cpp:884
+#: src/slic3r/GUI/GUI_App.cpp:870
msgid "Do you want to proceed?"
-msgstr "Weet u zeker dat u door wilt gaan?"
+msgstr ""
+"Weet u zeker dat u door wilt gaan?\n"
+"Do you want to proceed?"
-#: src/slic3r/GUI/GUI_App.cpp:885
+#: src/slic3r/GUI/GUI_App.cpp:871
msgid "Language selection"
msgstr "Taalselectie"
-#: src/slic3r/GUI/GUI_App.cpp:908
+#: src/slic3r/GUI/GUI_App.cpp:895
msgid "&Configuration"
msgstr "Configuratie"
-#: src/slic3r/GUI/GUI_App.cpp:932
+#: src/slic3r/GUI/GUI_App.cpp:919
msgid "The presets on the following tabs were modified"
msgstr "De instellingen in de volgende tabs zijn aangepast"
-#: src/slic3r/GUI/GUI_App.cpp:932 src/slic3r/GUI/Tab.cpp:2936
+#: src/slic3r/GUI/GUI_App.cpp:919 src/slic3r/GUI/Tab.cpp:2934
msgid "Discard changes and continue anyway?"
msgstr "Wijzigingen afwijzen en doorgaan?"
-#: src/slic3r/GUI/GUI_App.cpp:935
+#: src/slic3r/GUI/GUI_App.cpp:922
msgid "Unsaved Presets"
msgstr "Niet-opgeslagen presets"
-#: src/slic3r/GUI/GUI_App.cpp:1084 src/slic3r/GUI/Tab.cpp:2948
+#: src/slic3r/GUI/GUI_App.cpp:1071 src/slic3r/GUI/Tab.cpp:2946
msgid "It's impossible to print multi-part object(s) with SLA technology."
msgstr ""
"Het is niet mogelijk meerdelige objecten te printen met de SLA-technologie."
-#: src/slic3r/GUI/GUI_App.cpp:1085
+#: src/slic3r/GUI/GUI_App.cpp:1072
msgid "Please check and fix your object list."
msgstr "Controleer en repareer de objectenlijst."
-#: src/slic3r/GUI/GUI_App.cpp:1086 src/slic3r/GUI/Plater.cpp:2291
-#: src/slic3r/GUI/Tab.cpp:2950
+#: src/slic3r/GUI/GUI_App.cpp:1073 src/slic3r/GUI/Plater.cpp:2365
+#: src/slic3r/GUI/Tab.cpp:2948
msgid "Attention!"
msgstr "Attentie!"
-#: src/slic3r/GUI/GUI_App.cpp:1103
+#: src/slic3r/GUI/GUI_App.cpp:1090
msgid "Select a gcode file:"
msgstr "Selecteer een gcode-bestand:"
@@ -2260,16 +2296,16 @@ msgstr "Start op hoogte"
msgid "Stop at height"
msgstr "Stop op hoogte"
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:153
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:158
msgid "Remove layer range"
msgstr "Verwijder laagbereik"
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:162
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:160
msgid "Add layer range"
msgstr "Voeg laagbereik toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:93
-#: src/slic3r/GUI/GUI_ObjectList.cpp:611 src/libslic3r/PrintConfig.cpp:72
+#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:95
+#: src/slic3r/GUI/GUI_ObjectList.cpp:619 src/libslic3r/PrintConfig.cpp:72
#: src/libslic3r/PrintConfig.cpp:175 src/libslic3r/PrintConfig.cpp:184
#: src/libslic3r/PrintConfig.cpp:408 src/libslic3r/PrintConfig.cpp:470
#: src/libslic3r/PrintConfig.cpp:478 src/libslic3r/PrintConfig.cpp:890
@@ -2280,9 +2316,9 @@ msgstr "Voeg laagbereik toe"
msgid "Layers and Perimeters"
msgstr "Lagen en perimeters"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:95
-#: src/slic3r/GUI/GUI_ObjectList.cpp:613 src/slic3r/GUI/GUI_Preview.cpp:246
-#: src/slic3r/GUI/Tab.cpp:1122 src/slic3r/GUI/Tab.cpp:1123
+#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:97
+#: src/slic3r/GUI/GUI_ObjectList.cpp:621 src/slic3r/GUI/GUI_Preview.cpp:246
+#: src/slic3r/GUI/Tab.cpp:1180 src/slic3r/GUI/Tab.cpp:1181
#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/PrintConfig.cpp:370
#: src/libslic3r/PrintConfig.cpp:1502 src/libslic3r/PrintConfig.cpp:1866
#: src/libslic3r/PrintConfig.cpp:1872 src/libslic3r/PrintConfig.cpp:1880
@@ -2297,8 +2333,8 @@ msgstr "Lagen en perimeters"
msgid "Support material"
msgstr "Support"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:99
-#: src/slic3r/GUI/GUI_ObjectList.cpp:617 src/libslic3r/PrintConfig.cpp:2252
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:101
+#: src/slic3r/GUI/GUI_ObjectList.cpp:625 src/libslic3r/PrintConfig.cpp:2252
#: src/libslic3r/PrintConfig.cpp:2260
msgid "Wipe options"
msgstr "Afveegopties"
@@ -2323,8 +2359,8 @@ msgstr "Voeg supportforcering toe"
msgid "Add support blocker"
msgstr "Voeg supportblokkering toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:96 src/slic3r/GUI/GUI_ObjectList.cpp:614
-#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/Tab.cpp:1147
+#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:622
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/Tab.cpp:1205
#: src/libslic3r/PrintConfig.cpp:235 src/libslic3r/PrintConfig.cpp:458
#: src/libslic3r/PrintConfig.cpp:919 src/libslic3r/PrintConfig.cpp:1048
#: src/libslic3r/PrintConfig.cpp:1431 src/libslic3r/PrintConfig.cpp:1668
@@ -2333,15 +2369,15 @@ msgstr "Voeg supportblokkering toe"
msgid "Speed"
msgstr "Snelheid"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:97 src/slic3r/GUI/GUI_ObjectList.cpp:615
-#: src/slic3r/GUI/Tab.cpp:1182 src/slic3r/GUI/Tab.cpp:1840
+#: src/slic3r/GUI/GUI_ObjectList.cpp:99 src/slic3r/GUI/GUI_ObjectList.cpp:623
+#: src/slic3r/GUI/Tab.cpp:1240 src/slic3r/GUI/Tab.cpp:1860
#: src/libslic3r/PrintConfig.cpp:488 src/libslic3r/PrintConfig.cpp:1002
#: src/libslic3r/PrintConfig.cpp:1409 src/libslic3r/PrintConfig.cpp:1737
#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1965
msgid "Extruders"
msgstr "Extruders"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:616
+#: src/slic3r/GUI/GUI_ObjectList.cpp:100 src/slic3r/GUI/GUI_ObjectList.cpp:624
#: src/libslic3r/PrintConfig.cpp:447 src/libslic3r/PrintConfig.cpp:555
#: src/libslic3r/PrintConfig.cpp:877 src/libslic3r/PrintConfig.cpp:1010
#: src/libslic3r/PrintConfig.cpp:1418 src/libslic3r/PrintConfig.cpp:1757
@@ -2349,482 +2385,482 @@ msgstr "Extruders"
msgid "Extrusion Width"
msgstr "Extrusiebreedte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:104 src/slic3r/GUI/GUI_ObjectList.cpp:622
-#: src/slic3r/GUI/Plater.cpp:490 src/slic3r/GUI/Tab.cpp:3594
-#: src/slic3r/GUI/Tab.cpp:3595 src/libslic3r/PrintConfig.cpp:2614
+#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/GUI_ObjectList.cpp:630
+#: src/slic3r/GUI/Plater.cpp:500 src/slic3r/GUI/Tab.cpp:3660
+#: src/slic3r/GUI/Tab.cpp:3661 src/libslic3r/PrintConfig.cpp:2614
#: src/libslic3r/PrintConfig.cpp:2621 src/libslic3r/PrintConfig.cpp:2630
#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2649
-#: src/libslic3r/PrintConfig.cpp:2675 src/libslic3r/PrintConfig.cpp:2682
-#: src/libslic3r/PrintConfig.cpp:2693 src/libslic3r/PrintConfig.cpp:2703
-#: src/libslic3r/PrintConfig.cpp:2712 src/libslic3r/PrintConfig.cpp:2725
-#: src/libslic3r/PrintConfig.cpp:2735 src/libslic3r/PrintConfig.cpp:2744
-#: src/libslic3r/PrintConfig.cpp:2754 src/libslic3r/PrintConfig.cpp:2765
-#: src/libslic3r/PrintConfig.cpp:2773
+#: src/libslic3r/PrintConfig.cpp:2685 src/libslic3r/PrintConfig.cpp:2692
+#: src/libslic3r/PrintConfig.cpp:2703 src/libslic3r/PrintConfig.cpp:2713
+#: src/libslic3r/PrintConfig.cpp:2722 src/libslic3r/PrintConfig.cpp:2735
+#: src/libslic3r/PrintConfig.cpp:2745 src/libslic3r/PrintConfig.cpp:2754
+#: src/libslic3r/PrintConfig.cpp:2764 src/libslic3r/PrintConfig.cpp:2775
+#: src/libslic3r/PrintConfig.cpp:2783
msgid "Supports"
msgstr "Support"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:105 src/slic3r/GUI/GUI_ObjectList.cpp:623
-#: src/slic3r/GUI/Plater.cpp:630 src/slic3r/GUI/Tab.cpp:3626
-#: src/slic3r/GUI/Tab.cpp:3627 src/libslic3r/PrintConfig.cpp:2781
-#: src/libslic3r/PrintConfig.cpp:2788 src/libslic3r/PrintConfig.cpp:2802
-#: src/libslic3r/PrintConfig.cpp:2813 src/libslic3r/PrintConfig.cpp:2823
-#: src/libslic3r/PrintConfig.cpp:2845 src/libslic3r/PrintConfig.cpp:2856
-#: src/libslic3r/PrintConfig.cpp:2863 src/libslic3r/PrintConfig.cpp:2870
-#: src/libslic3r/PrintConfig.cpp:2881 src/libslic3r/PrintConfig.cpp:2890
-#: src/libslic3r/PrintConfig.cpp:2899
+#: src/slic3r/GUI/GUI_ObjectList.cpp:107 src/slic3r/GUI/GUI_ObjectList.cpp:631
+#: src/slic3r/GUI/Plater.cpp:640 src/slic3r/GUI/Tab.cpp:3694
+#: src/slic3r/GUI/Tab.cpp:3695 src/libslic3r/PrintConfig.cpp:2791
+#: src/libslic3r/PrintConfig.cpp:2798 src/libslic3r/PrintConfig.cpp:2812
+#: src/libslic3r/PrintConfig.cpp:2823 src/libslic3r/PrintConfig.cpp:2833
+#: src/libslic3r/PrintConfig.cpp:2855 src/libslic3r/PrintConfig.cpp:2866
+#: src/libslic3r/PrintConfig.cpp:2873 src/libslic3r/PrintConfig.cpp:2880
+#: src/libslic3r/PrintConfig.cpp:2891 src/libslic3r/PrintConfig.cpp:2900
+#: src/libslic3r/PrintConfig.cpp:2909
msgid "Pad"
msgstr "Basisplaat"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/Tab.cpp:3644
-#: src/slic3r/GUI/Tab.cpp:3645 src/libslic3r/SLA/Hollowing.cpp:46
+#: src/slic3r/GUI/GUI_ObjectList.cpp:108 src/slic3r/GUI/Tab.cpp:3712
+#: src/slic3r/GUI/Tab.cpp:3713 src/libslic3r/SLA/Hollowing.cpp:46
#: src/libslic3r/SLA/Hollowing.cpp:58 src/libslic3r/SLA/Hollowing.cpp:67
-#: src/libslic3r/SLA/Hollowing.cpp:76 src/libslic3r/PrintConfig.cpp:2909
-#: src/libslic3r/PrintConfig.cpp:2916 src/libslic3r/PrintConfig.cpp:2926
-#: src/libslic3r/PrintConfig.cpp:2935
+#: src/libslic3r/SLA/Hollowing.cpp:76 src/libslic3r/PrintConfig.cpp:2919
+#: src/libslic3r/PrintConfig.cpp:2926 src/libslic3r/PrintConfig.cpp:2936
+#: src/libslic3r/PrintConfig.cpp:2945
msgid "Hollowing"
msgstr "Uithollen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:268
+#: src/slic3r/GUI/GUI_ObjectList.cpp:275
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:153
msgid "Name"
msgstr "Naam"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:276 src/slic3r/GUI/Tab.cpp:1436
+#: src/slic3r/GUI/GUI_ObjectList.cpp:283 src/slic3r/GUI/Tab.cpp:1489
#: src/slic3r/GUI/wxExtensions.cpp:598 src/libslic3r/PrintConfig.cpp:487
msgid "Extruder"
msgstr "Extruder"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:280 src/slic3r/GUI/GUI_ObjectList.cpp:392
+#: src/slic3r/GUI/GUI_ObjectList.cpp:287 src/slic3r/GUI/GUI_ObjectList.cpp:400
msgid "Editing"
msgstr "Bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:337
+#: src/slic3r/GUI/GUI_ObjectList.cpp:345
#, c-format
msgid "Auto-repaired (%d errors):"
msgstr "Automatisch gerepareerd (%d fouten):"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:344
+#: src/slic3r/GUI/GUI_ObjectList.cpp:352
msgid "degenerate facets"
msgstr "vlakken gedegenereerd"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:345
+#: src/slic3r/GUI/GUI_ObjectList.cpp:353
msgid "edges fixed"
msgstr "randen vastgezet"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:346
+#: src/slic3r/GUI/GUI_ObjectList.cpp:354
msgid "facets removed"
msgstr "vlakken verwijderd"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:347
+#: src/slic3r/GUI/GUI_ObjectList.cpp:355
msgid "facets added"
msgstr "vlakken toegevoegd"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:348
+#: src/slic3r/GUI/GUI_ObjectList.cpp:356
msgid "facets reversed"
msgstr "vlakken omgekeerd"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:349
+#: src/slic3r/GUI/GUI_ObjectList.cpp:357
msgid "backwards edges"
msgstr "omgekeerde lijnen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:357
+#: src/slic3r/GUI/GUI_ObjectList.cpp:365
msgid "Right button click the icon to fix STL through Netfabb"
msgstr ""
"Rechtermuisklik op het pictogram om het STL-bestand met NetFabb te repareren"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:394
+#: src/slic3r/GUI/GUI_ObjectList.cpp:402
msgid "Right button click the icon to change the object settings"
msgstr "Rechtermuisklik op het icoontje om de objectinstellingen te wijzigen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:396
+#: src/slic3r/GUI/GUI_ObjectList.cpp:404
msgid "Click the icon to change the object settings"
msgstr "Klik op het pictogram om de objectinstellingen te wijzigen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:400
+#: src/slic3r/GUI/GUI_ObjectList.cpp:408
msgid "Right button click the icon to change the object printable property"
msgstr "Rechtermuisklik op het pictogram om de printinstellingen te wijzigen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:402
+#: src/slic3r/GUI/GUI_ObjectList.cpp:410
msgid "Click the icon to change the object printable property"
msgstr "Klik op het pictogram om de printinstellingen te wijzigen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:455 src/slic3r/GUI/GUI_ObjectList.cpp:467
-#: src/slic3r/GUI/GUI_ObjectList.cpp:915 src/slic3r/GUI/GUI_ObjectList.cpp:3961
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3971
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4006
+#: src/slic3r/GUI/GUI_ObjectList.cpp:463 src/slic3r/GUI/GUI_ObjectList.cpp:475
+#: src/slic3r/GUI/GUI_ObjectList.cpp:933 src/slic3r/GUI/GUI_ObjectList.cpp:3995
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4005
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4040
#: src/slic3r/GUI/ObjectDataViewModel.cpp:200
#: src/slic3r/GUI/ObjectDataViewModel.cpp:257
#: src/slic3r/GUI/ObjectDataViewModel.cpp:282
#: src/slic3r/GUI/ObjectDataViewModel.cpp:490
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:1725
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:1753
msgid "default"
msgstr "standaard"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:534
+#: src/slic3r/GUI/GUI_ObjectList.cpp:542
msgid "Change Extruder"
msgstr "Wijzig extruder"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:549
+#: src/slic3r/GUI/GUI_ObjectList.cpp:557
msgid "Rename Object"
msgstr "Hernoem object"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:549
+#: src/slic3r/GUI/GUI_ObjectList.cpp:557
msgid "Rename Sub-object"
msgstr "Hernoem subobject"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1089
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3777
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1107
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3809
msgid "Instances to Separated Objects"
msgstr "Zet instanties om in objecten"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1104
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1122
msgid "Volumes in Object reordered"
msgstr "Volumes in object opnieuw geordend"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1104
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1122
msgid "Object reordered"
msgstr "Object opnieuw geordend"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1528
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1534
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1845
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1198
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1546
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1552
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1865
#, c-format
msgid "Quick Add Settings (%s)"
msgstr "Snel instellingen toevoegen (%s)"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1263
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1281
msgid "Select showing settings"
msgstr "Selecteer getoonde instellingen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1312
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1330
msgid "Add Settings for Layers"
msgstr "Voeg laaginstellingen toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1313
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1331
msgid "Add Settings for Sub-object"
msgstr "Voeg instellingen voor subobject toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1314
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1332
msgid "Add Settings for Object"
msgstr "Voeg instellingen voor object toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1384
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1402
msgid "Add Settings Bundle for Height range"
msgstr "Voeg instellingen voor hoogtebereik toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1385
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1403
msgid "Add Settings Bundle for Sub-object"
msgstr "Voeg instellingen voor subobject toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1386
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1404
msgid "Add Settings Bundle for Object"
msgstr "Voeg instellingen voor een object toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1425
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1443
msgid "Load"
msgstr "Laad"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1430
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1462
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1466
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1448
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1480
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1484
msgid "Box"
msgstr "Blok"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1430
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1448
msgid "Cylinder"
msgstr "Cilinder"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1430
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1448
msgid "Sphere"
msgstr "Bol"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1430
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1448
msgid "Slab"
msgstr "Plaat"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1498
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1516
msgid "Height range Modifier"
msgstr "Modificator voor hoogtebereik"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1507
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1525
msgid "Add settings"
msgstr "Voeg instellingen toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1585
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1605
msgid "Change type"
msgstr "Wijzig type"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1595
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1607
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1615
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1627
msgid "Set as a Separated Object"
msgstr "Stel in als apart object"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1607
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1627
msgid "Set as a Separated Objects"
msgstr "Stel in als aparte objecten"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1617
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1637
msgid "Printable"
msgstr "Printbaar"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1632
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1652
msgid "Rename"
msgstr "Hernoem"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1643
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1663
msgid "Fix through the Netfabb"
msgstr "Repareer met NetFabb"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1653 src/slic3r/GUI/Plater.cpp:3944
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1673 src/slic3r/GUI/Plater.cpp:4018
msgid "Export as STL"
msgstr "Exporteer als STL-bestand"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1660
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3950 src/slic3r/GUI/Plater.cpp:3912
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1680
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3984 src/slic3r/GUI/Plater.cpp:3986
msgid "Reload the selected volumes from disk"
msgstr "Herlaad de geselecteerde volumes vanaf schijf"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1667
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1687
msgid "Set extruder for selected items"
msgstr "Stel extruder in voor de geselecteerde items"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1700 src/libslic3r/PrintConfig.cpp:335
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1720 src/libslic3r/PrintConfig.cpp:335
msgid "Default"
msgstr "Standaard"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1720
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1740
msgid "Scale to print volume"
msgstr "Verschaal tot printvolume"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1720
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1740
msgid "Scale the selected object to fit the print volume"
msgstr "Verschaal het geselecteerde object tot deze in het printvolume past"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1789
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2047
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1809
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2067
msgid "Add Shape"
msgstr "Voeg vorm toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1875
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1895
msgid "Load Part"
msgstr "Laad onderdeel"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1914
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1934
msgid "Error!"
msgstr "Fout!"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1989
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2009
msgid "Add Generic Subobject"
msgstr "Voeg algemene subobjecten toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2018
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2038
msgid "Generic"
msgstr "Algemeen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2136
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2238
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2156
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2258
msgid "Last instance of an object cannot be deleted."
msgstr "Laatste instantie van een object kan niet verwijderd worden."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2148
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2168
msgid "Delete Settings"
msgstr "Verwijder instellingen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2172
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2192
msgid "Delete All Instances from Object"
msgstr "Verwijder alle instanties van het object"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2188
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2208
msgid "Delete Height Range"
msgstr "Verwijder hoogtebereik"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2219
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2239
msgid "From Object List You can't delete the last solid part from object."
msgstr "Het laatste onderdeel van de objectenlijst kan niet verwijderd worden."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2223
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2243
msgid "Delete Subobject"
msgstr "Verwijder subobject"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2242
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2262
msgid "Delete Instance"
msgstr "Verwijder instantie"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2266 src/slic3r/GUI/Plater.cpp:2956
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2286 src/slic3r/GUI/Plater.cpp:3035
msgid ""
"The selected object couldn't be split because it contains only one part."
msgstr ""
"Het geselecteerde object kan niet opgedeeld worden omdat het maar één "
"geometrie bevat."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2270
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2290
msgid "Split to Parts"
msgstr "Splits naar onderdelen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2324
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2344
msgid "Add Layers"
msgstr "Voeg lagen toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2450
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2470
msgid "Group manipulation"
msgstr "Groep bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2462
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2482
msgid "Object manipulation"
msgstr "Object bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2475
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2495
msgid "Object Settings to modify"
msgstr "Objectinstellingen om te bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2479
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2499
msgid "Part Settings to modify"
msgstr "Onderdeelinstellingen om te bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2484
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2504
msgid "Layer range Settings to modify"
msgstr "Laagbereikinstellingen om te bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2490
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2510
msgid "Part manipulation"
msgstr "Onderdeel bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2496
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2516
msgid "Instance manipulation"
msgstr "Instantie bewerken"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2503
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2523
msgid "Height ranges"
msgstr "Hoogtebereik"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2503
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2523
msgid "Settings for height range"
msgstr "Instellingen voor hoogtebereik"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2689
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2709
msgid "Delete Selected Item"
msgstr "Verwijder geselecteerd item"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2826
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2846
msgid "Delete Selected"
msgstr "Verwijder selectie"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2892
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2921
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2939
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2920
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2942
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2962
msgid "Add Height Range"
msgstr "Voeg hoogtebereik toe"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2999
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3027
msgid "Edit Height Range"
msgstr "Bewerk hoogtebereik"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3287
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3319
msgid "Selection-Remove from list"
msgstr "Selectie - Verwijder van lijst"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3295
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3327
msgid "Selection-Add from list"
msgstr "Selectie - Voeg toe aan lijst"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3413
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3445
msgid "Object or Instance"
msgstr "Object of instantie"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3414
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3547
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3446
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3579
msgid "Part"
msgstr "Onderdeel"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3414
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3446
msgid "Layer"
msgstr "Laag"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3416
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3448
msgid "Unsupported selection"
msgstr "Niet-ondersteunde selectie"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3417
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3449
#, c-format
msgid "You started your selection with %s Item."
msgstr "De selectie is gestart met item %s."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3418
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3450
#, c-format
msgid "In this mode you can select only other %s Items%s"
msgstr "In deze modus kunt u alleen andere %s items %s selecteren"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3421
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3453
msgid "of a current Object"
msgstr "van het huidige object"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3426
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3501 src/slic3r/GUI/Plater.cpp:141
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3458
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3533 src/slic3r/GUI/Plater.cpp:141
msgid "Info"
msgstr "Info"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3542
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3574
msgid "You can't change a type of the last solid part of the object."
msgstr ""
"U kunt het type van het laatste onderdeel van een object niet wijzigen."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3547
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3579
msgid "Modifier"
msgstr "Modificator"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3547
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3579
msgid "Support Enforcer"
msgstr "Supportforcering"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3547
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3579
msgid "Support Blocker"
msgstr "Supportblokkering"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3549
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3581
msgid "Select type of part"
msgstr "Selecteer onderdeeltype"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3554
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3586
msgid "Change Part Type"
msgstr "Wijzig onderdeeltype"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3799
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3831
msgid "Enter new name"
msgstr "Voer nieuwe naam in"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3799
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3831
msgid "Renaming"
msgstr "Hernoemen"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3815
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3922 src/slic3r/GUI/Tab.cpp:3446
-#: src/slic3r/GUI/Tab.cpp:3450
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3847
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3954 src/slic3r/GUI/Tab.cpp:3518
+#: src/slic3r/GUI/Tab.cpp:3522
msgid "The supplied name is not valid;"
msgstr "De ingevoerde naam is niet geldig;"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3816
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3923 src/slic3r/GUI/Tab.cpp:3447
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3848
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3955 src/slic3r/GUI/Tab.cpp:3519
msgid "the following characters are not allowed:"
msgstr "de volgende karakters zijn niet toegestaan:"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3965
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3999
msgid "Select extruder number:"
msgstr "Selecteer extrudernummer:"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3966
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4000
msgid "This extruder will be set for selected items"
msgstr "Deze extruder wordt ingesteld voor de geselecteerde items"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3991
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4025
msgid "Change Extruders"
msgstr "Wijzig extruders"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4088 src/slic3r/GUI/Selection.cpp:1474
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4122 src/slic3r/GUI/Selection.cpp:1475
msgid "Set Printable"
msgstr "Stel in op printbaar"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4088 src/slic3r/GUI/Selection.cpp:1474
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4122 src/slic3r/GUI/Selection.cpp:1475
msgid "Set Unprintable"
msgstr "Stel in op niet-printbaar"
@@ -2843,7 +2879,7 @@ msgid "Select coordinate space, in which the transformation will be performed."
msgstr ""
"Stel een coördinatenstelsel in. Hierin wordt de verandering uitgevoerd."
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:155 src/libslic3r/GCode.cpp:638
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:155 src/libslic3r/GCode.cpp:641
msgid "Object name"
msgstr "Objectnaam"
@@ -2854,8 +2890,8 @@ msgstr "Positie"
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:216
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:458
-#: src/slic3r/GUI/Mouse3DController.cpp:304
-#: src/slic3r/GUI/Mouse3DController.cpp:321
+#: src/slic3r/GUI/Mouse3DController.cpp:271
+#: src/slic3r/GUI/Mouse3DController.cpp:294
msgid "Rotation"
msgstr "Rotatie"
@@ -2970,7 +3006,7 @@ msgstr "Hoogte"
msgid "Width"
msgstr "Breedte"
-#: src/slic3r/GUI/GUI_Preview.cpp:225 src/slic3r/GUI/Tab.cpp:1459
+#: src/slic3r/GUI/GUI_Preview.cpp:225 src/slic3r/GUI/Tab.cpp:1512
msgid "Fan speed"
msgstr "Ventilatorsnelheid"
@@ -3032,7 +3068,7 @@ msgstr "Brugvulling"
msgid "Gap fill"
msgstr "Gatenvulling"
-#: src/slic3r/GUI/GUI_Preview.cpp:245 src/slic3r/GUI/Tab.cpp:1113
+#: src/slic3r/GUI/GUI_Preview.cpp:245 src/slic3r/GUI/Tab.cpp:1171
#: src/libslic3r/ExtrusionEntity.cpp:318
msgid "Skirt"
msgstr "Skirt"
@@ -3042,7 +3078,7 @@ msgstr "Skirt"
msgid "Support material interface"
msgstr "Supportinterface"
-#: src/slic3r/GUI/GUI_Preview.cpp:248 src/slic3r/GUI/Tab.cpp:1193
+#: src/slic3r/GUI/GUI_Preview.cpp:248 src/slic3r/GUI/Tab.cpp:1251
#: src/libslic3r/ExtrusionEntity.cpp:321
msgid "Wipe tower"
msgstr "Afveegblok"
@@ -3071,13 +3107,13 @@ msgstr "Legenda"
msgid "ERROR: not enough resources to execute a new job."
msgstr "Fout: niet genoeg middelen om nieuwe job te starten."
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:41 src/slic3r/GUI/MainFrame.cpp:708
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:41 src/slic3r/GUI/MainFrame.cpp:755
msgid "Keyboard Shortcuts"
msgstr "Sneltoetsen"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
msgid "New project, clear plater"
-msgstr "Nieuw project, verwijder huidige modellen"
+msgstr "Start nieuw project, verwijder modellen"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
@@ -3105,19 +3141,19 @@ msgstr ""
#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
msgid "Import Config from ini/amf/3mf/gcode"
-msgstr "Importeer configuratie van INI-, AMF-, 3MF- of gcode-bestanden"
+msgstr "Importeer configuratie van INI-, AMF-, 3MF- of gcode-bestand"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
msgid "Load Config from ini/amf/3mf/gcode and merge"
msgstr ""
"Laad configuratie van INI-, AMF-, 3MF- of gcode-bestanden en voeg samen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 src/slic3r/GUI/Plater.cpp:886
-#: src/slic3r/GUI/Plater.cpp:5496 src/libslic3r/PrintConfig.cpp:3353
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 src/slic3r/GUI/Plater.cpp:896
+#: src/slic3r/GUI/Plater.cpp:5546 src/libslic3r/PrintConfig.cpp:3363
msgid "Export G-code"
msgstr "Exporteer gcode-bestand"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Plater.cpp:5497
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Plater.cpp:5547
msgid "Send G-code"
msgstr "Stuur G-code"
@@ -3125,88 +3161,96 @@ msgstr "Stuur G-code"
msgid "Export config"
msgstr "Exporteer configuratie"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:125 src/slic3r/GUI/Plater.cpp:885
+msgid "Export to SD card / Flash drive"
+msgstr "Exporteer naar SD-kaart / USB-stick"
+
#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "SD-kaart/USB-stick uitwerpen"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
msgid "Select all objects"
msgstr "Selecteer alle objecten"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
msgid "Deselect all"
-msgstr "Deselecteer alle"
+msgstr "Deselecteer alles"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
msgid "Delete selected"
-msgstr "Verwijder selectie"
+msgstr "Deselecteer selectie"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
msgid "Copy to clipboard"
msgstr "Kopieer naar klembord"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
msgid "Paste from clipboard"
msgstr "Plak van klembord"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
msgid "Reload plater from disk"
msgstr "Herlaad modellen van schijf"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
msgid "Select Plater Tab"
msgstr "Selecteer 3D-weergave"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
msgid "Select Print Settings Tab"
msgstr "Selecteer printinstellingentab"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
msgid "Select Filament Settings Tab"
msgstr "Selecteer filamentinstellingentab"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
msgid "Select Printer Settings Tab"
msgstr "Selecteer printerinstellingentab"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
msgid "Switch to 3D"
msgstr "Schakel over naar 3D"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
msgid "Switch to Preview"
msgstr "Schakel over naar voorbeeldweergave"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
#: src/slic3r/GUI/PrintHostDialogs.cpp:136
msgid "Print host upload queue"
msgstr "Printhost uploadwachtrij"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
msgid "Camera view"
msgstr "Weergave"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:148
msgid "Show/Hide object/instance labels"
-msgstr "Toon/verberg objecten-/instantie-labels"
+msgstr "Toon/verberg objecten- of instantielabels"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149 src/slic3r/GUI/Preferences.cpp:10
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:151 src/slic3r/GUI/Preferences.cpp:10
msgid "Preferences"
msgstr "Voorkeuren"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:151
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:153
msgid "Show keyboard shortcuts list"
msgstr "Toon lijst met sneltoetsen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
msgid "Commands"
msgstr "Commando's"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:159
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:161
msgid "Add Instance of the selected object"
msgstr "Voeg instantie van het geselecteerde object toe"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:160
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:162
msgid "Remove Instance of the selected object"
msgstr "Verwijder instanties van het geselecteerde object"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:161
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid ""
"Press to select multiple objects\n"
"or move multiple objects with mouse"
@@ -3214,122 +3258,122 @@ msgstr ""
"Druk om meerdere objecten te selecteren\n"
"of beweeg meerdere objecten met de muis"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:162
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
msgid "Press to activate selection rectangle"
msgstr "Druk om selectiebox te activeren"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
msgid "Press to activate deselection rectangle"
msgstr "Druk om deselectiebox te activeren"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:204
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:214
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:206
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:216
msgid "Arrow Up"
msgstr "Pijltje naar boven"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
msgid "Move selection 10 mm in positive Y direction"
msgstr "Verplaats selectie +10 mm in Y-richting"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:205
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:215
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:207
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
msgid "Arrow Down"
msgstr "Pijltje naar beneden"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
msgid "Move selection 10 mm in negative Y direction"
msgstr "Verplaats selectie -10 mm in Y-richting"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:216
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:168
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:218
msgid "Arrow Left"
msgstr "Pijltje naar links"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:168
msgid "Move selection 10 mm in negative X direction"
msgstr "Verplaats selectie -10 mm in X-richting"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:219
msgid "Arrow Right"
msgstr "Pijltje naar rechts"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
msgid "Move selection 10 mm in positive X direction"
msgstr "Verplaats selectie +10 mm in X-richting"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:168
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
msgid "Any arrow"
msgstr "Elke pijl"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:168
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
msgid "Movement step set to 1 mm"
msgstr "Verplaatsingsstap instellen op 1 mm"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
msgid "Movement in camera space"
msgstr "Verplaatsing in cameraruimte"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
msgid "Page Up"
msgstr "Page Up"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
msgid "Rotate selection 45 degrees CCW"
msgstr "Roteer selectie 45° tegen de klok in"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
msgid "Page Down"
msgstr "Page Down"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
msgid "Rotate selection 45 degrees CW"
msgstr "Roteer selectie 45° met de klok mee"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:174
msgid "Gizmo move"
msgstr "Verplaats"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
msgid "Gizmo scale"
msgstr "Verschaal"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:174
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
msgid "Gizmo rotate"
msgstr "Roteer"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
msgid "Gizmo cut"
msgstr "Snijden"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
msgid "Gizmo Place face on bed"
msgstr "Plaats vlak op bed"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
msgid "Gizmo SLA hollow"
msgstr "SLA uithollen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:180
msgid "Gizmo SLA support points"
msgstr "SLA-supportpunten"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:181
msgid "Unselect gizmo or clear selection"
-msgstr "Deselecteer gizmo of selectie"
+msgstr "Deselecteer bewerker of selectie"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:180
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
msgid "Change camera type (perspective, orthographic)"
msgstr "Wijzig weergavetype (perspectief of orthografisch)"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:181
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
msgid "Zoom to Bed"
msgstr "Zoom in op bed"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
msgid ""
"Zoom to selected object\n"
"or all objects in scene, if none selected"
@@ -3337,23 +3381,23 @@ msgstr ""
"Zoom in op geselecteerde objecten\n"
"of alle objecten in de 3D-weergave als niets is geselecteerd"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
msgid "Zoom in"
msgstr "Zoom in"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:186
msgid "Zoom out"
msgstr "Zoom uit"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:187
msgid "Show/Hide 3Dconnexion devices settings dialog"
-msgstr "Toon/verberg 3Dconnexion-apparaten instellingen-dialoogvenster"
+msgstr "Toon/verberg het dialoogvenster van 3Dconnexion-apparaatinstellingen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:192 src/slic3r/GUI/MainFrame.cpp:204
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:194 src/slic3r/GUI/MainFrame.cpp:222
msgid "Plater"
msgstr "3D-weergave"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:195
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:197
#, no-c-format
msgid ""
"Press to snap by 5% in Gizmo scale\n"
@@ -3362,19 +3406,19 @@ msgstr ""
"Druk om stapsgewijs per 5% te verschalen\n"
"of om per 1 mm te verplaatsen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:196
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
msgid ""
"Scale selection to fit print volume\n"
"in Gizmo scale"
msgstr ""
"Zorg dat selectie past in het printvolume\n"
-"door te verschalen"
+"door deze te verschalen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:197
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:199
msgid "Press to activate one direction scaling in Gizmo scale"
msgstr "Druk in om verschaling toepassen in één richting te activeren"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:200
msgid ""
"Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\n"
"selected objects around their own center"
@@ -3382,62 +3426,62 @@ msgstr ""
"Druk om de selectie te verschalen of roteren\n"
"om hun eigen middelpunt"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:201
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:203
msgid "Gizmos"
-msgstr "Gizmo's"
+msgstr "Bewerkers"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:204
#: src/slic3r/GUI/KBShortcutsDialog.cpp:206
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:208
msgid "Upper Layer"
msgstr "Bovenste laag"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:205
#: src/slic3r/GUI/KBShortcutsDialog.cpp:207
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:209
msgid "Lower Layer"
msgstr "Onderste laag"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:208
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:210
msgid "Show/Hide Legend"
msgstr "Toon/verberg legenda"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 src/slic3r/GUI/Plater.cpp:4083
-#: src/slic3r/GUI/Tab.cpp:2392
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:213 src/slic3r/GUI/Plater.cpp:4157
+#: src/slic3r/GUI/Tab.cpp:2374
msgid "Preview"
msgstr "Voorbeeldweergave"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:214
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:216
msgid "Move current slider thumb Up"
msgstr "Verplaats huidige schuif naar boven"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:215
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
msgid "Move current slider thumb Down"
msgstr "Verplaats huidige schuif naar beneden"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:216
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:218
msgid "Set upper thumb to current slider thumb"
msgstr "Stel de bovenste schuif in op het huidige punt"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:219
msgid "Set lower thumb to current slider thumb"
msgstr "Stel de onderste schuif in op het huidige punt"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:218
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:220
msgid "Add color change marker for current layer"
msgstr "Voeg kleurwisseling toe voor de huidige laag"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:219
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:221
msgid "Delete color change marker for current layer"
msgstr "Verwijder kleurwisseling voor de huidige laag"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:222
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:224
msgid "Layers Slider"
msgstr "Schuif voor lagen"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:245
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:247
msgid "Keyboard shortcuts"
msgstr "Sneltoetsen"
-#: src/slic3r/GUI/MainFrame.cpp:66
+#: src/slic3r/GUI/MainFrame.cpp:67
msgid ""
" - Remember to check for updates at http://github.com/prusa3d/PrusaSlicer/"
"releases"
@@ -3445,608 +3489,628 @@ msgstr ""
" - Vergeet niet op updates te checken op http://github.com/prusa3d/"
"PrusaSlicer/releases"
-#: src/slic3r/GUI/MainFrame.cpp:174
+#: src/slic3r/GUI/MainFrame.cpp:192
msgid "based on Slic3r"
msgstr "gebaseerd op Slic3r"
-#: src/slic3r/GUI/MainFrame.cpp:405
+#: src/slic3r/GUI/MainFrame.cpp:444
msgid "&New Project"
msgstr "Nieuw project"
-#: src/slic3r/GUI/MainFrame.cpp:405
+#: src/slic3r/GUI/MainFrame.cpp:444
msgid "Start a new project"
msgstr "Start nieuw project"
-#: src/slic3r/GUI/MainFrame.cpp:408
+#: src/slic3r/GUI/MainFrame.cpp:447
msgid "&Open Project"
msgstr "Open project"
-#: src/slic3r/GUI/MainFrame.cpp:408
+#: src/slic3r/GUI/MainFrame.cpp:447
msgid "Open a project file"
msgstr "Open een projectbestand"
-#: src/slic3r/GUI/MainFrame.cpp:413
+#: src/slic3r/GUI/MainFrame.cpp:452
msgid "Recent projects"
msgstr "Huidige projecten"
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "Het geselecteerde project is niet meer beschikbaar"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
+msgstr ""
+"Het geselecteerde project is niet langer beschikbaar.\n"
+"Wilt u het verwijderen uit de lijst met recente projecten?"
-#: src/slic3r/GUI/MainFrame.cpp:422 src/slic3r/GUI/MainFrame.cpp:785
+#: src/slic3r/GUI/MainFrame.cpp:461 src/slic3r/GUI/MainFrame.cpp:832
#: src/slic3r/GUI/PrintHostDialogs.cpp:231
msgid "Error"
msgstr "Fout"
-#: src/slic3r/GUI/MainFrame.cpp:446
+#: src/slic3r/GUI/MainFrame.cpp:486
msgid "&Save Project"
msgstr "Project opslaan"
-#: src/slic3r/GUI/MainFrame.cpp:446
+#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Save current project file"
msgstr "Projectbestand opslaan"
-#: src/slic3r/GUI/MainFrame.cpp:450 src/slic3r/GUI/MainFrame.cpp:452
+#: src/slic3r/GUI/MainFrame.cpp:490 src/slic3r/GUI/MainFrame.cpp:492
msgid "Save Project &as"
msgstr "Project opslaan als"
-#: src/slic3r/GUI/MainFrame.cpp:450 src/slic3r/GUI/MainFrame.cpp:452
+#: src/slic3r/GUI/MainFrame.cpp:490 src/slic3r/GUI/MainFrame.cpp:492
msgid "Save current project file as"
msgstr "Projectbestand opslaan als"
-#: src/slic3r/GUI/MainFrame.cpp:460
+#: src/slic3r/GUI/MainFrame.cpp:500
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Importeer STL-, OBJ-, AMF- of 3MF-bestanden"
-#: src/slic3r/GUI/MainFrame.cpp:460
+#: src/slic3r/GUI/MainFrame.cpp:500
msgid "Load a model"
msgstr "Laad een model"
-#: src/slic3r/GUI/MainFrame.cpp:464
+#: src/slic3r/GUI/MainFrame.cpp:504
msgid "Import &Config"
-msgstr "Importeer configuratie"
+msgstr "Importeer configuratiebestand"
-#: src/slic3r/GUI/MainFrame.cpp:464
+#: src/slic3r/GUI/MainFrame.cpp:504
msgid "Load exported configuration file"
msgstr "Laad geëxporteerd configuratiebestand"
-#: src/slic3r/GUI/MainFrame.cpp:467
+#: src/slic3r/GUI/MainFrame.cpp:507
msgid "Import Config from &project"
-msgstr "Importeer configuratie van project"
+msgstr "Importeer configuratie van projectbestand"
-#: src/slic3r/GUI/MainFrame.cpp:467
+#: src/slic3r/GUI/MainFrame.cpp:507
msgid "Load configuration from project file"
msgstr "Laad configuratie van projectbestand"
-#: src/slic3r/GUI/MainFrame.cpp:471
+#: src/slic3r/GUI/MainFrame.cpp:511
msgid "Import Config &Bundle"
msgstr "Importeer configuratiebundel"
-#: src/slic3r/GUI/MainFrame.cpp:471
+#: src/slic3r/GUI/MainFrame.cpp:511
msgid "Load presets from a bundle"
msgstr "Laad presets van een bundel"
-#: src/slic3r/GUI/MainFrame.cpp:474
+#: src/slic3r/GUI/MainFrame.cpp:514
msgid "&Import"
msgstr "Importeer"
-#: src/slic3r/GUI/MainFrame.cpp:477 src/slic3r/GUI/MainFrame.cpp:749
+#: src/slic3r/GUI/MainFrame.cpp:517 src/slic3r/GUI/MainFrame.cpp:796
msgid "Export &G-code"
msgstr "Exporteer G-code"
-#: src/slic3r/GUI/MainFrame.cpp:477
+#: src/slic3r/GUI/MainFrame.cpp:517
msgid "Export current plate as G-code"
-msgstr "Exporteer huidige modellen als gcode-bestand"
+msgstr "Exporteer modellen als gcode-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:481 src/slic3r/GUI/MainFrame.cpp:750
+#: src/slic3r/GUI/MainFrame.cpp:521 src/slic3r/GUI/MainFrame.cpp:797
msgid "S&end G-code"
msgstr "Stuur G-code"
-#: src/slic3r/GUI/MainFrame.cpp:481
+#: src/slic3r/GUI/MainFrame.cpp:521
msgid "Send to print current plate as G-code"
msgstr "Stuur huidige weergave als G-code"
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:525
+msgid "Export G-code to SD card / Flash drive"
+msgstr "Exporteer G-code naar SD-kaart/USB-stick"
+
+#: src/slic3r/GUI/MainFrame.cpp:525
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Exporteer huidige weergave als G-code naar SD-kaart/USB-stick"
+
+#: src/slic3r/GUI/MainFrame.cpp:529
msgid "Export plate as &STL"
-msgstr "Exporteer huidige modellen als STL-bestand"
+msgstr "Exporteer modellen als STL-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:529
msgid "Export current plate as STL"
-msgstr "Exporteer huidige modellen als STL-bestand"
+msgstr "Exporteer modellen als STL-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:489
+#: src/slic3r/GUI/MainFrame.cpp:532
msgid "Export plate as STL &including supports"
msgstr "Exporteer modellen met support als STL-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:489
+#: src/slic3r/GUI/MainFrame.cpp:532
msgid "Export current plate as STL including supports"
-msgstr "Exporteer huidige modellen met support als STL-bestand"
+msgstr "Exporteer modellen met support als STL-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:535
msgid "Export plate as &AMF"
-msgstr "Exporteer huidige modellen als AMF-bestand"
+msgstr "Exporteer modellen als AMF-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:535
msgid "Export current plate as AMF"
-msgstr "Exporteer huidige modellen als AMF-bestand"
+msgstr "Exporteer modellen als AMF-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:496
+#: src/slic3r/GUI/MainFrame.cpp:539
msgid "Export &toolpaths as OBJ"
msgstr "Exporteer paden als OBJ-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:496
+#: src/slic3r/GUI/MainFrame.cpp:539
msgid "Export toolpaths as OBJ"
msgstr "Exporteer toolpaden als OBJ-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:500
+#: src/slic3r/GUI/MainFrame.cpp:543
msgid "Export &Config"
msgstr "Exporteer configuratie"
-#: src/slic3r/GUI/MainFrame.cpp:500
+#: src/slic3r/GUI/MainFrame.cpp:543
msgid "Export current configuration to file"
msgstr "Exporteer huidige configuratie naar bestand"
-#: src/slic3r/GUI/MainFrame.cpp:503
+#: src/slic3r/GUI/MainFrame.cpp:546
msgid "Export Config &Bundle"
msgstr "Exporteer configuratiebundel"
-#: src/slic3r/GUI/MainFrame.cpp:503
+#: src/slic3r/GUI/MainFrame.cpp:546
msgid "Export all presets to file"
msgstr "Exporteer alle presets naar bestand"
-#: src/slic3r/GUI/MainFrame.cpp:506
+#: src/slic3r/GUI/MainFrame.cpp:549
msgid "&Export"
msgstr "Exporteer"
-#: src/slic3r/GUI/MainFrame.cpp:512
+#: src/slic3r/GUI/MainFrame.cpp:551
+msgid "Ejec&t SD card / Flash drive"
+msgstr "SD-kaart/USB-stick uitwerpen"
+
+#: src/slic3r/GUI/MainFrame.cpp:551
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "SD-kaart/USB-stick uitwerpen nadat de G-code geëxporteerd is."
+
+#: src/slic3r/GUI/MainFrame.cpp:559
msgid "Quick Slice"
msgstr "Snel slicen"
-#: src/slic3r/GUI/MainFrame.cpp:512
+#: src/slic3r/GUI/MainFrame.cpp:559
msgid "Slice a file into a G-code"
msgstr "Slice naar een gcode-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:518
+#: src/slic3r/GUI/MainFrame.cpp:565
msgid "Quick Slice and Save As"
msgstr "Snel slicen en opslaan als"
-#: src/slic3r/GUI/MainFrame.cpp:518
+#: src/slic3r/GUI/MainFrame.cpp:565
msgid "Slice a file into a G-code, save as"
msgstr "Slice naar gcode-bestand, opslaan als"
-#: src/slic3r/GUI/MainFrame.cpp:524
+#: src/slic3r/GUI/MainFrame.cpp:571
msgid "Repeat Last Quick Slice"
msgstr "Herhaal laatste snelle slice"
-#: src/slic3r/GUI/MainFrame.cpp:524
+#: src/slic3r/GUI/MainFrame.cpp:571
msgid "Repeat last quick slice"
msgstr "Herhaal laatste snelle slice"
-#: src/slic3r/GUI/MainFrame.cpp:532
+#: src/slic3r/GUI/MainFrame.cpp:579
msgid "(Re)Slice No&w"
msgstr "(Her)slice nu"
-#: src/slic3r/GUI/MainFrame.cpp:532
+#: src/slic3r/GUI/MainFrame.cpp:579
msgid "Start new slicing process"
msgstr "Start nieuw sliceproces"
-#: src/slic3r/GUI/MainFrame.cpp:536
+#: src/slic3r/GUI/MainFrame.cpp:583
msgid "&Repair STL file"
msgstr "Repareer STL-bestand"
-#: src/slic3r/GUI/MainFrame.cpp:536
+#: src/slic3r/GUI/MainFrame.cpp:583
msgid "Automatically repair an STL file"
msgstr "Automatisch een STL-bestand repareren"
-#: src/slic3r/GUI/MainFrame.cpp:540
+#: src/slic3r/GUI/MainFrame.cpp:587
msgid "&Quit"
msgstr "Afsluiten"
-#: src/slic3r/GUI/MainFrame.cpp:540
+#: src/slic3r/GUI/MainFrame.cpp:587
#, c-format
msgid "Quit %s"
msgstr "%s afsluiten"
-#: src/slic3r/GUI/MainFrame.cpp:565
+#: src/slic3r/GUI/MainFrame.cpp:612
msgid "&Select all"
-msgstr "Selecteer alle"
+msgstr "Selecteer alles"
-#: src/slic3r/GUI/MainFrame.cpp:566
+#: src/slic3r/GUI/MainFrame.cpp:613
msgid "Selects all objects"
msgstr "Selecteer alle objecten"
-#: src/slic3r/GUI/MainFrame.cpp:568
+#: src/slic3r/GUI/MainFrame.cpp:615
msgid "D&eselect all"
msgstr "Deselecteer alles"
-#: src/slic3r/GUI/MainFrame.cpp:569
+#: src/slic3r/GUI/MainFrame.cpp:616
msgid "Deselects all objects"
msgstr "Deselecteer alle objecten"
-#: src/slic3r/GUI/MainFrame.cpp:572
+#: src/slic3r/GUI/MainFrame.cpp:619
msgid "&Delete selected"
-msgstr "Verwijder selectie"
+msgstr "Deselecteer selectie"
-#: src/slic3r/GUI/MainFrame.cpp:573
+#: src/slic3r/GUI/MainFrame.cpp:620
msgid "Deletes the current selection"
msgstr "Verwijdert huidige selectie"
-#: src/slic3r/GUI/MainFrame.cpp:575
+#: src/slic3r/GUI/MainFrame.cpp:622
msgid "Delete &all"
msgstr "Verwijder alles"
-#: src/slic3r/GUI/MainFrame.cpp:576
+#: src/slic3r/GUI/MainFrame.cpp:623
msgid "Deletes all objects"
msgstr "Verwijdert alle objecten"
-#: src/slic3r/GUI/MainFrame.cpp:580
+#: src/slic3r/GUI/MainFrame.cpp:627
msgid "&Undo"
-msgstr "Maak ongedaan"
+msgstr "Ongedaan maken"
-#: src/slic3r/GUI/MainFrame.cpp:583
+#: src/slic3r/GUI/MainFrame.cpp:630
msgid "&Redo"
-msgstr "Doe opnieuw"
+msgstr "Opnieuw doen"
-#: src/slic3r/GUI/MainFrame.cpp:588
+#: src/slic3r/GUI/MainFrame.cpp:635
msgid "&Copy"
msgstr "Kopieer"
-#: src/slic3r/GUI/MainFrame.cpp:589
+#: src/slic3r/GUI/MainFrame.cpp:636
msgid "Copy selection to clipboard"
msgstr "Kopieer selectie naar klembord"
-#: src/slic3r/GUI/MainFrame.cpp:591
+#: src/slic3r/GUI/MainFrame.cpp:638
msgid "&Paste"
msgstr "Plak"
-#: src/slic3r/GUI/MainFrame.cpp:592
+#: src/slic3r/GUI/MainFrame.cpp:639
msgid "Paste clipboard"
msgstr "Plak van klembord"
-#: src/slic3r/GUI/MainFrame.cpp:596
+#: src/slic3r/GUI/MainFrame.cpp:643
msgid "Re&load from disk"
msgstr "Herlaad van schijf"
-#: src/slic3r/GUI/MainFrame.cpp:597
+#: src/slic3r/GUI/MainFrame.cpp:644
msgid "Reload the plater from disk"
msgstr "Herlaad modellen van schijf"
-#: src/slic3r/GUI/MainFrame.cpp:606
+#: src/slic3r/GUI/MainFrame.cpp:653
msgid "&Plater Tab"
-msgstr "3D-weergavetab"
+msgstr "Tabblad 3D-weergave"
-#: src/slic3r/GUI/MainFrame.cpp:606
+#: src/slic3r/GUI/MainFrame.cpp:653
msgid "Show the plater"
msgstr "Toon de 3D-weergave"
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:661
msgid "P&rint Settings Tab"
-msgstr "Printinstellingentab"
+msgstr "Tabblad printinstellingen"
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:661
msgid "Show the print settings"
msgstr "Toon de printinstellingen"
-#: src/slic3r/GUI/MainFrame.cpp:617 src/slic3r/GUI/MainFrame.cpp:752
+#: src/slic3r/GUI/MainFrame.cpp:664 src/slic3r/GUI/MainFrame.cpp:799
msgid "&Filament Settings Tab"
-msgstr "Filamentinstellingentab"
+msgstr "Tabblad filamentinstellingen"
-#: src/slic3r/GUI/MainFrame.cpp:617
+#: src/slic3r/GUI/MainFrame.cpp:664
msgid "Show the filament settings"
-msgstr "Toon de filamentinstellingentab"
+msgstr "Toon de filamentinstellingen"
-#: src/slic3r/GUI/MainFrame.cpp:621
+#: src/slic3r/GUI/MainFrame.cpp:668
msgid "Print&er Settings Tab"
-msgstr "Printerinstellingentab"
+msgstr "Tabblad printerinstellingen"
-#: src/slic3r/GUI/MainFrame.cpp:621
+#: src/slic3r/GUI/MainFrame.cpp:668
msgid "Show the printer settings"
msgstr "Toon de printerinstellingen"
-#: src/slic3r/GUI/MainFrame.cpp:626
+#: src/slic3r/GUI/MainFrame.cpp:673
msgid "3&D"
-msgstr "3D"
+msgstr "3D-bewerkingsweergave"
-#: src/slic3r/GUI/MainFrame.cpp:626
+#: src/slic3r/GUI/MainFrame.cpp:673
msgid "Show the 3D editing view"
msgstr "Toon de 3D-bewerkingsweergave"
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676
msgid "Pre&view"
-msgstr "Voorbeeld"
+msgstr "Voorbeeldweergave"
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676
msgid "Show the 3D slices preview"
msgstr "Toon de 3D-weergave van de slice"
-#: src/slic3r/GUI/MainFrame.cpp:648
+#: src/slic3r/GUI/MainFrame.cpp:695
msgid "Print &Host Upload Queue"
msgstr "Printhost uploadwachtrij"
-#: src/slic3r/GUI/MainFrame.cpp:648
+#: src/slic3r/GUI/MainFrame.cpp:695
msgid "Display the Print Host Upload Queue window"
msgstr "Toon het venster van de printhost uploadwachtrij"
-#: src/slic3r/GUI/MainFrame.cpp:658
+#: src/slic3r/GUI/MainFrame.cpp:705
msgid "Iso"
msgstr "Isometrisch"
-#: src/slic3r/GUI/MainFrame.cpp:658
+#: src/slic3r/GUI/MainFrame.cpp:705
msgid "Iso View"
msgstr "Isometrisch aanzicht"
#. TRN To be shown in the main menu View->Top
#. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:662 src/libslic3r/PrintConfig.cpp:2132
+#: src/slic3r/GUI/MainFrame.cpp:709 src/libslic3r/PrintConfig.cpp:2132
#: src/libslic3r/PrintConfig.cpp:2141
msgid "Top"
msgstr "Bovenkant"
-#: src/slic3r/GUI/MainFrame.cpp:662
+#: src/slic3r/GUI/MainFrame.cpp:709
msgid "Top View"
msgstr "Bovenaanzicht"
#. TRN To be shown in the main menu View->Bottom
#. TRN To be shown in Print Settings "Bottom solid layers"
#. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:665 src/libslic3r/PrintConfig.cpp:174
+#: src/slic3r/GUI/MainFrame.cpp:712 src/libslic3r/PrintConfig.cpp:174
#: src/libslic3r/PrintConfig.cpp:183
msgid "Bottom"
msgstr "Onderkant"
-#: src/slic3r/GUI/MainFrame.cpp:665
+#: src/slic3r/GUI/MainFrame.cpp:712
msgid "Bottom View"
msgstr "Onderaanzicht"
-#: src/slic3r/GUI/MainFrame.cpp:667
+#: src/slic3r/GUI/MainFrame.cpp:714
msgid "Front"
msgstr "Voorkant"
-#: src/slic3r/GUI/MainFrame.cpp:667
+#: src/slic3r/GUI/MainFrame.cpp:714
msgid "Front View"
msgstr "Vooraanzicht"
-#: src/slic3r/GUI/MainFrame.cpp:669 src/libslic3r/PrintConfig.cpp:1632
+#: src/slic3r/GUI/MainFrame.cpp:716 src/libslic3r/PrintConfig.cpp:1632
msgid "Rear"
-msgstr "Achterkant"
+msgstr "Achterzijde"
-#: src/slic3r/GUI/MainFrame.cpp:669
+#: src/slic3r/GUI/MainFrame.cpp:716
msgid "Rear View"
msgstr "Achteraanzicht"
-#: src/slic3r/GUI/MainFrame.cpp:671
+#: src/slic3r/GUI/MainFrame.cpp:718
msgid "Left"
msgstr "Links"
-#: src/slic3r/GUI/MainFrame.cpp:671
+#: src/slic3r/GUI/MainFrame.cpp:718
msgid "Left View"
msgstr "Linkerzijaanzicht"
-#: src/slic3r/GUI/MainFrame.cpp:673
+#: src/slic3r/GUI/MainFrame.cpp:720
msgid "Right"
msgstr "Rechts"
-#: src/slic3r/GUI/MainFrame.cpp:673
+#: src/slic3r/GUI/MainFrame.cpp:720
msgid "Right View"
msgstr "Rechterzijaanzicht"
-#: src/slic3r/GUI/MainFrame.cpp:676
+#: src/slic3r/GUI/MainFrame.cpp:723
msgid "Show &labels"
msgstr "Toon labels"
-#: src/slic3r/GUI/MainFrame.cpp:676
+#: src/slic3r/GUI/MainFrame.cpp:723
msgid "Show object/instance labels in 3D scene"
msgstr "Toon object-/instantielabels in de 3D weergave"
-#: src/slic3r/GUI/MainFrame.cpp:684
+#: src/slic3r/GUI/MainFrame.cpp:731
msgid "Prusa 3D &Drivers"
-msgstr "Prusa 3D stuurprogramma"
+msgstr "Prusa 3D-stuurprogramma"
-#: src/slic3r/GUI/MainFrame.cpp:684
+#: src/slic3r/GUI/MainFrame.cpp:731
msgid "Open the Prusa3D drivers download page in your browser"
msgstr "Open de Prusa3D drivers-downloadpagina in uw browser"
-#: src/slic3r/GUI/MainFrame.cpp:686
+#: src/slic3r/GUI/MainFrame.cpp:733
msgid "Software &Releases"
-msgstr "Software-uitgaven"
+msgstr "Laatste versie downloaden"
-#: src/slic3r/GUI/MainFrame.cpp:686
+#: src/slic3r/GUI/MainFrame.cpp:733
msgid "Open the software releases page in your browser"
-msgstr "Open de software-uitgaven pagina in uw browser"
+msgstr "Download de laatste softwareversie vanuit uw browser"
-#: src/slic3r/GUI/MainFrame.cpp:692
+#: src/slic3r/GUI/MainFrame.cpp:739
#, c-format
msgid "%s &Website"
msgstr "%s-website"
-#: src/slic3r/GUI/MainFrame.cpp:693
+#: src/slic3r/GUI/MainFrame.cpp:740
#, c-format
msgid "Open the %s website in your browser"
msgstr "Open de %s website in uw browser"
-#: src/slic3r/GUI/MainFrame.cpp:699
+#: src/slic3r/GUI/MainFrame.cpp:746
msgid "System &Info"
msgstr "Systeeminfo"
-#: src/slic3r/GUI/MainFrame.cpp:699
+#: src/slic3r/GUI/MainFrame.cpp:746
msgid "Show system information"
msgstr "Toon systeeminformatie"
-#: src/slic3r/GUI/MainFrame.cpp:701
+#: src/slic3r/GUI/MainFrame.cpp:748
msgid "Show &Configuration Folder"
msgstr "Toon configuratiemap"
-#: src/slic3r/GUI/MainFrame.cpp:701
+#: src/slic3r/GUI/MainFrame.cpp:748
msgid "Show user configuration folder (datadir)"
msgstr "Toon gebruikersconfiguratiemap (datadir)"
-#: src/slic3r/GUI/MainFrame.cpp:703
+#: src/slic3r/GUI/MainFrame.cpp:750
msgid "Report an I&ssue"
msgstr "Rapporteer een fout"
-#: src/slic3r/GUI/MainFrame.cpp:703
+#: src/slic3r/GUI/MainFrame.cpp:750
#, c-format
msgid "Report an issue on %s"
msgstr "Rapporteer een fout op %s"
-#: src/slic3r/GUI/MainFrame.cpp:705
+#: src/slic3r/GUI/MainFrame.cpp:752
#, c-format
msgid "&About %s"
msgstr "Over %s"
-#: src/slic3r/GUI/MainFrame.cpp:705
+#: src/slic3r/GUI/MainFrame.cpp:752
msgid "Show about dialog"
msgstr "Toon Over-dialoogvenster"
-#: src/slic3r/GUI/MainFrame.cpp:708
+#: src/slic3r/GUI/MainFrame.cpp:755
msgid "Show the list of the keyboard shortcuts"
msgstr "Toon de lijst met sneltoetsen"
-#: src/slic3r/GUI/MainFrame.cpp:721
+#: src/slic3r/GUI/MainFrame.cpp:768
msgid "&File"
msgstr "Bestand"
-#: src/slic3r/GUI/MainFrame.cpp:722
+#: src/slic3r/GUI/MainFrame.cpp:769
msgid "&Edit"
msgstr "Bewerk"
-#: src/slic3r/GUI/MainFrame.cpp:723
+#: src/slic3r/GUI/MainFrame.cpp:770
msgid "&Window"
msgstr "Venster"
-#: src/slic3r/GUI/MainFrame.cpp:724
+#: src/slic3r/GUI/MainFrame.cpp:771
msgid "&View"
msgstr "Toon"
-#: src/slic3r/GUI/MainFrame.cpp:727
+#: src/slic3r/GUI/MainFrame.cpp:774
msgid "&Help"
msgstr "Help"
-#: src/slic3r/GUI/MainFrame.cpp:749
+#: src/slic3r/GUI/MainFrame.cpp:796
msgid "E&xport"
msgstr "Exporteer"
-#: src/slic3r/GUI/MainFrame.cpp:750
+#: src/slic3r/GUI/MainFrame.cpp:797
msgid "S&end to print"
msgstr "Stuur om te printen"
-#: src/slic3r/GUI/MainFrame.cpp:752
+#: src/slic3r/GUI/MainFrame.cpp:799
msgid "Mate&rial Settings Tab"
msgstr "Materiaalinstellingentab"
-#: src/slic3r/GUI/MainFrame.cpp:773
+#: src/slic3r/GUI/MainFrame.cpp:820
msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Kies een STL-, OBJ-, AMF-, 3MF- of PRUSA-bestand om te slicen:"
-#: src/slic3r/GUI/MainFrame.cpp:784
+#: src/slic3r/GUI/MainFrame.cpp:831
msgid "No previously sliced file."
msgstr "Niet eerder gesliced bestand."
-#: src/slic3r/GUI/MainFrame.cpp:790
+#: src/slic3r/GUI/MainFrame.cpp:837
msgid "Previously sliced file ("
msgstr "Eerder gesliced bestand ("
-#: src/slic3r/GUI/MainFrame.cpp:790
+#: src/slic3r/GUI/MainFrame.cpp:837
msgid ") not found."
msgstr ") niet gevonden."
-#: src/slic3r/GUI/MainFrame.cpp:791
+#: src/slic3r/GUI/MainFrame.cpp:838
msgid "File Not Found"
msgstr "Bestand niet gevonden"
-#: src/slic3r/GUI/MainFrame.cpp:826
+#: src/slic3r/GUI/MainFrame.cpp:873
#, c-format
msgid "Save %s file as:"
msgstr "%s-bestand opslaan als:"
-#: src/slic3r/GUI/MainFrame.cpp:826
+#: src/slic3r/GUI/MainFrame.cpp:873
msgid "SVG"
msgstr "SVG"
-#: src/slic3r/GUI/MainFrame.cpp:826
+#: src/slic3r/GUI/MainFrame.cpp:873
msgid "G-code"
msgstr "G-code"
-#: src/slic3r/GUI/MainFrame.cpp:838
+#: src/slic3r/GUI/MainFrame.cpp:885
msgid "Save zip file as:"
msgstr "ZIP-bestand opslaan als:"
-#: src/slic3r/GUI/MainFrame.cpp:847 src/slic3r/GUI/Plater.cpp:3099
-#: src/slic3r/GUI/Plater.cpp:5085 src/slic3r/GUI/Tab.cpp:1223
-#: src/slic3r/GUI/Tab.cpp:3652
+#: src/slic3r/GUI/MainFrame.cpp:894 src/slic3r/GUI/Plater.cpp:3178
+#: src/slic3r/GUI/Plater.cpp:5150 src/slic3r/GUI/Tab.cpp:1281
+#: src/slic3r/GUI/Tab.cpp:3720
msgid "Slicing"
msgstr "Slicen"
#. TRN "Processing input_file_basename"
-#: src/slic3r/GUI/MainFrame.cpp:849
+#: src/slic3r/GUI/MainFrame.cpp:896
#, c-format
msgid "Processing %s"
msgstr "%s verwerken"
-#: src/slic3r/GUI/MainFrame.cpp:872
+#: src/slic3r/GUI/MainFrame.cpp:919
msgid " was successfully sliced."
msgstr " succesvol gesliced."
-#: src/slic3r/GUI/MainFrame.cpp:874
+#: src/slic3r/GUI/MainFrame.cpp:921
msgid "Slicing Done!"
msgstr "Slicen klaar!"
-#: src/slic3r/GUI/MainFrame.cpp:889
+#: src/slic3r/GUI/MainFrame.cpp:936
msgid "Select the STL file to repair:"
msgstr "Selecteer het STL-bestand om te repareren:"
-#: src/slic3r/GUI/MainFrame.cpp:899
+#: src/slic3r/GUI/MainFrame.cpp:946
msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
msgstr "OBJ-bestand opslaan als:"
-#: src/slic3r/GUI/MainFrame.cpp:911
+#: src/slic3r/GUI/MainFrame.cpp:958
msgid "Your file was repaired."
msgstr "Het bestand is gerepareerd."
-#: src/slic3r/GUI/MainFrame.cpp:911 src/libslic3r/PrintConfig.cpp:3447
+#: src/slic3r/GUI/MainFrame.cpp:958 src/libslic3r/PrintConfig.cpp:3457
msgid "Repair"
msgstr "Repareer"
-#: src/slic3r/GUI/MainFrame.cpp:925
+#: src/slic3r/GUI/MainFrame.cpp:972
msgid "Save configuration as:"
msgstr "Configuratie opslaan als:"
-#: src/slic3r/GUI/MainFrame.cpp:944 src/slic3r/GUI/MainFrame.cpp:1006
+#: src/slic3r/GUI/MainFrame.cpp:991 src/slic3r/GUI/MainFrame.cpp:1053
msgid "Select configuration to load:"
msgstr "Selecteer configuratie om te laden:"
-#: src/slic3r/GUI/MainFrame.cpp:980
+#: src/slic3r/GUI/MainFrame.cpp:1027
msgid "Save presets bundle as:"
msgstr "Presetbundel opslaan als:"
-#: src/slic3r/GUI/MainFrame.cpp:1027
+#: src/slic3r/GUI/MainFrame.cpp:1074
#, c-format
msgid "%d presets successfully imported."
msgstr "%d presets succesvol geïmporteerd."
-#: src/slic3r/GUI/Mouse3DController.cpp:274
+#: src/slic3r/GUI/Mouse3DController.cpp:239
msgid "3Dconnexion settings"
msgstr "3Dconnexion-instellingen"
-#: src/slic3r/GUI/Mouse3DController.cpp:289
+#: src/slic3r/GUI/Mouse3DController.cpp:254
msgid "Device:"
msgstr "Apparaat:"
-#: src/slic3r/GUI/Mouse3DController.cpp:296
+#: src/slic3r/GUI/Mouse3DController.cpp:261
msgid "Speed:"
msgstr "Snelheid:"
-#: src/slic3r/GUI/Mouse3DController.cpp:300
-#: src/slic3r/GUI/Mouse3DController.cpp:317
+#: src/slic3r/GUI/Mouse3DController.cpp:265
+#: src/slic3r/GUI/Mouse3DController.cpp:288
msgid "Translation"
msgstr "Verplaatsing"
-#: src/slic3r/GUI/Mouse3DController.cpp:308
-#: src/slic3r/GUI/Mouse3DController.cpp:317
+#: src/slic3r/GUI/Mouse3DController.cpp:277
+#: src/slic3r/GUI/Mouse3DController.cpp:288
msgid "Zoom"
msgstr "Zoom"
-#: src/slic3r/GUI/Mouse3DController.cpp:313
+#: src/slic3r/GUI/Mouse3DController.cpp:284
msgid "Deadzone:"
msgstr "Deadzone:"
@@ -4070,8 +4134,8 @@ msgstr "Instanties"
msgid "Instance %d"
msgstr "Instantie %d"
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:67 src/slic3r/GUI/Tab.cpp:3502
-#: src/slic3r/GUI/Tab.cpp:3590
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:67 src/slic3r/GUI/Tab.cpp:3574
+#: src/slic3r/GUI/Tab.cpp:3656
msgid "Layers"
msgstr "Lagen"
@@ -4079,12 +4143,12 @@ msgstr "Lagen"
msgid "Range"
msgstr "Bereik"
-#: src/slic3r/GUI/OptionsGroup.cpp:258
+#: src/slic3r/GUI/OptionsGroup.cpp:274
msgctxt "Layers"
msgid "Top"
msgstr "Bovenkant"
-#: src/slic3r/GUI/OptionsGroup.cpp:258
+#: src/slic3r/GUI/OptionsGroup.cpp:274
msgctxt "Layers"
msgid "Bottom"
msgstr "Onderkant"
@@ -4109,7 +4173,7 @@ msgstr "Gesloten model"
msgid "Sliced Info"
msgstr "Slice info"
-#: src/slic3r/GUI/Plater.cpp:235 src/slic3r/GUI/Plater.cpp:1224
+#: src/slic3r/GUI/Plater.cpp:235 src/slic3r/GUI/Plater.cpp:1234
msgid "Used Filament (m)"
msgstr "Filamentverbruik (m)"
@@ -4129,8 +4193,8 @@ msgstr "Materiaalverbruik (eenheid)"
msgid "Cost (money)"
msgstr "Kosten (€)"
-#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1211
-#: src/slic3r/GUI/Plater.cpp:1253
+#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1221
+#: src/slic3r/GUI/Plater.cpp:1263
msgid "Estimated printing time"
msgstr "Geschatte printtijd"
@@ -4138,106 +4202,102 @@ msgstr "Geschatte printtijd"
msgid "Number of tool changes"
msgstr "Aantal toolwisselingen"
-#: src/slic3r/GUI/Plater.cpp:338
+#: src/slic3r/GUI/Plater.cpp:348
msgid "Click to edit preset"
msgstr "Klik om de preset te wijzigen"
-#: src/slic3r/GUI/Plater.cpp:493
+#: src/slic3r/GUI/Plater.cpp:503
msgid "Select what kind of support do you need"
msgstr "Selecteer welk type support nodig is"
-#: src/slic3r/GUI/Plater.cpp:495 src/libslic3r/PrintConfig.cpp:1901
-#: src/libslic3r/PrintConfig.cpp:2674
+#: src/slic3r/GUI/Plater.cpp:505 src/libslic3r/PrintConfig.cpp:1901
+#: src/libslic3r/PrintConfig.cpp:2684
msgid "Support on build plate only"
msgstr "Support alleen op het bed"
-#: src/slic3r/GUI/Plater.cpp:496 src/slic3r/GUI/Plater.cpp:619
+#: src/slic3r/GUI/Plater.cpp:506 src/slic3r/GUI/Plater.cpp:629
msgid "For support enforcers only"
msgstr "Alleen voor supportforceringen"
-#: src/slic3r/GUI/Plater.cpp:497
+#: src/slic3r/GUI/Plater.cpp:507
msgid "Everywhere"
msgstr "Overal"
-#: src/slic3r/GUI/Plater.cpp:529 src/slic3r/GUI/Tab.cpp:1119
+#: src/slic3r/GUI/Plater.cpp:539 src/slic3r/GUI/Tab.cpp:1177
msgid "Brim"
msgstr "Brim"
-#: src/slic3r/GUI/Plater.cpp:531
+#: src/slic3r/GUI/Plater.cpp:541
msgid ""
"This flag enables the brim that will be printed around each object on the "
"first layer."
msgstr "Door dit aan te vinken zal een brim rond elke object geprint worden."
-#: src/slic3r/GUI/Plater.cpp:539
+#: src/slic3r/GUI/Plater.cpp:549
msgid "Purging volumes"
msgstr "Afveegvolume"
-#: src/slic3r/GUI/Plater.cpp:633
+#: src/slic3r/GUI/Plater.cpp:643
msgid "Select what kind of pad do you need"
msgstr "Selecteer welk soort basisplaat nodig is"
-#: src/slic3r/GUI/Plater.cpp:635
+#: src/slic3r/GUI/Plater.cpp:645
msgid "Below object"
msgstr "Onder het object"
-#: src/slic3r/GUI/Plater.cpp:636
+#: src/slic3r/GUI/Plater.cpp:646
msgid "Around object"
msgstr "Rondom het object"
-#: src/slic3r/GUI/Plater.cpp:810
+#: src/slic3r/GUI/Plater.cpp:820
msgid "Print settings"
msgstr "Printinstellingen"
-#: src/slic3r/GUI/Plater.cpp:811 src/slic3r/GUI/Tab.cpp:1427
-#: src/slic3r/GUI/Tab.cpp:1428
+#: src/slic3r/GUI/Plater.cpp:821 src/slic3r/GUI/Tab.cpp:1480
+#: src/slic3r/GUI/Tab.cpp:1481
msgid "Filament"
msgstr "Filament"
-#: src/slic3r/GUI/Plater.cpp:812
+#: src/slic3r/GUI/Plater.cpp:822
msgid "SLA print settings"
msgstr "SLA-printinstellingen"
-#: src/slic3r/GUI/Plater.cpp:813 src/slic3r/GUI/Preset.cpp:1522
+#: src/slic3r/GUI/Plater.cpp:823 src/slic3r/GUI/Preset.cpp:1554
msgid "SLA material"
msgstr "SLA-materiaal"
-#: src/slic3r/GUI/Plater.cpp:814
+#: src/slic3r/GUI/Plater.cpp:824
msgid "Printer"
msgstr "Printer"
-#: src/slic3r/GUI/Plater.cpp:873 src/slic3r/GUI/Plater.cpp:5497
+#: src/slic3r/GUI/Plater.cpp:883 src/slic3r/GUI/Plater.cpp:5547
msgid "Send to printer"
msgstr "Stuur naar printer"
-#: src/slic3r/GUI/Plater.cpp:874
+#: src/slic3r/GUI/Plater.cpp:884
msgid "Remove device"
msgstr "Verwijder schijf"
-#: src/slic3r/GUI/Plater.cpp:875
-msgid "Export to SD card / Flash drive"
-msgstr "Exporteer naar SD-kaart / USB-stick"
-
-#: src/slic3r/GUI/Plater.cpp:887 src/slic3r/GUI/Plater.cpp:3099
-#: src/slic3r/GUI/Plater.cpp:5088
+#: src/slic3r/GUI/Plater.cpp:897 src/slic3r/GUI/Plater.cpp:3178
+#: src/slic3r/GUI/Plater.cpp:5153
msgid "Slice now"
msgstr "Slice nu"
-#: src/slic3r/GUI/Plater.cpp:1037
+#: src/slic3r/GUI/Plater.cpp:1047
msgid "Hold Shift to Slice & Export G-code"
msgstr "Houdt shift ingedrukt om te slicen en de G-code te exporteren"
-#: src/slic3r/GUI/Plater.cpp:1147
+#: src/slic3r/GUI/Plater.cpp:1157
#, c-format
msgid "%d (%d shells)"
msgstr "%d (%d shells)"
-#: src/slic3r/GUI/Plater.cpp:1152
+#: src/slic3r/GUI/Plater.cpp:1162
#, c-format
msgid "Auto-repaired (%d errors)"
msgstr "Automatisch gerepareerd (%d fouten)"
-#: src/slic3r/GUI/Plater.cpp:1155
+#: src/slic3r/GUI/Plater.cpp:1165
#, c-format
msgid ""
"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
@@ -4246,78 +4306,90 @@ msgstr ""
"%d degenereer vlakken, %d randen vastgezet, %d vlakken verwijderd, %d "
"vlakken toegevoegd, %d vlakken omgekeerd, %d randen omgekeerd"
-#: src/slic3r/GUI/Plater.cpp:1165
+#: src/slic3r/GUI/Plater.cpp:1175
msgid "Yes"
msgstr "JA"
-#: src/slic3r/GUI/Plater.cpp:1186
+#: src/slic3r/GUI/Plater.cpp:1196
msgid "Used Material (ml)"
msgstr "Materiaalgebruik (ml)"
-#: src/slic3r/GUI/Plater.cpp:1189
+#: src/slic3r/GUI/Plater.cpp:1199
msgid "object(s)"
msgstr "object(en)"
-#: src/slic3r/GUI/Plater.cpp:1189
+#: src/slic3r/GUI/Plater.cpp:1199
msgid "supports and pad"
msgstr "support en basisplaat"
-#: src/slic3r/GUI/Plater.cpp:1226 src/slic3r/GUI/Plater.cpp:1240
+#: src/slic3r/GUI/Plater.cpp:1236 src/slic3r/GUI/Plater.cpp:1250
msgid "objects"
msgstr "objecten"
-#: src/slic3r/GUI/Plater.cpp:1226 src/slic3r/GUI/Plater.cpp:1240
+#: src/slic3r/GUI/Plater.cpp:1236 src/slic3r/GUI/Plater.cpp:1250
msgid "wipe tower"
msgstr "afveegblok"
-#: src/slic3r/GUI/Plater.cpp:1238 src/libslic3r/PrintConfig.cpp:760
+#: src/slic3r/GUI/Plater.cpp:1248 src/libslic3r/PrintConfig.cpp:760
#: src/libslic3r/PrintConfig.cpp:2510 src/libslic3r/PrintConfig.cpp:2511
msgid "Cost"
msgstr "Kosten"
-#: src/slic3r/GUI/Plater.cpp:1256
-msgid "normal mode"
-msgstr "normale modus"
-
-#: src/slic3r/GUI/Plater.cpp:1260 src/slic3r/GUI/Plater.cpp:1269
-#: src/libslic3r/PrintConfig.cpp:582
+#: src/slic3r/GUI/Plater.cpp:1265 src/libslic3r/PrintConfig.cpp:582
msgid "Color"
msgstr "Kleur"
-#: src/slic3r/GUI/Plater.cpp:1265
+#: src/slic3r/GUI/Plater.cpp:1266
+msgid "Pause"
+msgstr "Pauzeer"
+
+#: src/slic3r/GUI/Plater.cpp:1291
+msgid "normal mode"
+msgstr "normale modus"
+
+#: src/slic3r/GUI/Plater.cpp:1296
msgid "stealth mode"
msgstr "stille modus"
-#: src/slic3r/GUI/Plater.cpp:1373
+#: src/slic3r/GUI/Plater.cpp:1400
msgid "Load File"
msgstr "Laad bestand"
-#: src/slic3r/GUI/Plater.cpp:1377
+#: src/slic3r/GUI/Plater.cpp:1404
msgid "Load Files"
msgstr "Laad bestanden"
-#: src/slic3r/GUI/Plater.cpp:2129
+#: src/slic3r/GUI/Plater.cpp:2196
+#, c-format
+msgid ""
+"Unmounting successful. The device %s(%s) can now be safely removed from the "
+"computer."
+msgstr ""
+"Ontkoppelen succesvol. Het apparaat %s(%s) kan nu veilig uit de computer "
+"gehaald worden."
+
+#: src/slic3r/GUI/Plater.cpp:2204
msgid "New Project"
msgstr "Nieuw project"
-#: src/slic3r/GUI/Plater.cpp:2251
+#: src/slic3r/GUI/Plater.cpp:2325
msgid "Loading"
msgstr "Aan het laden"
-#: src/slic3r/GUI/Plater.cpp:2261
+#: src/slic3r/GUI/Plater.cpp:2335
#, c-format
msgid "Processing input file %s"
msgstr "Verwerken van inputbestand %s"
-#: src/slic3r/GUI/Plater.cpp:2289
+#: src/slic3r/GUI/Plater.cpp:2363
msgid "You cannot load SLA project with a multi-part object on the bed"
msgstr "U kunt geen SLA-project laden met een meerdelig object op het bed"
-#: src/slic3r/GUI/Plater.cpp:2290 src/slic3r/GUI/Tab.cpp:2949
+#: src/slic3r/GUI/Plater.cpp:2364 src/slic3r/GUI/Tab.cpp:2947
msgid "Please check your object list before preset changing."
msgstr "Controleer de objectenlijst voor het wijzigen van de preset."
-#: src/slic3r/GUI/Plater.cpp:2335
+#: src/slic3r/GUI/Plater.cpp:2409
msgid ""
"This file contains several objects positioned at multiple heights.\n"
"Instead of considering them as multiple objects, should I consider\n"
@@ -4329,11 +4401,11 @@ msgstr ""
"onderdelen\n"
"in plaats van als meerdere objecten?"
-#: src/slic3r/GUI/Plater.cpp:2338 src/slic3r/GUI/Plater.cpp:2391
+#: src/slic3r/GUI/Plater.cpp:2412 src/slic3r/GUI/Plater.cpp:2465
msgid "Multi-part object detected"
msgstr "Meerdelig object gedetecteerd"
-#: src/slic3r/GUI/Plater.cpp:2345
+#: src/slic3r/GUI/Plater.cpp:2419
msgid ""
"This file cannot be loaded in a simple mode. Do you want to switch to an "
"advanced mode?"
@@ -4341,11 +4413,11 @@ msgstr ""
"Dit bestand kan niet geladen worden in eenvoudige modus. Wilt u overstappen "
"op geavanceerde modus?"
-#: src/slic3r/GUI/Plater.cpp:2346
+#: src/slic3r/GUI/Plater.cpp:2420
msgid "Detected advanced data"
msgstr "Geavanceerde data gedetecteerd"
-#: src/slic3r/GUI/Plater.cpp:2368
+#: src/slic3r/GUI/Plater.cpp:2442
#, c-format
msgid ""
"You can't to add the object(s) from %s because of one or some of them "
@@ -4354,7 +4426,7 @@ msgstr ""
"U kan geen objecten toevoegen van %s, omdat sommige daarvan meerdelig kunnen "
"zijn"
-#: src/slic3r/GUI/Plater.cpp:2388
+#: src/slic3r/GUI/Plater.cpp:2462
msgid ""
"Multiple objects were loaded for a multi-material printer.\n"
"Instead of considering them as multiple objects, should I consider\n"
@@ -4364,11 +4436,11 @@ msgstr ""
"Moeten deze objecten beschouwd worden als één object\n"
"met meerdere onderdelen, of als meerdere objecten?"
-#: src/slic3r/GUI/Plater.cpp:2404
+#: src/slic3r/GUI/Plater.cpp:2478
msgid "Loaded"
msgstr "Geladen"
-#: src/slic3r/GUI/Plater.cpp:2506
+#: src/slic3r/GUI/Plater.cpp:2580
msgid ""
"Your object appears to be too large, so it was automatically scaled down to "
"fit your print bed."
@@ -4376,87 +4448,87 @@ msgstr ""
"Het object is te groot. Daarom is het automatisch verschaald tot de grootte "
"van het printbed."
-#: src/slic3r/GUI/Plater.cpp:2507
+#: src/slic3r/GUI/Plater.cpp:2581
msgid "Object too large?"
msgstr "Object te groot?"
-#: src/slic3r/GUI/Plater.cpp:2569
+#: src/slic3r/GUI/Plater.cpp:2643
msgid "Export STL file:"
msgstr "Exporteer STL-bestand:"
-#: src/slic3r/GUI/Plater.cpp:2576
+#: src/slic3r/GUI/Plater.cpp:2650
msgid "Export AMF file:"
msgstr "Exporteer AMF-bestand:"
-#: src/slic3r/GUI/Plater.cpp:2582
+#: src/slic3r/GUI/Plater.cpp:2656
msgid "Save file as:"
msgstr "Bestand opslaan als:"
-#: src/slic3r/GUI/Plater.cpp:2588
+#: src/slic3r/GUI/Plater.cpp:2662
msgid "Export OBJ file:"
msgstr "Exporteer OBJ-bestand:"
-#: src/slic3r/GUI/Plater.cpp:2690
+#: src/slic3r/GUI/Plater.cpp:2764
msgid "Delete Object"
msgstr "Verwijder object"
-#: src/slic3r/GUI/Plater.cpp:2701
+#: src/slic3r/GUI/Plater.cpp:2775
msgid "Reset Project"
msgstr "Reset project"
-#: src/slic3r/GUI/Plater.cpp:2738
+#: src/slic3r/GUI/Plater.cpp:2812
msgid "Hollow"
msgstr "Uithollen"
-#: src/slic3r/GUI/Plater.cpp:2745
+#: src/slic3r/GUI/Plater.cpp:2819
msgid "Optimize Rotation"
msgstr "Optimaliseer rotatie"
-#: src/slic3r/GUI/Plater.cpp:2791
+#: src/slic3r/GUI/Plater.cpp:2865
msgid "Arranging"
msgstr "Schikken"
-#: src/slic3r/GUI/Plater.cpp:2813
+#: src/slic3r/GUI/Plater.cpp:2892
msgid "Could not arrange model objects! Some geometries may be invalid."
msgstr "Kan modellen niet schikken. Sommige vormen kunnen ongeldig zijn."
-#: src/slic3r/GUI/Plater.cpp:2819
+#: src/slic3r/GUI/Plater.cpp:2898
msgid "Arranging canceled."
msgstr "Schikken geannuleerd."
-#: src/slic3r/GUI/Plater.cpp:2820
+#: src/slic3r/GUI/Plater.cpp:2899
msgid "Arranging done."
msgstr "Schikken voltooid."
-#: src/slic3r/GUI/Plater.cpp:2836
+#: src/slic3r/GUI/Plater.cpp:2915
msgid "Searching for optimal orientation"
msgstr "Zoeken naar optimale oriëntatie"
-#: src/slic3r/GUI/Plater.cpp:2869
+#: src/slic3r/GUI/Plater.cpp:2948
msgid "Orientation search canceled."
msgstr "Oriëntatie zoeken geannuleerd."
-#: src/slic3r/GUI/Plater.cpp:2870
+#: src/slic3r/GUI/Plater.cpp:2949
msgid "Orientation found."
msgstr "Oriëntatie gevonden."
-#: src/slic3r/GUI/Plater.cpp:2900
+#: src/slic3r/GUI/Plater.cpp:2979
msgid "Indexing hollowed object"
msgstr "Uitgehold object indexeren"
-#: src/slic3r/GUI/Plater.cpp:2904
+#: src/slic3r/GUI/Plater.cpp:2983
msgid "Hollowing cancelled."
msgstr "Uithollen geannuleerd."
-#: src/slic3r/GUI/Plater.cpp:2905
+#: src/slic3r/GUI/Plater.cpp:2984
msgid "Hollowing done."
msgstr "Uithollen voltooid."
-#: src/slic3r/GUI/Plater.cpp:2907
+#: src/slic3r/GUI/Plater.cpp:2986
msgid "Hollowing failed."
msgstr "Uithollen mislukt."
-#: src/slic3r/GUI/Plater.cpp:2948
+#: src/slic3r/GUI/Plater.cpp:3027
msgid ""
"The selected object can't be split because it contains more than one volume/"
"material."
@@ -4464,164 +4536,164 @@ msgstr ""
"Het geselecteerde object kan niet opgedeeld worden omdat het meer dan één "
"volume bevat."
-#: src/slic3r/GUI/Plater.cpp:2959
+#: src/slic3r/GUI/Plater.cpp:3038
msgid "Split to Objects"
msgstr "Splits op naar objecten"
-#: src/slic3r/GUI/Plater.cpp:3084
+#: src/slic3r/GUI/Plater.cpp:3163
msgid "Invalid data"
msgstr "Ongeldige data"
-#: src/slic3r/GUI/Plater.cpp:3093
+#: src/slic3r/GUI/Plater.cpp:3172
msgid "Ready to slice"
msgstr "Klaar om te slicen"
-#: src/slic3r/GUI/Plater.cpp:3131 src/slic3r/GUI/PrintHostDialogs.cpp:232
+#: src/slic3r/GUI/Plater.cpp:3210 src/slic3r/GUI/PrintHostDialogs.cpp:232
msgid "Cancelling"
msgstr "Annuleren"
-#: src/slic3r/GUI/Plater.cpp:3148
+#: src/slic3r/GUI/Plater.cpp:3227
msgid "Another export job is currently running."
msgstr "Een andere export loopt op dit moment."
-#: src/slic3r/GUI/Plater.cpp:3264
+#: src/slic3r/GUI/Plater.cpp:3343
msgid "Please select the file to reload"
msgstr "Selecteer het bestand om te herladen"
-#: src/slic3r/GUI/Plater.cpp:3299
+#: src/slic3r/GUI/Plater.cpp:3378
msgid "It is not allowed to change the file to reload"
msgstr "Het is niet toegestaan om het te laden bestand te wijzigen"
-#: src/slic3r/GUI/Plater.cpp:3299
+#: src/slic3r/GUI/Plater.cpp:3378
msgid "Do you want to retry"
msgstr "Wilt u dit opnieuw proberen"
-#: src/slic3r/GUI/Plater.cpp:3317
-msgid "Reload from: "
-msgstr "Herlaad van: "
+#: src/slic3r/GUI/Plater.cpp:3396
+msgid "Reload from:"
+msgstr "Herladen van:"
-#: src/slic3r/GUI/Plater.cpp:3406
+#: src/slic3r/GUI/Plater.cpp:3485
msgid "Unable to reload:"
msgstr "Niet in staat om te herladen:"
-#: src/slic3r/GUI/Plater.cpp:3411
+#: src/slic3r/GUI/Plater.cpp:3490
msgid "Error during reload"
msgstr "Fout tijdens herladen"
-#: src/slic3r/GUI/Plater.cpp:3430
+#: src/slic3r/GUI/Plater.cpp:3509
msgid "Reload all from disk"
msgstr "Herlaad alles van schijf"
-#: src/slic3r/GUI/Plater.cpp:3451
+#: src/slic3r/GUI/Plater.cpp:3530
msgid "Fix Throught NetFabb"
msgstr "Repareer met NetFabb"
-#: src/slic3r/GUI/Plater.cpp:3642
+#: src/slic3r/GUI/Plater.cpp:3721
msgid "Export failed"
msgstr "Exporteren mislukt"
-#: src/slic3r/GUI/Plater.cpp:3647 src/slic3r/GUI/PrintHostDialogs.cpp:233
+#: src/slic3r/GUI/Plater.cpp:3726 src/slic3r/GUI/PrintHostDialogs.cpp:233
msgid "Cancelled"
msgstr "Geannuleerd"
-#: src/slic3r/GUI/Plater.cpp:3909 src/slic3r/GUI/Plater.cpp:3931
+#: src/slic3r/GUI/Plater.cpp:3983 src/slic3r/GUI/Plater.cpp:4005
msgid "Remove the selected object"
msgstr "Verwijder het geselecteerde object"
-#: src/slic3r/GUI/Plater.cpp:3918
+#: src/slic3r/GUI/Plater.cpp:3992
msgid "Add one more instance of the selected object"
msgstr "Voeg een instantie van het geselecteerde object toe"
-#: src/slic3r/GUI/Plater.cpp:3920
+#: src/slic3r/GUI/Plater.cpp:3994
msgid "Remove one instance of the selected object"
msgstr "Verwijder een instantie van het geselecteerde object"
-#: src/slic3r/GUI/Plater.cpp:3922
+#: src/slic3r/GUI/Plater.cpp:3996
msgid "Set number of instances"
msgstr "Stel aantal instanties in"
-#: src/slic3r/GUI/Plater.cpp:3922
+#: src/slic3r/GUI/Plater.cpp:3996
msgid "Change the number of instances of the selected object"
msgstr "Wijzig het aantal instanties van het geselecteerde object"
-#: src/slic3r/GUI/Plater.cpp:3941
+#: src/slic3r/GUI/Plater.cpp:4015
msgid "Reload the selected object from disk"
msgstr "Herlaad het geselecteerde object van de schijf"
-#: src/slic3r/GUI/Plater.cpp:3944
+#: src/slic3r/GUI/Plater.cpp:4018
msgid "Export the selected object as STL file"
msgstr "Exporteer de geselecteerde objecten als STL-bestand"
-#: src/slic3r/GUI/Plater.cpp:3973
+#: src/slic3r/GUI/Plater.cpp:4047
msgid "Along X axis"
msgstr "Over de X-as"
-#: src/slic3r/GUI/Plater.cpp:3973
+#: src/slic3r/GUI/Plater.cpp:4047
msgid "Mirror the selected object along the X axis"
msgstr "Spiegel het geselecteerde object over de X-as"
-#: src/slic3r/GUI/Plater.cpp:3975
+#: src/slic3r/GUI/Plater.cpp:4049
msgid "Along Y axis"
msgstr "Over de Y-as"
-#: src/slic3r/GUI/Plater.cpp:3975
+#: src/slic3r/GUI/Plater.cpp:4049
msgid "Mirror the selected object along the Y axis"
msgstr "Spiegel het geselecteerde object over de Y-as"
-#: src/slic3r/GUI/Plater.cpp:3977
+#: src/slic3r/GUI/Plater.cpp:4051
msgid "Along Z axis"
msgstr "Over de Z-as"
-#: src/slic3r/GUI/Plater.cpp:3977
+#: src/slic3r/GUI/Plater.cpp:4051
msgid "Mirror the selected object along the Z axis"
msgstr "Spiegel het geselecteerde object over de Z-as"
-#: src/slic3r/GUI/Plater.cpp:3980
+#: src/slic3r/GUI/Plater.cpp:4054
msgid "Mirror"
msgstr "Spiegelen"
-#: src/slic3r/GUI/Plater.cpp:3980
+#: src/slic3r/GUI/Plater.cpp:4054
msgid "Mirror the selected object"
msgstr "Spiegel het geselecteerde object"
-#: src/slic3r/GUI/Plater.cpp:3992
+#: src/slic3r/GUI/Plater.cpp:4066
msgid "To objects"
msgstr "Aan objecten"
-#: src/slic3r/GUI/Plater.cpp:3992 src/slic3r/GUI/Plater.cpp:4012
+#: src/slic3r/GUI/Plater.cpp:4066 src/slic3r/GUI/Plater.cpp:4086
msgid "Split the selected object into individual objects"
msgstr "Verdeel het geselecteerde object in individuele objecten"
-#: src/slic3r/GUI/Plater.cpp:3994
+#: src/slic3r/GUI/Plater.cpp:4068
msgid "To parts"
msgstr "Aan onderdelen"
-#: src/slic3r/GUI/Plater.cpp:3994 src/slic3r/GUI/Plater.cpp:4026
+#: src/slic3r/GUI/Plater.cpp:4068 src/slic3r/GUI/Plater.cpp:4100
msgid "Split the selected object into individual sub-parts"
msgstr "Deel het geselecteerde object op in meerdere subonderdelen"
-#: src/slic3r/GUI/Plater.cpp:3997 src/slic3r/GUI/Plater.cpp:4012
-#: src/slic3r/GUI/Plater.cpp:4026 src/libslic3r/PrintConfig.cpp:3471
+#: src/slic3r/GUI/Plater.cpp:4071 src/slic3r/GUI/Plater.cpp:4086
+#: src/slic3r/GUI/Plater.cpp:4100 src/libslic3r/PrintConfig.cpp:3481
msgid "Split"
msgstr "Verdeel"
-#: src/slic3r/GUI/Plater.cpp:3997
+#: src/slic3r/GUI/Plater.cpp:4071
msgid "Split the selected object"
msgstr "Verdeel het geselecteerde object"
-#: src/slic3r/GUI/Plater.cpp:4018
+#: src/slic3r/GUI/Plater.cpp:4092
msgid "Optimize orientation"
msgstr "Optimaliseer oriëntatie"
-#: src/slic3r/GUI/Plater.cpp:4018
+#: src/slic3r/GUI/Plater.cpp:4092
msgid "Optimize the rotation of the object for better print results."
msgstr "Optimaliseer de rotatie van het object voor betere printresultaten."
-#: src/slic3r/GUI/Plater.cpp:4075
+#: src/slic3r/GUI/Plater.cpp:4149
msgid "3D editor view"
msgstr "3D bewerkingsweergave"
-#: src/slic3r/GUI/Plater.cpp:4378
+#: src/slic3r/GUI/Plater.cpp:4456
msgid ""
"%1% printer was active at the time the target Undo / Redo snapshot was "
"taken. Switching to %1% printer requires reloading of %1% presets."
@@ -4630,100 +4702,108 @@ msgstr ""
"doen'-snapshot werd genomen. Schakelen naar %1% printer vereist herladen van "
"%1% presets."
-#: src/slic3r/GUI/Plater.cpp:4553
+#: src/slic3r/GUI/Plater.cpp:4631
msgid "Load Project"
msgstr "Laad project"
-#: src/slic3r/GUI/Plater.cpp:4581
+#: src/slic3r/GUI/Plater.cpp:4659
msgid "Import Object"
msgstr "Importeer object"
-#: src/slic3r/GUI/Plater.cpp:4585
+#: src/slic3r/GUI/Plater.cpp:4663
msgid "Import Objects"
msgstr "Importeer objecten"
-#: src/slic3r/GUI/Plater.cpp:4647
+#: src/slic3r/GUI/Plater.cpp:4725
msgid "All objects will be removed, continue?"
msgstr "Alle objecten worden verwijderd. Doorgaan?"
-#: src/slic3r/GUI/Plater.cpp:4655
+#: src/slic3r/GUI/Plater.cpp:4733
msgid "Delete Selected Objects"
msgstr "Verwijder geselecteerde objecten"
-#: src/slic3r/GUI/Plater.cpp:4663
+#: src/slic3r/GUI/Plater.cpp:4741
msgid "Increase Instances"
msgstr "Verhoog aantal instanties"
-#: src/slic3r/GUI/Plater.cpp:4698
+#: src/slic3r/GUI/Plater.cpp:4776
msgid "Decrease Instances"
msgstr "Verlaag aantal instanties"
-#: src/slic3r/GUI/Plater.cpp:4734
+#: src/slic3r/GUI/Plater.cpp:4807
+msgid "Enter the number of copies:"
+msgstr "Voer het aantal kopieën in:"
+
+#: src/slic3r/GUI/Plater.cpp:4808
+msgid "Copies of the selected object"
+msgstr "Kopieën van het geselecteerde object"
+
+#: src/slic3r/GUI/Plater.cpp:4812
#, c-format
msgid "Set numbers of copies to %d"
msgstr "Stel aantal kopieën in voor %d"
-#: src/slic3r/GUI/Plater.cpp:4764
+#: src/slic3r/GUI/Plater.cpp:4842
msgid "Cut by Plane"
msgstr "Snij met behulp van vlak"
-#: src/slic3r/GUI/Plater.cpp:4817
+#: src/slic3r/GUI/Plater.cpp:4893
msgid "Save G-code file as:"
msgstr "gcode-bestand opslaan als:"
-#: src/slic3r/GUI/Plater.cpp:4817
+#: src/slic3r/GUI/Plater.cpp:4893
msgid "Save SL1 file as:"
msgstr "SL1-bestand opslaan als:"
-#: src/slic3r/GUI/Plater.cpp:4963
+#: src/slic3r/GUI/Plater.cpp:5028
#, c-format
msgid "STL file exported to %s"
msgstr "STL-bestand geëxporteerd naar %s"
-#: src/slic3r/GUI/Plater.cpp:4980
+#: src/slic3r/GUI/Plater.cpp:5045
#, c-format
msgid "AMF file exported to %s"
msgstr "AMF-bestand geëxporteerd naar %s"
-#: src/slic3r/GUI/Plater.cpp:4983
+#: src/slic3r/GUI/Plater.cpp:5048
#, c-format
msgid "Error exporting AMF file %s"
msgstr "Fout bij het exporteren van AMF-bestand %s"
-#: src/slic3r/GUI/Plater.cpp:5016
+#: src/slic3r/GUI/Plater.cpp:5081
#, c-format
msgid "3MF file exported to %s"
msgstr "3MF-bestand geëxporteerd naar %s"
-#: src/slic3r/GUI/Plater.cpp:5021
+#: src/slic3r/GUI/Plater.cpp:5086
#, c-format
msgid "Error exporting 3MF file %s"
msgstr "Fout bij het exporteren van 3MF-bestand %s"
-#: src/slic3r/GUI/Plater.cpp:5496
+#: src/slic3r/GUI/Plater.cpp:5546
msgid "Export"
msgstr "Exporteer"
-#: src/slic3r/GUI/Plater.cpp:5581
+#: src/slic3r/GUI/Plater.cpp:5632
msgid "Paste From Clipboard"
msgstr "Plak van klembord"
-#: src/slic3r/GUI/Preferences.cpp:22 src/slic3r/GUI/Tab.cpp:1798
-#: src/slic3r/GUI/Tab.cpp:2042
+#: src/slic3r/GUI/Preferences.cpp:22 src/slic3r/GUI/Tab.cpp:1846
+#: src/slic3r/GUI/Tab.cpp:2058
msgid "General"
msgstr "Algemeen"
#: src/slic3r/GUI/Preferences.cpp:39
msgid "Remember output directory"
-msgstr "Onthoud de outputmap"
+msgstr "Onthoud de opslaglocatie"
#: src/slic3r/GUI/Preferences.cpp:41
msgid ""
"If this is enabled, Slic3r will prompt the last output directory instead of "
"the one containing the input files."
msgstr ""
-"Als dit is ingeschakeld zal PrusaSlicer de laatst gebruikte exportmap "
-"gebruiken in plaats van de importmap."
+"Als dit aan staat zal PrusaSlicer de opslaglocatie gebruiken in plaats van "
+"de originele locatie."
#: src/slic3r/GUI/Preferences.cpp:47
msgid "Auto-center parts"
@@ -4734,19 +4814,20 @@ msgid ""
"If this is enabled, Slic3r will auto-center objects around the print bed "
"center."
msgstr ""
-"Als dit is ingeschakeld zal PrusaSlicer objecten rondom het midden centreren."
+"Als dit aan staat zal PrusaSlicer objecten automatisch centreren rond het "
+"midden."
#: src/slic3r/GUI/Preferences.cpp:55
msgid "Background processing"
-msgstr "Achtergrondverwerking"
+msgstr "Slicen op de achtergrond"
#: src/slic3r/GUI/Preferences.cpp:57
msgid ""
"If this is enabled, Slic3r will pre-process objects as soon as they're "
"loaded in order to save time when exporting G-code."
msgstr ""
-"Als dit is ingeschakeld zal PrusaSlicer objecten voorbewerken zodra deze "
-"zijn geladen om tijd te besparen bij het exporteren van de G-code."
+"Als dit aanstaat zal PrusaSlicer objecten op de achtergrond slicen om tijd "
+"te besparen bij het exporteren van de G-code."
#: src/slic3r/GUI/Preferences.cpp:66
msgid ""
@@ -4755,10 +4836,10 @@ msgid ""
"application startup (never during program usage). This is only a "
"notification mechanisms, no automatic installation is done."
msgstr ""
-"Als dit is ingeschakeld zal PrusaSlicer zelf controleren op nieuwe versies. "
-"Als een nieuwe versie beschikbaar is, wordt een melding weergegeven bij de "
-"volgende keer opstarten. Dit is slechts een melding; er wordt niets "
-"automatisch geïnstalleerd."
+"Als dit aanstaat zal PrusaSlicer zelf controleren op nieuwe versies. Als een "
+"nieuwe versie beschikbaar is, wordt een melding weergegeven bij de volgende "
+"keer opstarten. Dit is slechts een melding; er wordt niets automatisch "
+"geïnstalleerd."
#: src/slic3r/GUI/Preferences.cpp:72
msgid "Export sources full pathnames to 3mf and amf"
@@ -4786,15 +4867,15 @@ msgstr ""
#: src/slic3r/GUI/Preferences.cpp:87
msgid "Suppress \" - default - \" presets"
-msgstr "Verberg 'standaard'-presets"
+msgstr "Verberg standaardpresets"
#: src/slic3r/GUI/Preferences.cpp:89
msgid ""
"Suppress \" - default - \" presets in the Print / Filament / Printer "
"selections once there are any other valid presets available."
msgstr ""
-"Verberg 'standaard'-presets in de print-, filament- en printerselecties als "
-"er andere geldige presets beschikbaar zijn."
+"Verberg standaardpresets bij de print-, filament- en printerpresets als er "
+"andere geldige presets beschikbaar zijn."
#: src/slic3r/GUI/Preferences.cpp:95
msgid "Show incompatible print and filament presets"
@@ -4852,12 +4933,12 @@ msgstr "GUI"
#: src/slic3r/GUI/Preferences.cpp:143
msgid "Use custom size for toolbar icons"
-msgstr "Gebruik een aangepaste grootte voor werkbalkpictogrammen"
+msgstr "Aangepaste pictogramgrootte in de 3D-weergave"
#: src/slic3r/GUI/Preferences.cpp:145
msgid "If enabled, you can change size of toolbar icons manually."
msgstr ""
-"Grootte van werkbalkpictogrammen handmatig instellen als dit is ingeschakeld."
+"Hiermee kan de grootte van werkbalkpictogrammen handmatig ingesteld worden."
#: src/slic3r/GUI/Preferences.cpp:172
#, c-format
@@ -4876,34 +4957,34 @@ msgstr "Selecteer werkbalk-pictogramgrootte in verhouding tot de originele."
msgid "modified"
msgstr "aangepast"
-#: src/slic3r/GUI/Preset.cpp:1107 src/slic3r/GUI/Preset.cpp:1162
-#: src/slic3r/GUI/Preset.cpp:1240 src/slic3r/GUI/Preset.cpp:1282
-#: src/slic3r/GUI/PresetBundle.cpp:1576 src/slic3r/GUI/PresetBundle.cpp:1665
+#: src/slic3r/GUI/Preset.cpp:1139 src/slic3r/GUI/Preset.cpp:1194
+#: src/slic3r/GUI/Preset.cpp:1272 src/slic3r/GUI/Preset.cpp:1314
+#: src/slic3r/GUI/PresetBundle.cpp:1591 src/slic3r/GUI/PresetBundle.cpp:1689
msgid "System presets"
msgstr "Systeempresets"
-#: src/slic3r/GUI/Preset.cpp:1166 src/slic3r/GUI/Preset.cpp:1286
-#: src/slic3r/GUI/PresetBundle.cpp:1670
+#: src/slic3r/GUI/Preset.cpp:1198 src/slic3r/GUI/Preset.cpp:1318
+#: src/slic3r/GUI/PresetBundle.cpp:1694
msgid "User presets"
msgstr "Presets van de gebruiker"
-#: src/slic3r/GUI/Preset.cpp:1199
+#: src/slic3r/GUI/Preset.cpp:1231
msgid "Add/Remove materials"
msgstr "Verwijder of voeg materialen toe"
-#: src/slic3r/GUI/Preset.cpp:1201
+#: src/slic3r/GUI/Preset.cpp:1233
msgid "Add/Remove printers"
msgstr "Voeg toe/verwijder printers"
-#: src/slic3r/GUI/Preset.cpp:1520
+#: src/slic3r/GUI/Preset.cpp:1552
msgid "filament"
msgstr "filament"
-#: src/slic3r/GUI/Preset.cpp:1521
+#: src/slic3r/GUI/Preset.cpp:1553
msgid "SLA print"
msgstr "SLA-print"
-#: src/slic3r/GUI/PresetBundle.cpp:1697
+#: src/slic3r/GUI/PresetBundle.cpp:1721
msgid "Add/Remove filaments"
msgstr "Verwijder of voeg filamenten toe"
@@ -4915,7 +4996,7 @@ msgid ""
msgstr ""
"Als de geschatte laagtijd onder de ~%1%s komt, zal de ventilator draaien op "
"%2%%% en de printsnelheid wordt zover gereduceerd dat niet meer dan %3%s "
-"worden gebruikt op die laag (echter nooit langzamer dan %4%mm/s)."
+"worden gebruikt voor die laag (echter nooit langzamer dan %4%mm/s)."
#: src/slic3r/GUI/PresetHints.cpp:36
msgid ""
@@ -4928,15 +5009,15 @@ msgstr ""
#: src/slic3r/GUI/PresetHints.cpp:40
msgid "During the other layers, fan"
-msgstr "Tijdens de overige lagen, ventilator"
+msgstr "Tijdens de overige lagen zal de ventilator"
#: src/slic3r/GUI/PresetHints.cpp:42
msgid "Fan"
-msgstr "Ventilator"
+msgstr "De ventilator zal"
#: src/slic3r/GUI/PresetHints.cpp:48
msgid "will always run at %1%%%"
-msgstr "zal altijd draaien op %1%%%"
+msgstr "altijd draaien op %1%%%"
#: src/slic3r/GUI/PresetHints.cpp:51
msgid "except for the first %1% layers."
@@ -5044,11 +5125,11 @@ msgstr ""
#: src/slic3r/GUI/PresetHints.cpp:317
msgid "Top shell is %1% mm thick for layer height %2% mm."
-msgstr "Topshell is %1% mm dik bij een laagdikte van %2% mm."
+msgstr "Topzijde is %1% mm dik bij een laagdikte van %2% mm."
#: src/slic3r/GUI/PresetHints.cpp:320
msgid "Minimum top shell thickness is %1% mm."
-msgstr "Minimale topshelldikte is %1% mm."
+msgstr "Minimale dikte van de bovenzijde is %1% mm."
#: src/slic3r/GUI/PresetHints.cpp:323
msgid "Top is open."
@@ -5056,11 +5137,11 @@ msgstr "Bovenzijde is open."
#: src/slic3r/GUI/PresetHints.cpp:336
msgid "Bottom shell is %1% mm thick for layer height %2% mm."
-msgstr "Bodemshell is %1% mm dik bij een laagdikte van %2% mm."
+msgstr "Bodemzijde is %1% mm dik bij een laagdikte van %2% mm."
#: src/slic3r/GUI/PresetHints.cpp:339
msgid "Minimum bottom shell thickness is %1% mm."
-msgstr "Minimale bodemshelldikte is %1% mm."
+msgstr "Minimale dikte van onderzijde is %1% mm."
#: src/slic3r/GUI/PresetHints.cpp:342
msgid "Bottom is open."
@@ -5159,47 +5240,47 @@ msgstr "Volumetrische snelheid"
msgid "mm³/s"
msgstr "mm³/s"
-#: src/slic3r/GUI/Selection.cpp:146
+#: src/slic3r/GUI/Selection.cpp:147
msgid "Selection-Add"
msgstr "Selectie - Voeg toe"
-#: src/slic3r/GUI/Selection.cpp:187
+#: src/slic3r/GUI/Selection.cpp:188
msgid "Selection-Remove"
msgstr "Selectie - Verwijder"
-#: src/slic3r/GUI/Selection.cpp:219
+#: src/slic3r/GUI/Selection.cpp:220
msgid "Selection-Add Object"
msgstr "Selectie - Voeg object toe"
-#: src/slic3r/GUI/Selection.cpp:238
+#: src/slic3r/GUI/Selection.cpp:239
msgid "Selection-Remove Object"
msgstr "Selectie - Verwijder object"
-#: src/slic3r/GUI/Selection.cpp:256
+#: src/slic3r/GUI/Selection.cpp:257
msgid "Selection-Add Instance"
msgstr "Selectie - Voeg instantie toe"
-#: src/slic3r/GUI/Selection.cpp:275
+#: src/slic3r/GUI/Selection.cpp:276
msgid "Selection-Remove Instance"
msgstr "Selectie - Verwijder instantie"
-#: src/slic3r/GUI/Selection.cpp:376
+#: src/slic3r/GUI/Selection.cpp:377
msgid "Selection-Add All"
msgstr "Selectie - Voeg alle toe"
-#: src/slic3r/GUI/Selection.cpp:402
+#: src/slic3r/GUI/Selection.cpp:403
msgid "Selection-Remove All"
msgstr "Selectie - Verwijder alle"
-#: src/slic3r/GUI/Selection.cpp:939
+#: src/slic3r/GUI/Selection.cpp:940
msgid "Scale To Fit"
msgstr "Verschaal tot het past"
-#: src/slic3r/GUI/Selection.cpp:1475
+#: src/slic3r/GUI/Selection.cpp:1477
msgid "Set Printable Instance"
msgstr "Stel printbare instanties in"
-#: src/slic3r/GUI/Selection.cpp:1475
+#: src/slic3r/GUI/Selection.cpp:1477
msgid "Set Unprintable Instance"
msgstr "Stel instantie in op niet-printbaar"
@@ -5209,35 +5290,35 @@ msgstr "Systeeminformatie"
#: src/slic3r/GUI/SysInfoDialog.cpp:154
msgid "Copy to Clipboard"
-msgstr "Kopieer naar klembord"
+msgstr "Kopieer van klembord"
-#: src/slic3r/GUI/Tab.cpp:52 src/libslic3r/PrintConfig.cpp:265
+#: src/slic3r/GUI/Tab.cpp:50 src/libslic3r/PrintConfig.cpp:265
msgid "Compatible printers"
msgstr "Compatibele printers"
-#: src/slic3r/GUI/Tab.cpp:53
+#: src/slic3r/GUI/Tab.cpp:51
msgid "Select the printers this profile is compatible with."
msgstr "Selecteer de printers die compatibel met dit profiel zijn."
-#: src/slic3r/GUI/Tab.cpp:58 src/libslic3r/PrintConfig.cpp:280
+#: src/slic3r/GUI/Tab.cpp:56 src/libslic3r/PrintConfig.cpp:280
msgid "Compatible print profiles"
msgstr "Compatibele printprofielen"
-#: src/slic3r/GUI/Tab.cpp:59
+#: src/slic3r/GUI/Tab.cpp:57
msgid "Select the print profiles this profile is compatible with."
msgstr "Selecteer de printprofielen die compatibel met dit profiel zijn."
#. TRN "Save current Settings"
-#: src/slic3r/GUI/Tab.cpp:135
+#: src/slic3r/GUI/Tab.cpp:133
#, c-format
msgid "Save current %s"
msgstr "Huidige %s opslaan"
-#: src/slic3r/GUI/Tab.cpp:136
+#: src/slic3r/GUI/Tab.cpp:134
msgid "Delete this preset"
msgstr "Verwijder preset"
-#: src/slic3r/GUI/Tab.cpp:141
+#: src/slic3r/GUI/Tab.cpp:139
msgid ""
"Hover the cursor over buttons to find more information \n"
"or click this button."
@@ -5245,287 +5326,315 @@ msgstr ""
"Beweeg de cursor over de knoppen voor meer informatie\n"
"of klik op deze knop."
-#: src/slic3r/GUI/Tab.cpp:243
+#: src/slic3r/GUI/Tab.cpp:241
msgid "Add a new printer"
msgstr "Voeg een nieuwe printer toe"
-#: src/slic3r/GUI/Tab.cpp:955
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Ontkoppel van systeempreset"
+
+#: src/slic3r/GUI/Tab.cpp:975
+msgid ""
+"A copy of the current system preset will be created, which will be detached "
+"from the system preset."
+msgstr ""
+"Een kopie van de huidige systeempreset wordt aangemaakt. Deze wordt "
+"ontkoppeld van het origineel."
+
+#: src/slic3r/GUI/Tab.cpp:976
+msgid ""
+"The current custom preset will be detached from the parent system preset."
+msgstr "De huidige custom preset wordt ontkoppeld van de originele preset."
+
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Aanpassingen aan het huidige profiel worden opgeslagen."
+
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+"Deze actie kan niet ongedaan gemaakt worden.\n"
+"Weet u zeker dat u wilt doorgaan?"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Ontkoppel preset"
+
+#: src/slic3r/GUI/Tab.cpp:1010
msgid "This is a default preset."
msgstr "Dit is een standaard preset."
-#: src/slic3r/GUI/Tab.cpp:957
+#: src/slic3r/GUI/Tab.cpp:1012
msgid "This is a system preset."
msgstr "Dit is een systeempreset."
-#: src/slic3r/GUI/Tab.cpp:959
+#: src/slic3r/GUI/Tab.cpp:1014
msgid "Current preset is inherited from the default preset."
msgstr "Huidige preset is gebaseerd op de standaard preset."
-#: src/slic3r/GUI/Tab.cpp:962
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Huidige preset is gebaseerd op:\n"
-"\t%s"
+#: src/slic3r/GUI/Tab.cpp:1016
+msgid "Current preset is inherited from"
+msgstr "Huidige preset is afgeleid van"
-#: src/slic3r/GUI/Tab.cpp:966
+#: src/slic3r/GUI/Tab.cpp:1020
msgid "It can't be deleted or modified."
msgstr "Kan niet verwijderd of aangepast worden."
-#: src/slic3r/GUI/Tab.cpp:967
+#: src/slic3r/GUI/Tab.cpp:1021
msgid ""
"Any modifications should be saved as a new preset inherited from this one."
msgstr ""
"Eventuele wijzigingen moet worden opgeslagen als een nieuwe preset die is "
"gebaseerd op de huidige."
-#: src/slic3r/GUI/Tab.cpp:968
+#: src/slic3r/GUI/Tab.cpp:1022
msgid "To do that please specify a new name for the preset."
msgstr "Geef daarvoor een nieuwe naam aan de preset."
-#: src/slic3r/GUI/Tab.cpp:972
+#: src/slic3r/GUI/Tab.cpp:1026
msgid "Additional information:"
msgstr "Additionele informatie:"
-#: src/slic3r/GUI/Tab.cpp:978
+#: src/slic3r/GUI/Tab.cpp:1032
msgid "printer model"
msgstr "printermodel"
-#: src/slic3r/GUI/Tab.cpp:986
+#: src/slic3r/GUI/Tab.cpp:1040
msgid "default print profile"
msgstr "standaard printprofiel"
-#: src/slic3r/GUI/Tab.cpp:989
+#: src/slic3r/GUI/Tab.cpp:1043
msgid "default filament profile"
msgstr "standaard filamentprofiel"
-#: src/slic3r/GUI/Tab.cpp:1003
+#: src/slic3r/GUI/Tab.cpp:1057
msgid "default SLA material profile"
msgstr "standaard SLA-materiaalprofiel"
-#: src/slic3r/GUI/Tab.cpp:1007
+#: src/slic3r/GUI/Tab.cpp:1061
msgid "default SLA print profile"
msgstr "standaard SLA-printprofiel"
-#: src/slic3r/GUI/Tab.cpp:1015
+#: src/slic3r/GUI/Tab.cpp:1069
msgid "full profile name"
msgstr "volledige profielnaam"
-#: src/slic3r/GUI/Tab.cpp:1016
+#: src/slic3r/GUI/Tab.cpp:1070
msgid "symbolic profile name"
msgstr "symbolische profielnaam"
-#: src/slic3r/GUI/Tab.cpp:1050 src/slic3r/GUI/Tab.cpp:3588
+#: src/slic3r/GUI/Tab.cpp:1108 src/slic3r/GUI/Tab.cpp:3654
msgid "Layers and perimeters"
msgstr "Lagen en perimeters"
-#: src/slic3r/GUI/Tab.cpp:1055
+#: src/slic3r/GUI/Tab.cpp:1113
msgid "Vertical shells"
msgstr "Verticale shells"
-#: src/slic3r/GUI/Tab.cpp:1066
+#: src/slic3r/GUI/Tab.cpp:1124
msgid "Horizontal shells"
msgstr "Horizontale shells"
-#: src/slic3r/GUI/Tab.cpp:1067 src/libslic3r/PrintConfig.cpp:1780
+#: src/slic3r/GUI/Tab.cpp:1125 src/libslic3r/PrintConfig.cpp:1780
msgid "Solid layers"
msgstr "Dichte lagen"
-#: src/slic3r/GUI/Tab.cpp:1071
+#: src/slic3r/GUI/Tab.cpp:1129
msgid "Minimum shell thickness"
msgstr "Minimale shelldikte"
-#: src/slic3r/GUI/Tab.cpp:1082
+#: src/slic3r/GUI/Tab.cpp:1140
msgid "Quality (slower slicing)"
msgstr "Kwaliteit (slicen kan langer duren)"
-#: src/slic3r/GUI/Tab.cpp:1100
+#: src/slic3r/GUI/Tab.cpp:1158
msgid "Reducing printing time"
msgstr "Printtijd verkorten"
-#: src/slic3r/GUI/Tab.cpp:1112
+#: src/slic3r/GUI/Tab.cpp:1170
msgid "Skirt and brim"
msgstr "Skirt en brim"
-#: src/slic3r/GUI/Tab.cpp:1129
+#: src/slic3r/GUI/Tab.cpp:1187
msgid "Raft"
msgstr "Raft"
-#: src/slic3r/GUI/Tab.cpp:1133
+#: src/slic3r/GUI/Tab.cpp:1191
msgid "Options for support material and raft"
msgstr "Opties voor support en raft"
-#: src/slic3r/GUI/Tab.cpp:1148
+#: src/slic3r/GUI/Tab.cpp:1206
msgid "Speed for print moves"
msgstr "Snelheid voor printbewegingen"
-#: src/slic3r/GUI/Tab.cpp:1160
+#: src/slic3r/GUI/Tab.cpp:1218
msgid "Speed for non-print moves"
msgstr "Snelheid voor niet-print bewegingen"
-#: src/slic3r/GUI/Tab.cpp:1163
+#: src/slic3r/GUI/Tab.cpp:1221
msgid "Modifiers"
msgstr "Modificators"
-#: src/slic3r/GUI/Tab.cpp:1166
+#: src/slic3r/GUI/Tab.cpp:1224
msgid "Acceleration control (advanced)"
msgstr "Acceleraties (geavanceerd)"
-#: src/slic3r/GUI/Tab.cpp:1173
+#: src/slic3r/GUI/Tab.cpp:1231
msgid "Autospeed (advanced)"
msgstr "Automatische snelheid (geavanceerd)"
-#: src/slic3r/GUI/Tab.cpp:1181
+#: src/slic3r/GUI/Tab.cpp:1239
msgid "Multiple Extruders"
msgstr "Meerdere extruders"
-#: src/slic3r/GUI/Tab.cpp:1189
+#: src/slic3r/GUI/Tab.cpp:1247
msgid "Ooze prevention"
msgstr "Druippreventie"
-#: src/slic3r/GUI/Tab.cpp:1207
+#: src/slic3r/GUI/Tab.cpp:1265
msgid "Extrusion width"
msgstr "Extrusiebreedte"
-#: src/slic3r/GUI/Tab.cpp:1217
+#: src/slic3r/GUI/Tab.cpp:1275
msgid "Overlap"
msgstr "Overlapping"
-#: src/slic3r/GUI/Tab.cpp:1220
+#: src/slic3r/GUI/Tab.cpp:1278
msgid "Flow"
msgstr "Stroom"
-#: src/slic3r/GUI/Tab.cpp:1229
+#: src/slic3r/GUI/Tab.cpp:1287
msgid "Other"
msgstr "Overige"
-#: src/slic3r/GUI/Tab.cpp:1232 src/slic3r/GUI/Tab.cpp:3655
+#: src/slic3r/GUI/Tab.cpp:1290 src/slic3r/GUI/Tab.cpp:3723
msgid "Output options"
msgstr "Output-opties"
-#: src/slic3r/GUI/Tab.cpp:1233
+#: src/slic3r/GUI/Tab.cpp:1291
msgid "Sequential printing"
msgstr "Achtereenvolgens printen"
-#: src/slic3r/GUI/Tab.cpp:1235
+#: src/slic3r/GUI/Tab.cpp:1293
msgid "Extruder clearance (mm)"
msgstr "Extruderruimte (mm)"
-#: src/slic3r/GUI/Tab.cpp:1240 src/slic3r/GUI/Tab.cpp:3656
+#: src/slic3r/GUI/Tab.cpp:1298 src/slic3r/GUI/Tab.cpp:3724
msgid "Output file"
msgstr "Outputbestand"
-#: src/slic3r/GUI/Tab.cpp:1247 src/libslic3r/PrintConfig.cpp:1453
+#: src/slic3r/GUI/Tab.cpp:1305 src/libslic3r/PrintConfig.cpp:1453
msgid "Post-processing scripts"
msgstr "Scripts voor nabewerking"
-#: src/slic3r/GUI/Tab.cpp:1253 src/slic3r/GUI/Tab.cpp:1254
-#: src/slic3r/GUI/Tab.cpp:1542 src/slic3r/GUI/Tab.cpp:1543
-#: src/slic3r/GUI/Tab.cpp:2014 src/slic3r/GUI/Tab.cpp:2015
-#: src/slic3r/GUI/Tab.cpp:2130 src/slic3r/GUI/Tab.cpp:2131
-#: src/slic3r/GUI/Tab.cpp:3525 src/slic3r/GUI/Tab.cpp:3526
+#: src/slic3r/GUI/Tab.cpp:1311 src/slic3r/GUI/Tab.cpp:1312
+#: src/slic3r/GUI/Tab.cpp:1595 src/slic3r/GUI/Tab.cpp:1596
+#: src/slic3r/GUI/Tab.cpp:2034 src/slic3r/GUI/Tab.cpp:2035
+#: src/slic3r/GUI/Tab.cpp:2116 src/slic3r/GUI/Tab.cpp:2117
+#: src/slic3r/GUI/Tab.cpp:3597 src/slic3r/GUI/Tab.cpp:3598
msgid "Notes"
msgstr "Opmerkingen"
-#: src/slic3r/GUI/Tab.cpp:1260 src/slic3r/GUI/Tab.cpp:1550
-#: src/slic3r/GUI/Tab.cpp:2021 src/slic3r/GUI/Tab.cpp:2137
-#: src/slic3r/GUI/Tab.cpp:3533 src/slic3r/GUI/Tab.cpp:3661
+#: src/slic3r/GUI/Tab.cpp:1318 src/slic3r/GUI/Tab.cpp:1603
+#: src/slic3r/GUI/Tab.cpp:2041 src/slic3r/GUI/Tab.cpp:2123
+#: src/slic3r/GUI/Tab.cpp:3605 src/slic3r/GUI/Tab.cpp:3729
msgid "Dependencies"
msgstr "Afhankelijkheden"
-#: src/slic3r/GUI/Tab.cpp:1261 src/slic3r/GUI/Tab.cpp:1551
-#: src/slic3r/GUI/Tab.cpp:2022 src/slic3r/GUI/Tab.cpp:2138
-#: src/slic3r/GUI/Tab.cpp:3534 src/slic3r/GUI/Tab.cpp:3662
+#: src/slic3r/GUI/Tab.cpp:1319 src/slic3r/GUI/Tab.cpp:1604
+#: src/slic3r/GUI/Tab.cpp:2042 src/slic3r/GUI/Tab.cpp:2124
+#: src/slic3r/GUI/Tab.cpp:3606 src/slic3r/GUI/Tab.cpp:3730
msgid "Profile dependencies"
msgstr "Profielafhankelijkheden"
-#: src/slic3r/GUI/Tab.cpp:1325 src/slic3r/GUI/Tab.cpp:1380
+#: src/slic3r/GUI/Tab.cpp:1378 src/slic3r/GUI/Tab.cpp:1433
msgid "Filament Overrides"
msgstr "Overschrijven door filament"
-#: src/slic3r/GUI/Tab.cpp:1326 src/slic3r/GUI/Tab.cpp:1385
-#: src/slic3r/GUI/Tab.cpp:2372
+#: src/slic3r/GUI/Tab.cpp:1379 src/slic3r/GUI/Tab.cpp:1438
+#: src/slic3r/GUI/Tab.cpp:2354
msgid "Retraction"
msgstr "Retractie"
-#: src/slic3r/GUI/Tab.cpp:1435 src/libslic3r/PrintConfig.cpp:2067
+#: src/slic3r/GUI/Tab.cpp:1488 src/libslic3r/PrintConfig.cpp:2067
msgid "Temperature"
msgstr "Temperatuur"
-#: src/slic3r/GUI/Tab.cpp:1441
+#: src/slic3r/GUI/Tab.cpp:1494
msgid "Bed"
msgstr "Bed"
-#: src/slic3r/GUI/Tab.cpp:1446
+#: src/slic3r/GUI/Tab.cpp:1499
msgid "Cooling"
msgstr "Koeling"
-#: src/slic3r/GUI/Tab.cpp:1447 src/libslic3r/PrintConfig.cpp:1355
+#: src/slic3r/GUI/Tab.cpp:1500 src/libslic3r/PrintConfig.cpp:1355
#: src/libslic3r/PrintConfig.cpp:2200
msgid "Enable"
msgstr "Toestaan"
-#: src/slic3r/GUI/Tab.cpp:1458
+#: src/slic3r/GUI/Tab.cpp:1511
msgid "Fan settings"
msgstr "Ventilatorinstellingen"
-#: src/slic3r/GUI/Tab.cpp:1467
+#: src/slic3r/GUI/Tab.cpp:1520
msgid "Cooling thresholds"
msgstr "Koeldrempels"
-#: src/slic3r/GUI/Tab.cpp:1473
+#: src/slic3r/GUI/Tab.cpp:1526
msgid "Filament properties"
msgstr "Filamenteigenschappen"
-#: src/slic3r/GUI/Tab.cpp:1480
+#: src/slic3r/GUI/Tab.cpp:1533
msgid "Print speed override"
msgstr "Printsnelheid overschrijven"
-#: src/slic3r/GUI/Tab.cpp:1490
+#: src/slic3r/GUI/Tab.cpp:1543
msgid "Wipe tower parameters"
msgstr "Afveegblokparameters"
-#: src/slic3r/GUI/Tab.cpp:1493
+#: src/slic3r/GUI/Tab.cpp:1546
msgid "Toolchange parameters with single extruder MM printers"
msgstr "Toolwisselparameter voor multi-materialprinters met één extruder"
-#: src/slic3r/GUI/Tab.cpp:1507
+#: src/slic3r/GUI/Tab.cpp:1560
msgid "Ramming settings"
msgstr "Ramming-instellingen"
-#: src/slic3r/GUI/Tab.cpp:1529 src/slic3r/GUI/Tab.cpp:1977
+#: src/slic3r/GUI/Tab.cpp:1582 src/slic3r/GUI/Tab.cpp:1997
msgid "Custom G-code"
msgstr "Custom G-code"
-#: src/slic3r/GUI/Tab.cpp:1530 src/slic3r/GUI/Tab.cpp:1978
+#: src/slic3r/GUI/Tab.cpp:1583 src/slic3r/GUI/Tab.cpp:1998
#: src/libslic3r/PrintConfig.cpp:1813 src/libslic3r/PrintConfig.cpp:1828
msgid "Start G-code"
msgstr "Start G-code"
-#: src/slic3r/GUI/Tab.cpp:1536 src/slic3r/GUI/Tab.cpp:1984
+#: src/slic3r/GUI/Tab.cpp:1589 src/slic3r/GUI/Tab.cpp:2004
#: src/libslic3r/PrintConfig.cpp:385 src/libslic3r/PrintConfig.cpp:395
msgid "End G-code"
msgstr "Eind G-code"
-#: src/slic3r/GUI/Tab.cpp:1593
+#: src/slic3r/GUI/Tab.cpp:1638
msgid "Volumetric flow hints not available"
msgstr "Volumetrische stroom - opmerkingen niet beschikbaar"
-#: src/slic3r/GUI/Tab.cpp:1679 src/slic3r/GUI/Tab.cpp:1917
+#: src/slic3r/GUI/Tab.cpp:1724 src/slic3r/GUI/Tab.cpp:1937
msgid "Test"
msgstr "Test"
-#: src/slic3r/GUI/Tab.cpp:1689
+#: src/slic3r/GUI/Tab.cpp:1733
msgid "Could not get a valid Printer Host reference"
msgstr "Kan geen geldige printerhost-referentie krijgen"
-#: src/slic3r/GUI/Tab.cpp:1695 src/slic3r/GUI/Tab.cpp:1930
+#: src/slic3r/GUI/Tab.cpp:1739 src/slic3r/GUI/Tab.cpp:1950
msgid "Success!"
msgstr "Gelukt!"
-#: src/slic3r/GUI/Tab.cpp:1715
+#: src/slic3r/GUI/Tab.cpp:1759
msgid ""
"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
"signed certificate."
@@ -5533,47 +5642,48 @@ msgstr ""
"HTTPS-CA-bestand is optioneel. Het is alleen nodig als u werkt met een zelf "
"ondertekend certificaat."
-#: src/slic3r/GUI/Tab.cpp:1730
+#: src/slic3r/GUI/Tab.cpp:1774
msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
msgstr "Certificaatbestanden (*.crt, *.pem)|*.crt;*.pem|Alle betanden|*.*"
-#: src/slic3r/GUI/Tab.cpp:1731
+#: src/slic3r/GUI/Tab.cpp:1775
msgid "Open CA certificate file"
msgstr "Open een CA-certificaatbestand"
-#: src/slic3r/GUI/Tab.cpp:1759
+#: src/slic3r/GUI/Tab.cpp:1802 src/libslic3r/PrintConfig.cpp:111
+msgid "HTTPS CA File"
+msgstr "HTTPS-CA-bestand"
+
+#: src/slic3r/GUI/Tab.cpp:1803
#, c-format
msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
+"On this system, %s uses HTTPS certificates from the system Certificate Store "
+"or Keychain."
msgstr ""
-"HTTPS-CA-bestand:\n"
-" \t%s gebruikt op dit systeem HTTPS-certificaten van de Certificate Store "
-"of Keychain.\n"
-" \tOm een aangepast CA-bestand te gebruiken moet uw CA-bestand in de "
-"Certificate Store of Keychain geïmporteerd worden."
+"Op dit systeem gebruikt %s HTTPS-certificaten van de Certificate Store of "
+"Keychain."
-#: src/slic3r/GUI/Tab.cpp:1799 src/slic3r/GUI/Tab.cpp:2043
+#: src/slic3r/GUI/Tab.cpp:1804
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate Store / "
+"Keychain."
+msgstr ""
+"Importeer een CA-bestand in de Certificate Store of Keychain om deze te "
+"gebruiken."
+
+#: src/slic3r/GUI/Tab.cpp:1847 src/slic3r/GUI/Tab.cpp:2059
msgid "Size and coordinates"
msgstr "Grootte en coördinaten"
-#: src/slic3r/GUI/Tab.cpp:1804 src/slic3r/GUI/Tab.cpp:2048
-#: src/slic3r/GUI/Tab.cpp:3166
-msgid "Set"
-msgstr "Stel in"
-
-#: src/slic3r/GUI/Tab.cpp:1836
+#: src/slic3r/GUI/Tab.cpp:1856
msgid "Capabilities"
msgstr "Mogelijkheden"
-#: src/slic3r/GUI/Tab.cpp:1841
+#: src/slic3r/GUI/Tab.cpp:1861
msgid "Number of extruders of the printer."
msgstr "Aantal extruders van de printer."
-#: src/slic3r/GUI/Tab.cpp:1869
+#: src/slic3r/GUI/Tab.cpp:1889
msgid ""
"Single Extruder Multi Material is selected, \n"
"and all extruders must have the same diameter.\n"
@@ -5585,72 +5695,72 @@ msgstr ""
"Wilt u de diameters voor alle extruders aanpassen gelijk aan die van de "
"eerste extruder?"
-#: src/slic3r/GUI/Tab.cpp:1872 src/slic3r/GUI/Tab.cpp:2342
+#: src/slic3r/GUI/Tab.cpp:1892 src/slic3r/GUI/Tab.cpp:2324
#: src/libslic3r/PrintConfig.cpp:1326
msgid "Nozzle diameter"
msgstr "Nozzlediameter"
-#: src/slic3r/GUI/Tab.cpp:1902
+#: src/slic3r/GUI/Tab.cpp:1922
msgid "USB/Serial connection"
msgstr "USB/seriële verbinding"
-#: src/slic3r/GUI/Tab.cpp:1903 src/libslic3r/PrintConfig.cpp:1661
+#: src/slic3r/GUI/Tab.cpp:1923 src/libslic3r/PrintConfig.cpp:1661
msgid "Serial port"
msgstr "Seriële poort"
-#: src/slic3r/GUI/Tab.cpp:1908
+#: src/slic3r/GUI/Tab.cpp:1928
msgid "Rescan serial ports"
msgstr "Seriële poorten opnieuw scannen"
-#: src/slic3r/GUI/Tab.cpp:1930
+#: src/slic3r/GUI/Tab.cpp:1950
msgid "Connection to printer works correctly."
msgstr "Verbinding met de printer werkt naar behoren."
-#: src/slic3r/GUI/Tab.cpp:1933
+#: src/slic3r/GUI/Tab.cpp:1953
msgid "Connection failed."
msgstr "Verbinding mislukt."
-#: src/slic3r/GUI/Tab.cpp:1946 src/slic3r/GUI/Tab.cpp:2125
+#: src/slic3r/GUI/Tab.cpp:1966 src/slic3r/GUI/Tab.cpp:2111
msgid "Print Host upload"
msgstr "Printhost upload"
-#: src/slic3r/GUI/Tab.cpp:1990 src/libslic3r/PrintConfig.cpp:153
+#: src/slic3r/GUI/Tab.cpp:2010 src/libslic3r/PrintConfig.cpp:153
msgid "Before layer change G-code"
msgstr "G-code die komt vóór de laagwisseling"
-#: src/slic3r/GUI/Tab.cpp:1996 src/libslic3r/PrintConfig.cpp:1080
+#: src/slic3r/GUI/Tab.cpp:2016 src/libslic3r/PrintConfig.cpp:1080
msgid "After layer change G-code"
msgstr "G-code die komt na de laagwisseling"
-#: src/slic3r/GUI/Tab.cpp:2002 src/libslic3r/PrintConfig.cpp:2093
+#: src/slic3r/GUI/Tab.cpp:2022 src/libslic3r/PrintConfig.cpp:2093
msgid "Tool change G-code"
msgstr "Toolwisseling G-code"
-#: src/slic3r/GUI/Tab.cpp:2008
+#: src/slic3r/GUI/Tab.cpp:2028
msgid "Between objects G-code (for sequential printing)"
msgstr "G-code die komt tussen objecten (bij achtereenvolgens printen)"
-#: src/slic3r/GUI/Tab.cpp:2080
+#: src/slic3r/GUI/Tab.cpp:2066
msgid "Display"
msgstr "Scherm"
-#: src/slic3r/GUI/Tab.cpp:2095
+#: src/slic3r/GUI/Tab.cpp:2081
msgid "Tilt"
msgstr "Kanteling"
-#: src/slic3r/GUI/Tab.cpp:2096
+#: src/slic3r/GUI/Tab.cpp:2082
msgid "Tilt time"
msgstr "Kanteltijd"
-#: src/slic3r/GUI/Tab.cpp:2102 src/slic3r/GUI/Tab.cpp:3509
+#: src/slic3r/GUI/Tab.cpp:2088 src/slic3r/GUI/Tab.cpp:3581
msgid "Corrections"
msgstr "Correcties"
-#: src/slic3r/GUI/Tab.cpp:2119 src/slic3r/GUI/Tab.cpp:3505
+#: src/slic3r/GUI/Tab.cpp:2105 src/slic3r/GUI/Tab.cpp:3577
msgid "Exposure"
msgstr "Belichtingstijd"
-#: src/slic3r/GUI/Tab.cpp:2190 src/slic3r/GUI/Tab.cpp:2275
+#: src/slic3r/GUI/Tab.cpp:2172 src/slic3r/GUI/Tab.cpp:2257
#: src/libslic3r/PrintConfig.cpp:1129 src/libslic3r/PrintConfig.cpp:1146
#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1179
#: src/libslic3r/PrintConfig.cpp:1189 src/libslic3r/PrintConfig.cpp:1199
@@ -5658,47 +5768,47 @@ msgstr "Belichtingstijd"
msgid "Machine limits"
msgstr "Machinelimieten"
-#: src/slic3r/GUI/Tab.cpp:2204
+#: src/slic3r/GUI/Tab.cpp:2186
msgid "Values in this column are for Normal mode"
msgstr "Waarden in deze kolom zijn voor de normale modus"
-#: src/slic3r/GUI/Tab.cpp:2205
+#: src/slic3r/GUI/Tab.cpp:2187
msgid "Normal"
msgstr "Normaal"
-#: src/slic3r/GUI/Tab.cpp:2210
+#: src/slic3r/GUI/Tab.cpp:2192
msgid "Values in this column are for Stealth mode"
msgstr "Waarden in deze kolom zijn voor de stille modus"
-#: src/slic3r/GUI/Tab.cpp:2211
+#: src/slic3r/GUI/Tab.cpp:2193
msgid "Stealth"
msgstr "Stille modus"
-#: src/slic3r/GUI/Tab.cpp:2219
+#: src/slic3r/GUI/Tab.cpp:2201
msgid "Maximum feedrates"
msgstr "Maximale voedingssnelheden"
-#: src/slic3r/GUI/Tab.cpp:2224
+#: src/slic3r/GUI/Tab.cpp:2206
msgid "Maximum accelerations"
msgstr "Maximale acceleraties"
-#: src/slic3r/GUI/Tab.cpp:2231
+#: src/slic3r/GUI/Tab.cpp:2213
msgid "Jerk limits"
msgstr "Ruklimieten"
-#: src/slic3r/GUI/Tab.cpp:2236
+#: src/slic3r/GUI/Tab.cpp:2218
msgid "Minimum feedrates"
msgstr "Minimale voedingssnelheden"
-#: src/slic3r/GUI/Tab.cpp:2300 src/slic3r/GUI/Tab.cpp:2308
+#: src/slic3r/GUI/Tab.cpp:2282 src/slic3r/GUI/Tab.cpp:2290
msgid "Single extruder MM setup"
msgstr "Multi-materialsetup met één extruder"
-#: src/slic3r/GUI/Tab.cpp:2309
+#: src/slic3r/GUI/Tab.cpp:2291
msgid "Single extruder multimaterial parameters"
msgstr "Parameter voor multi-material met één extruder"
-#: src/slic3r/GUI/Tab.cpp:2340
+#: src/slic3r/GUI/Tab.cpp:2322
msgid ""
"This is a single extruder multimaterial printer, diameters of all extruders "
"will be set to the new value. Do you want to proceed?"
@@ -5707,19 +5817,19 @@ msgstr ""
"extruders worden ingesteld op de nieuwe waarde. Weet u zeker dat u wilt "
"doorgaan?"
-#: src/slic3r/GUI/Tab.cpp:2364
+#: src/slic3r/GUI/Tab.cpp:2346
msgid "Layer height limits"
msgstr "Laagdiktelimieten"
-#: src/slic3r/GUI/Tab.cpp:2369
+#: src/slic3r/GUI/Tab.cpp:2351
msgid "Position (for multi-extruder printers)"
msgstr "Positie (voor multi-extruderprinters)"
-#: src/slic3r/GUI/Tab.cpp:2375
+#: src/slic3r/GUI/Tab.cpp:2357
msgid "Only lift Z"
msgstr "Beweeg alleen Z omhoog"
-#: src/slic3r/GUI/Tab.cpp:2388
+#: src/slic3r/GUI/Tab.cpp:2370
msgid ""
"Retraction when tool is disabled (advanced settings for multi-extruder "
"setups)"
@@ -5727,11 +5837,11 @@ msgstr ""
"Retractie als de tool uit staat (geavanceerde instelling voor multi-"
"extrudersetups)"
-#: src/slic3r/GUI/Tab.cpp:2396
+#: src/slic3r/GUI/Tab.cpp:2378
msgid "Reset to Filament Color"
msgstr "Reset naar filamentkleur"
-#: src/slic3r/GUI/Tab.cpp:2577
+#: src/slic3r/GUI/Tab.cpp:2559
msgid ""
"The Wipe option is not available when using the Firmware Retraction mode.\n"
"\n"
@@ -5741,44 +5851,48 @@ msgstr ""
"\n"
"Moet deze uitgezet worden om firmwareretractie te gebruiken?"
-#: src/slic3r/GUI/Tab.cpp:2579
+#: src/slic3r/GUI/Tab.cpp:2561
msgid "Firmware Retraction"
msgstr "Firmwareretractie"
-#: src/slic3r/GUI/Tab.cpp:2909
+#: src/slic3r/GUI/Tab.cpp:2907
#, c-format
msgid "Default preset (%s)"
msgstr "Standaard preset (%s)"
-#: src/slic3r/GUI/Tab.cpp:2910
+#: src/slic3r/GUI/Tab.cpp:2908
#, c-format
msgid "Preset (%s)"
msgstr "Preset (%s)"
-#: src/slic3r/GUI/Tab.cpp:2927
+#: src/slic3r/GUI/Tab.cpp:2925
msgid "has the following unsaved changes:"
msgstr "heeft de volgende niet-opgeslagen wijzigingen:"
-#: src/slic3r/GUI/Tab.cpp:2930
+#: src/slic3r/GUI/Tab.cpp:2928
msgid "is not compatible with printer"
msgstr "is niet compatibel met printer"
-#: src/slic3r/GUI/Tab.cpp:2931
+#: src/slic3r/GUI/Tab.cpp:2929
msgid "is not compatible with print profile"
msgstr "is niet compatibel met printprofiel"
-#: src/slic3r/GUI/Tab.cpp:2933
+#: src/slic3r/GUI/Tab.cpp:2931
msgid "and it has the following unsaved changes:"
msgstr "en het heeft de volgende niet-opgeslagen wijzigingen:"
-#: src/slic3r/GUI/Tab.cpp:2937
+#: src/slic3r/GUI/Tab.cpp:2935
msgid "Unsaved Changes"
msgstr "Niet-opgeslagen wijzigingen"
-#: src/slic3r/GUI/Tab.cpp:3035
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Ontkoppeld"
+
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Kopie"
+msgid "Copy"
+msgstr "Kopieer"
#: src/slic3r/GUI/Tab.cpp:3058
msgid "The supplied name is empty. It can't be saved."
@@ -5800,30 +5914,34 @@ msgstr "Preset met de naam '%1%' bestaat al."
msgid "Replace?"
msgstr "Vervangen?"
-#: src/slic3r/GUI/Tab.cpp:3111
+#: src/slic3r/GUI/Tab.cpp:3141
msgid "remove"
msgstr "verwijderen"
-#: src/slic3r/GUI/Tab.cpp:3111
+#: src/slic3r/GUI/Tab.cpp:3141
msgid "delete"
msgstr "verwijderen"
#. TRN remove/delete
-#: src/slic3r/GUI/Tab.cpp:3113
+#: src/slic3r/GUI/Tab.cpp:3143
msgid "Are you sure you want to %1% the selected preset?"
msgstr "Weet u zeker dat u de geselecteerde preset %1% wilt?"
#. TRN Remove/Delete
-#: src/slic3r/GUI/Tab.cpp:3116
+#: src/slic3r/GUI/Tab.cpp:3146
msgid "%1% Preset"
msgstr "Preset %1%"
-#: src/slic3r/GUI/Tab.cpp:3242
+#: src/slic3r/GUI/Tab.cpp:3205 src/slic3r/GUI/Tab.cpp:3275
+msgid "Set"
+msgstr "Stel in"
+
+#: src/slic3r/GUI/Tab.cpp:3314
msgid "LOCKED LOCK"
msgstr "Vergrendeld"
#. TRN Description for "LOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3244
+#: src/slic3r/GUI/Tab.cpp:3316
msgid ""
"indicates that the settings are the same as the system (or default) values "
"for the current option group"
@@ -5831,12 +5949,12 @@ msgstr ""
"geeft aan dat de instellingen gelijk zijn aan de systeemwaarden voor de "
"huidige optiegroep"
-#: src/slic3r/GUI/Tab.cpp:3246
+#: src/slic3r/GUI/Tab.cpp:3318
msgid "UNLOCKED LOCK"
msgstr "Ontgrendeld"
#. TRN Description for "UNLOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3248
+#: src/slic3r/GUI/Tab.cpp:3320
msgid ""
"indicates that some settings were changed and are not equal to the system "
"(or default) values for the current option group.\n"
@@ -5848,25 +5966,25 @@ msgstr ""
"Klik op het ontgrendeld-pictogram om de instelling te resetten naar de "
"systeemwaarden voor de huidige optiegroep."
-#: src/slic3r/GUI/Tab.cpp:3253
+#: src/slic3r/GUI/Tab.cpp:3325
msgid "WHITE BULLET"
msgstr "Wit bolletje"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3255
+#: src/slic3r/GUI/Tab.cpp:3327
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
-"linker knop: \tgeeft een niet-systeempreset aan,\n"
-"rechter knop: \tgeeft aan dat de instelling niet veranderd is."
+"de linkerknop geeft aan dat het niet een systeempreset is,\n"
+"de rechterknop geeft aan of de instelling is gewijzigd."
-#: src/slic3r/GUI/Tab.cpp:3258
+#: src/slic3r/GUI/Tab.cpp:3330
msgid "BACK ARROW"
msgstr "Pijltje terug"
#. TRN Description for "BACK ARROW"
-#: src/slic3r/GUI/Tab.cpp:3260
+#: src/slic3r/GUI/Tab.cpp:3332
msgid ""
"indicates that the settings were changed and are not equal to the last saved "
"preset for the current option group.\n"
@@ -5878,7 +5996,7 @@ msgstr ""
"Klik op het pijltje-terug-pictogram om alle instellingen te resetten naar de "
"laatst opgeslagen preset voor de huidige optiegroep."
-#: src/slic3r/GUI/Tab.cpp:3270
+#: src/slic3r/GUI/Tab.cpp:3342
msgid ""
"LOCKED LOCK icon indicates that the settings are the same as the system (or "
"default) values for the current option group"
@@ -5886,7 +6004,7 @@ msgstr ""
"Vergrendeld-pictogram geeft aan dat de instellingen gelijk zijn aan de "
"systeemwaarde van de huidige optiegroep"
-#: src/slic3r/GUI/Tab.cpp:3272
+#: src/slic3r/GUI/Tab.cpp:3344
msgid ""
"UNLOCKED LOCK icon indicates that some settings were changed and are not "
"equal to the system (or default) values for the current option group.\n"
@@ -5898,11 +6016,11 @@ msgstr ""
"Klik om alle instellingen voor de huidige optiegroep te resetten naar "
"systeemwaarden."
-#: src/slic3r/GUI/Tab.cpp:3275
+#: src/slic3r/GUI/Tab.cpp:3347
msgid "WHITE BULLET icon indicates a non system (or non default) preset."
msgstr "Het witte bolletje geeft aan dat het geen systeempreset betreft."
-#: src/slic3r/GUI/Tab.cpp:3278
+#: src/slic3r/GUI/Tab.cpp:3350
msgid ""
"WHITE BULLET icon indicates that the settings are the same as in the last "
"saved preset for the current option group."
@@ -5910,7 +6028,7 @@ msgstr ""
"Het witte bolletje geeft aan dat de instelling gelijk is aan de laatst "
"opgeslagen preset voor de huidige optiegroep."
-#: src/slic3r/GUI/Tab.cpp:3280
+#: src/slic3r/GUI/Tab.cpp:3352
msgid ""
"BACK ARROW icon indicates that the settings were changed and are not equal "
"to the last saved preset for the current option group.\n"
@@ -5923,14 +6041,14 @@ msgstr ""
"Klik om alle instellingen terug te zetten voor de huidige optiegroep naar de "
"laatst opgeslagen preset."
-#: src/slic3r/GUI/Tab.cpp:3286
+#: src/slic3r/GUI/Tab.cpp:3358
msgid ""
"LOCKED LOCK icon indicates that the value is the same as the system (or "
"default) value."
msgstr ""
"Vergrendeld-pictogram geeft aan dat de waarde gelijk is aan de systeemwaarde."
-#: src/slic3r/GUI/Tab.cpp:3287
+#: src/slic3r/GUI/Tab.cpp:3359
msgid ""
"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
"the system (or default) value.\n"
@@ -5940,7 +6058,7 @@ msgstr ""
"aan de systeemwaarde.\n"
"Klik om de huidige waarde te resetten naar de systeemwaarde."
-#: src/slic3r/GUI/Tab.cpp:3293
+#: src/slic3r/GUI/Tab.cpp:3365
msgid ""
"WHITE BULLET icon indicates that the value is the same as in the last saved "
"preset."
@@ -5948,7 +6066,7 @@ msgstr ""
"Het witte bolletje geeft aan dat de waarde gelijk is aan de laatst "
"opgeslagen preset."
-#: src/slic3r/GUI/Tab.cpp:3294
+#: src/slic3r/GUI/Tab.cpp:3366
msgid ""
"BACK ARROW icon indicates that the value was changed and is not equal to the "
"last saved preset.\n"
@@ -5959,56 +6077,56 @@ msgstr ""
"Klik om de waarde te resetten naar de laatst opgeslagen preset."
#. TRN Preset
-#: src/slic3r/GUI/Tab.cpp:3407
+#: src/slic3r/GUI/Tab.cpp:3479
#, c-format
msgid "Save %s as:"
msgstr "%s opslaan als:"
-#: src/slic3r/GUI/Tab.cpp:3451
+#: src/slic3r/GUI/Tab.cpp:3523
msgid "the following suffix is not allowed:"
msgstr "het volgende achtervoegsel is niet toegestaan:"
-#: src/slic3r/GUI/Tab.cpp:3455
+#: src/slic3r/GUI/Tab.cpp:3527
msgid "The supplied name is not available."
msgstr "De ingevoerde naam is niet beschikbaar."
-#: src/slic3r/GUI/Tab.cpp:3468 src/slic3r/GUI/Tab.cpp:3470
+#: src/slic3r/GUI/Tab.cpp:3540 src/slic3r/GUI/Tab.cpp:3542
msgid "Material"
msgstr "Materiaal"
-#: src/slic3r/GUI/Tab.cpp:3598
+#: src/slic3r/GUI/Tab.cpp:3664
msgid "Support head"
msgstr "Supportkop"
-#: src/slic3r/GUI/Tab.cpp:3603
+#: src/slic3r/GUI/Tab.cpp:3669
msgid "Support pillar"
msgstr "Supportpijler"
-#: src/slic3r/GUI/Tab.cpp:3617
+#: src/slic3r/GUI/Tab.cpp:3685
msgid "Connection of the support sticks and junctions"
msgstr "Verbindingen van de supporttakken en kruisingen"
-#: src/slic3r/GUI/Tab.cpp:3622
+#: src/slic3r/GUI/Tab.cpp:3690
msgid "Automatic generation"
msgstr "Automatisch genereren"
-#: src/slic3r/GUI/Tab.hpp:327 src/slic3r/GUI/Tab.hpp:430
+#: src/slic3r/GUI/Tab.hpp:336 src/slic3r/GUI/Tab.hpp:441
msgid "Print Settings"
msgstr "Printinstellingen"
-#: src/slic3r/GUI/Tab.hpp:354
+#: src/slic3r/GUI/Tab.hpp:363
msgid "Filament Settings"
msgstr "Filamentinstellingen"
-#: src/slic3r/GUI/Tab.hpp:390
+#: src/slic3r/GUI/Tab.hpp:399
msgid "Printer Settings"
msgstr "Printerinstellingen"
-#: src/slic3r/GUI/Tab.hpp:415
+#: src/slic3r/GUI/Tab.hpp:426
msgid "Material Settings"
msgstr "Materiaalinstellingen"
-#: src/slic3r/GUI/Tab.hpp:442
+#: src/slic3r/GUI/Tab.hpp:453
msgid "Save preset"
msgstr "Preset opslaan"
@@ -6080,8 +6198,8 @@ msgid "%s incompatibility"
msgstr "%s incompatibiliteit"
#: src/slic3r/GUI/UpdateDialogs.cpp:148
-msgid "Is necessary to install a configuration update. "
-msgstr "Het is noodzakelijk een configuratie-update te installeren. "
+msgid "You must install a configuration update."
+msgstr "U moet een configuratie-update installeren."
#: src/slic3r/GUI/UpdateDialogs.cpp:151
#, c-format
@@ -6173,22 +6291,22 @@ msgstr ""
"Ga verdere met de %s die volgt om de nieuwe presets in te stellen en om te "
"kiezen of automatische presets moeten worden ingeschakeld."
-#: src/slic3r/GUI/UpdateDialogs.cpp:286
+#: src/slic3r/GUI/UpdateDialogs.cpp:287
msgid "For more information please visit our wiki page:"
msgstr "Voor meer informatie kunt u naar onze wiki-pagina gaan:"
-#: src/slic3r/GUI/UpdateDialogs.cpp:303
+#: src/slic3r/GUI/UpdateDialogs.cpp:304
msgid "Configuration updates"
msgstr "Configuratie-updates"
-#: src/slic3r/GUI/UpdateDialogs.cpp:303
-msgid "No updates aviable"
+#: src/slic3r/GUI/UpdateDialogs.cpp:304
+msgid "No updates available"
msgstr "Geen updates beschikbaar"
-#: src/slic3r/GUI/UpdateDialogs.cpp:308
+#: src/slic3r/GUI/UpdateDialogs.cpp:309
#, c-format
-msgid "%s has no configuration updates aviable."
-msgstr "%s heeft geen beschikbare configuratie-updates."
+msgid "%s has no configuration updates available."
+msgstr "%s heeft geen configuratie-updates beschikbaar."
#: src/slic3r/GUI/WipeTowerDialog.cpp:15
msgid "Ramming customization"
@@ -6206,12 +6324,13 @@ msgid ""
"This is an expert-level setting, incorrect adjustment will likely lead to "
"jams, extruder wheel grinding into filament etc."
msgstr ""
-"Ramming wordt gebruikt voor het snel extruderen vlak voor een toolwissel in "
-"multi-materialprinters met één extruder. Het doel daarvan is om het einde "
-"van het ongeladen filament goed te vormen (zodat het later weer geladen kan "
-"worden) en nieuwe filament niet verhinderd wordt. Deze fase is belangrijk. "
-"Verschillende materialen vereisen verschillende extrusiesnelheden voor de "
-"juiste vorm. Daarom zijn de waarden tijdens de ramming aan te passen.\n"
+"Ramming wordt gebruikt voor het snel extruderen vlak voor een toolwisseling "
+"bij multi-materialprinters met één extruder. Het doel daarvan is om het "
+"einde van het ongeladen filament goed te vormen (zodat het later weer "
+"geladen kan worden) en nieuw filament niet verhinderd wordt. Deze fase is "
+"belangrijk. Verschillende materialen vereisen verschillende "
+"extrusiesnelheden voor de juiste vorm. Daarom zijn de waarden tijdens de "
+"ramming aan te passen.\n"
"\n"
"Dit is een expert-level instelling. Onjuiste aanpassingen kunnen zorgen voor "
"verstoppingen en andere problemen."
@@ -6295,30 +6414,30 @@ msgstr "Toon eenvoudige instellingen"
msgid "Show advanced settings"
msgstr "Toon geavanceerde instellingen"
-#: src/slic3r/GUI/wxExtensions.cpp:703
+#: src/slic3r/GUI/wxExtensions.cpp:706
#, c-format
msgid "Switch to the %s mode"
msgstr "Schakel over naar de %s modus"
-#: src/slic3r/GUI/wxExtensions.cpp:704
+#: src/slic3r/GUI/wxExtensions.cpp:707
#, c-format
msgid "Current mode is %s"
msgstr "Huidige modus is: %s"
-#: src/slic3r/Utils/AstroBox.cpp:68 src/slic3r/Utils/OctoPrint.cpp:68
+#: src/slic3r/Utils/AstroBox.cpp:69 src/slic3r/Utils/OctoPrint.cpp:69
#, c-format
msgid "Mismatched type of print host: %s"
msgstr "Onjuist type printhost: %s"
-#: src/slic3r/Utils/AstroBox.cpp:83
+#: src/slic3r/Utils/AstroBox.cpp:84
msgid "Connection to AstroBox works correctly."
msgstr "Verbinding met AstroBox werkt naar behoren."
-#: src/slic3r/Utils/AstroBox.cpp:89
+#: src/slic3r/Utils/AstroBox.cpp:90
msgid "Could not connect to AstroBox"
msgstr "Kan niet verbinden met AstroBox"
-#: src/slic3r/Utils/AstroBox.cpp:89
+#: src/slic3r/Utils/AstroBox.cpp:92
msgid "Note: AstroBox version at least 1.1.0 is required."
msgstr "Let op: AstroBox-versie 1.1.0 is tenminste vereist."
@@ -6326,21 +6445,21 @@ msgstr "Let op: AstroBox-versie 1.1.0 is tenminste vereist."
msgid "Connection to Duet works correctly."
msgstr "Verbinding met Duet werkt naar behoren."
-#: src/slic3r/Utils/Duet.cpp:54
+#: src/slic3r/Utils/Duet.cpp:55
msgid "Could not connect to Duet"
msgstr "Kan niet verbinden met Duet"
-#: src/slic3r/Utils/Duet.cpp:82 src/slic3r/Utils/Duet.cpp:137
-#: src/slic3r/Utils/FlashAir.cpp:119 src/slic3r/Utils/FlashAir.cpp:140
-#: src/slic3r/Utils/FlashAir.cpp:156
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:139
+#: src/slic3r/Utils/FlashAir.cpp:122 src/slic3r/Utils/FlashAir.cpp:143
+#: src/slic3r/Utils/FlashAir.cpp:159
msgid "Unknown error occured"
msgstr "Onbekende fout opgetreden"
-#: src/slic3r/Utils/Duet.cpp:131
+#: src/slic3r/Utils/Duet.cpp:133
msgid "Wrong password"
msgstr "Verkeerd wachtwoord"
-#: src/slic3r/Utils/Duet.cpp:134
+#: src/slic3r/Utils/Duet.cpp:136
msgid "Could not get resources to create a new connection"
msgstr "Kan geen middelen krijgen om nieuwe verbinding te maken"
@@ -6433,11 +6552,11 @@ msgstr "Uploaden naar een FlashAir-kaart niet toegestaan."
msgid "Connection to FlashAir works correctly and upload is enabled."
msgstr "Verbinding met FlashAir werkt naar behoren en uploaden is toegestaan."
-#: src/slic3r/Utils/FlashAir.cpp:73
+#: src/slic3r/Utils/FlashAir.cpp:74
msgid "Could not connect to FlashAir"
msgstr "Kan niet verbinden met FlashAir"
-#: src/slic3r/Utils/FlashAir.cpp:73
+#: src/slic3r/Utils/FlashAir.cpp:76
msgid ""
"Note: FlashAir with firmware 2.00.02 or newer and activated upload function "
"is required."
@@ -6445,23 +6564,23 @@ msgstr ""
"Let op: FlashAir met firmware 2.00.02 (of nieuwer) en een geactiveerde "
"upload zijn vereist."
-#: src/slic3r/Utils/OctoPrint.cpp:83
+#: src/slic3r/Utils/OctoPrint.cpp:84
msgid "Connection to OctoPrint works correctly."
msgstr "Verbinding met OctoPrint werkt naar behoren."
-#: src/slic3r/Utils/OctoPrint.cpp:89
+#: src/slic3r/Utils/OctoPrint.cpp:90
msgid "Could not connect to OctoPrint"
msgstr "Kan niet verbinden met OctoPrint"
-#: src/slic3r/Utils/OctoPrint.cpp:89
+#: src/slic3r/Utils/OctoPrint.cpp:92
msgid "Note: OctoPrint version at least 1.1.0 is required."
msgstr "Let op: de minimaal vereiste versie van OctoPrint is 1.1.0."
-#: src/slic3r/Utils/OctoPrint.cpp:176
+#: src/slic3r/Utils/OctoPrint.cpp:179
msgid "Connection to Prusa SL1 works correctly."
msgstr "Verbinding met Prusa SL1 werkt naar behoren."
-#: src/slic3r/Utils/OctoPrint.cpp:181
+#: src/slic3r/Utils/OctoPrint.cpp:185
msgid "Could not connect to Prusa SLA"
msgstr "Kan niet verbinden met Prusa SLA"
@@ -6612,21 +6731,22 @@ msgstr "terugschrijven mislukt"
msgid "Error with zip archive"
msgstr "Fout bij ZIP-archief"
-#: src/libslic3r/GCode.cpp:637
+#: src/libslic3r/GCode.cpp:640
msgid "Empty layers detected, the output would not be printable."
msgstr "Lege lagen gedetecteerd. De output is mogelijk niet-printbaar."
-#: src/libslic3r/GCode.cpp:638
+#: src/libslic3r/GCode.cpp:641
msgid "Print z"
msgstr "Print Z"
-#: src/libslic3r/GCode.cpp:639
+#: src/libslic3r/GCode.cpp:642
msgid ""
"This is usually caused by negligibly small extrusions or by a faulty model. "
-"Try to repair the model or change its orientation on the bed."
+"Try to repair the model or change its orientation on the bed."
msgstr ""
-"Dit komt meestal voor bij verwaarloosbare extrusiehoeveelheden of door een "
-"foutief model. Probeer het model te repareren of verander de oriëntatie."
+"Dit wordt normaal gesproken veroorzaakt door verwaarloosbaar smalle lijnen "
+"of door een defect model. Probeer het model te repareren of verander de "
+"oriëntatie op het bed."
#: src/libslic3r/ExtrusionEntity.cpp:323
msgid "Mixed"
@@ -6846,7 +6966,7 @@ msgstr "G-code exporteren"
msgid "Generating G-code"
msgstr "G-code genereren"
-#: src/libslic3r/SLAPrint.cpp:613
+#: src/libslic3r/SLAPrint.cpp:615
msgid ""
"Cannot proceed without support points! Add support points or disable support "
"generation."
@@ -6854,7 +6974,7 @@ msgstr ""
"Kan niet doorgaan zonder supportpunten! Voeg supportpunten toe of schakel "
"supportgeneratie uit."
-#: src/libslic3r/SLAPrint.cpp:625
+#: src/libslic3r/SLAPrint.cpp:627
msgid ""
"Elevation is too low for object. Use the \"Pad around object\" feature to "
"print the object without elevation."
@@ -6862,7 +6982,7 @@ msgstr ""
"Verhoging is te klein voor het object. Gebruik de 'Basisplaat rondom object'-"
"optie om het object zonder verhoging te printen."
-#: src/libslic3r/SLAPrint.cpp:631
+#: src/libslic3r/SLAPrint.cpp:633
msgid ""
"The endings of the support pillars will be deployed on the gap between the "
"object and the pad. 'Support base safety distance' has to be greater than "
@@ -6872,15 +6992,15 @@ msgstr ""
"de basisplaat. De instelling 'Veilige afstand voor supportbasis' moet groter "
"zijn dan de 'Basisplaat-objectgat'-parameter hiervoor."
-#: src/libslic3r/SLAPrint.cpp:646
+#: src/libslic3r/SLAPrint.cpp:648
msgid "Exposition time is out of printer profile bounds."
msgstr "De belichtingstijd valt buiten de grenzen van het printerprofiel."
-#: src/libslic3r/SLAPrint.cpp:653
+#: src/libslic3r/SLAPrint.cpp:655
msgid "Initial exposition time is out of printer profile bounds."
msgstr "Initiële belichtingstijd valt buiten de printerprofielgrenzen."
-#: src/libslic3r/SLAPrint.cpp:760
+#: src/libslic3r/SLAPrint.cpp:762
msgid "Slicing done"
msgstr "Slicen voltooid"
@@ -7038,10 +7158,6 @@ msgstr ""
"PrusaSlicer kan gcode-bestanden naar een printerhost uploaden. Dit veld moet "
"de API-key of het wachtwoord voor authenticatie bevatten."
-#: src/libslic3r/PrintConfig.cpp:111
-msgid "HTTPS CA File"
-msgstr "HTTPS-CA-bestand"
-
#: src/libslic3r/PrintConfig.cpp:112
msgid ""
"Custom CA certificate file can be specified for HTTPS OctoPrint connections, "
@@ -7179,8 +7295,8 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:207 src/libslic3r/PrintConfig.cpp:780
#: src/libslic3r/PrintConfig.cpp:1640 src/libslic3r/PrintConfig.cpp:1650
#: src/libslic3r/PrintConfig.cpp:1894 src/libslic3r/PrintConfig.cpp:2049
-#: src/libslic3r/PrintConfig.cpp:2247 src/libslic3r/PrintConfig.cpp:2727
-#: src/libslic3r/PrintConfig.cpp:2848
+#: src/libslic3r/PrintConfig.cpp:2247 src/libslic3r/PrintConfig.cpp:2737
+#: src/libslic3r/PrintConfig.cpp:2858
msgid "°"
msgstr "°"
@@ -7195,7 +7311,7 @@ msgstr "Deze ventilatorsnelheid wordt aangehouden bij bruggen en overhanging."
#: src/libslic3r/PrintConfig.cpp:215 src/libslic3r/PrintConfig.cpp:792
#: src/libslic3r/PrintConfig.cpp:1219 src/libslic3r/PrintConfig.cpp:1282
#: src/libslic3r/PrintConfig.cpp:1532 src/libslic3r/PrintConfig.cpp:2425
-#: src/libslic3r/PrintConfig.cpp:2767
+#: src/libslic3r/PrintConfig.cpp:2777
msgid "%"
msgstr "%"
@@ -9008,11 +9124,11 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:1695
msgid "Loops (minimum)"
-msgstr "Rondjes (minimaal)"
+msgstr "Rondgangen (minimaal)"
#: src/libslic3r/PrintConfig.cpp:1696
msgid "Skirt Loops"
-msgstr "Rondjes voor de skirt"
+msgstr "Rondgangen voor de skirt"
#: src/libslic3r/PrintConfig.cpp:1697
msgid ""
@@ -9020,9 +9136,9 @@ msgid ""
"set, the number of loops might be greater than the one configured here. Set "
"this to zero to disable skirt completely."
msgstr ""
-"Het aantal rondjes van de skirt. Als de minimale extrusielengte is ingesteld "
-"kan dit aantal rondjes groter zijn dan hier is ingesteld. Als dit ingesteld "
-"is op 0, wordt de skirt uitgeschakeld."
+"Het aantal rondgangen van de skirt. Als de minimale extrusielengte is "
+"ingesteld kan dit aantal rondgangen groter zijn dan hier is ingesteld. Als "
+"dit ingesteld is op 0, wordt de skirt uitgeschakeld."
#: src/libslic3r/PrintConfig.cpp:1705
msgid "Slow down if layer print time is below"
@@ -9272,7 +9388,7 @@ msgid ""
"plane."
msgstr "Gebruik deze instelling om het patroon van het support te draaien."
-#: src/libslic3r/PrintConfig.cpp:1903 src/libslic3r/PrintConfig.cpp:2676
+#: src/libslic3r/PrintConfig.cpp:1903 src/libslic3r/PrintConfig.cpp:2686
msgid ""
"Only create support if it lies on a build plate. Don't create support on a "
"print."
@@ -9348,13 +9464,13 @@ msgstr ""
#: src/libslic3r/PrintConfig.cpp:1957
msgid "Interface loops"
-msgstr "Interface rondjes"
+msgstr "Interface rondgangen"
#: src/libslic3r/PrintConfig.cpp:1959
msgid ""
"Cover the top contact layer of the supports with loops. Disabled by default."
msgstr ""
-"Bedek de bovenste interfacelagen van het support met rondjes. Dit staat "
+"Bedek de bovenste interfacelagen van het support met rondgangen. Dit staat "
"standaard uit."
#: src/libslic3r/PrintConfig.cpp:1964
@@ -10041,10 +10157,22 @@ msgid "Diameter in mm of the support pillars"
msgstr "Diameter van de supportpijlers (in mm)"
#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Maximaal aantal bruggen op een pijler"
+
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid ""
+"Maximum number of bridges that can be placed on a pillar. Bridges hold "
+"support point pinheads and connect to pillars as small branches."
+msgstr ""
+"Maximaal aantal bruggen dat op een pijler geplaatst kan worden. Bruggen "
+"houden supportpuntkop bij elkaar en verbinden pijlers as smalle takken."
+
+#: src/libslic3r/PrintConfig.cpp:2668
msgid "Support pillar connection mode"
msgstr "Supportpijler - verbindingsmodus"
-#: src/libslic3r/PrintConfig.cpp:2659
+#: src/libslic3r/PrintConfig.cpp:2669
msgid ""
"Controls the bridge type between two neighboring pillars. Can be zig-zag, "
"cross (double zig-zag) or dynamic which will automatically switch between "
@@ -10054,23 +10182,23 @@ msgstr ""
"kruisend (dubbele zigzag) of dynamisch zijn. Dynamisch houdt in dat wordt "
"geschakeld tussen de eerste twee, afhankelijk van de pijlerafstand."
-#: src/libslic3r/PrintConfig.cpp:2667
+#: src/libslic3r/PrintConfig.cpp:2677
msgid "Zig-Zag"
msgstr "Zigzag"
-#: src/libslic3r/PrintConfig.cpp:2668
+#: src/libslic3r/PrintConfig.cpp:2678
msgid "Cross"
msgstr "Kruisend"
-#: src/libslic3r/PrintConfig.cpp:2669
+#: src/libslic3r/PrintConfig.cpp:2679
msgid "Dynamic"
msgstr "Dynamisch"
-#: src/libslic3r/PrintConfig.cpp:2681
+#: src/libslic3r/PrintConfig.cpp:2691
msgid "Pillar widening factor"
msgstr "Pijlervergrotingsfactor"
-#: src/libslic3r/PrintConfig.cpp:2683
+#: src/libslic3r/PrintConfig.cpp:2693
msgid ""
"Merging bridges or pillars into another pillars can increase the radius. "
"Zero means no increase, one means full increase."
@@ -10078,27 +10206,27 @@ msgstr ""
"Bruggen of pijlers samenvoegen met andere pijlers kan de radius vergroten. 0 "
"betekent geen vergroting, 1 betekent volle vergroting."
-#: src/libslic3r/PrintConfig.cpp:2692
+#: src/libslic3r/PrintConfig.cpp:2702
msgid "Support base diameter"
msgstr "Supportbasis - diameter"
-#: src/libslic3r/PrintConfig.cpp:2694
+#: src/libslic3r/PrintConfig.cpp:2704
msgid "Diameter in mm of the pillar base"
msgstr "Diameter van de pijlerbasis (in mm)"
-#: src/libslic3r/PrintConfig.cpp:2702
+#: src/libslic3r/PrintConfig.cpp:2712
msgid "Support base height"
msgstr "Supportbasis - hoogte"
-#: src/libslic3r/PrintConfig.cpp:2704
+#: src/libslic3r/PrintConfig.cpp:2714
msgid "The height of the pillar base cone"
msgstr "Hoogte van de pijlerbasiskegel"
-#: src/libslic3r/PrintConfig.cpp:2711
+#: src/libslic3r/PrintConfig.cpp:2721
msgid "Support base safety distance"
msgstr "Supportbasis - veilige afstand"
-#: src/libslic3r/PrintConfig.cpp:2714
+#: src/libslic3r/PrintConfig.cpp:2724
msgid ""
"The minimum distance of the pillar base from the model in mm. Makes sense in "
"zero elevation mode where a gap according to this parameter is inserted "
@@ -10108,27 +10236,27 @@ msgstr ""
"modus zonder verhoging waar een gat volgens deze parameter wordt ingevoegd "
"tussen het model en de basisplaat."
-#: src/libslic3r/PrintConfig.cpp:2724
+#: src/libslic3r/PrintConfig.cpp:2734
msgid "Critical angle"
msgstr "Kritische hoek"
-#: src/libslic3r/PrintConfig.cpp:2726
+#: src/libslic3r/PrintConfig.cpp:2736
msgid "The default angle for connecting support sticks and junctions."
msgstr "De standaardhoek voor de verbinding van supporttakken en kruisingen."
-#: src/libslic3r/PrintConfig.cpp:2734
+#: src/libslic3r/PrintConfig.cpp:2744
msgid "Max bridge length"
msgstr "Maximale bruglengte"
-#: src/libslic3r/PrintConfig.cpp:2736
+#: src/libslic3r/PrintConfig.cpp:2746
msgid "The max length of a bridge"
msgstr "Maximale bruglengte"
-#: src/libslic3r/PrintConfig.cpp:2743
+#: src/libslic3r/PrintConfig.cpp:2753
msgid "Max pillar linking distance"
msgstr "Maximale pijler-verbindafstand"
-#: src/libslic3r/PrintConfig.cpp:2745
+#: src/libslic3r/PrintConfig.cpp:2755
msgid ""
"The max distance of two pillars to get linked with each other. A zero value "
"will prohibit pillar cascading."
@@ -10136,11 +10264,11 @@ msgstr ""
"Maximale verbindingsafstand van twee pijlers. Een waarde van 0 schakelt aan "
"elkaar verbonden pijlers uit."
-#: src/libslic3r/PrintConfig.cpp:2753
+#: src/libslic3r/PrintConfig.cpp:2763
msgid "Object elevation"
msgstr "Objectverhoging"
-#: src/libslic3r/PrintConfig.cpp:2755
+#: src/libslic3r/PrintConfig.cpp:2765
msgid ""
"How much the supports should lift up the supported object. If \"Pad around "
"object\" is enabled, this value is ignored."
@@ -10148,39 +10276,39 @@ msgstr ""
"Hoe veel het support omhoog moet bewegen op het ondersteunde object. Als "
"'Basisplaat rondom object' is ingeschakeld wordt deze waarde genegeerd."
-#: src/libslic3r/PrintConfig.cpp:2766
+#: src/libslic3r/PrintConfig.cpp:2776
msgid "This is a relative measure of support points density."
msgstr "Relatieve waarde van de dichtheid van supportpunten."
-#: src/libslic3r/PrintConfig.cpp:2772
+#: src/libslic3r/PrintConfig.cpp:2782
msgid "Minimal distance of the support points"
msgstr "Minimale supportpuntafstand"
-#: src/libslic3r/PrintConfig.cpp:2774
+#: src/libslic3r/PrintConfig.cpp:2784
msgid "No support points will be placed closer than this threshold."
msgstr "Minimale afstand tussen supportpunten."
-#: src/libslic3r/PrintConfig.cpp:2780
+#: src/libslic3r/PrintConfig.cpp:2790
msgid "Use pad"
msgstr "Gebruik basisplaat"
-#: src/libslic3r/PrintConfig.cpp:2782
+#: src/libslic3r/PrintConfig.cpp:2792
msgid "Add a pad underneath the supported model"
msgstr "Voeg een basisplaat toe onder het model met support"
-#: src/libslic3r/PrintConfig.cpp:2787
+#: src/libslic3r/PrintConfig.cpp:2797
msgid "Pad wall thickness"
msgstr "Basisplaat - wanddikte"
-#: src/libslic3r/PrintConfig.cpp:2789
+#: src/libslic3r/PrintConfig.cpp:2799
msgid "The thickness of the pad and its optional cavity walls."
msgstr "Dikte van de basisplaat en optionele wanden."
-#: src/libslic3r/PrintConfig.cpp:2797
+#: src/libslic3r/PrintConfig.cpp:2807
msgid "Pad wall height"
msgstr "Basisplaat - wandhoogte"
-#: src/libslic3r/PrintConfig.cpp:2798
+#: src/libslic3r/PrintConfig.cpp:2808
msgid ""
"Defines the pad cavity depth. Set to zero to disable the cavity. Be careful "
"when enabling this feature, as some resins may produce an extreme suction "
@@ -10192,19 +10320,19 @@ msgstr ""
"sommige resins een sterk zuigeffect in de holte produceren, wat het afpellen "
"van de print van het folie lastig kan maken."
-#: src/libslic3r/PrintConfig.cpp:2811
+#: src/libslic3r/PrintConfig.cpp:2821
msgid "Pad brim size"
msgstr "Basisplaat - expansie"
-#: src/libslic3r/PrintConfig.cpp:2812
+#: src/libslic3r/PrintConfig.cpp:2822
msgid "How far should the pad extend around the contained geometry"
msgstr "Hoe ver de basisplaat moet uitsteken buiten de geometrie"
-#: src/libslic3r/PrintConfig.cpp:2822
+#: src/libslic3r/PrintConfig.cpp:2832
msgid "Max merge distance"
msgstr "Maximale combineerafstand"
-#: src/libslic3r/PrintConfig.cpp:2824
+#: src/libslic3r/PrintConfig.cpp:2834
msgid ""
"Some objects can get along with a few smaller pads instead of a single big "
"one. This parameter defines how far the center of two smaller pads should "
@@ -10214,11 +10342,11 @@ msgstr ""
"van één grote. Deze parameter bepaalt hoe ver de tussenafstand van de "
"kleinere basisplaten mogen zijn."
-#: src/libslic3r/PrintConfig.cpp:2844
+#: src/libslic3r/PrintConfig.cpp:2854
msgid "Pad wall slope"
msgstr "Basisplaat - zijhoek"
-#: src/libslic3r/PrintConfig.cpp:2846
+#: src/libslic3r/PrintConfig.cpp:2856
msgid ""
"The slope of the pad wall relative to the bed plane. 90 degrees means "
"straight walls."
@@ -10226,27 +10354,27 @@ msgstr ""
"Hoek van de basisplaatzijde ten opzichte van het bed. 90 graden betekent een "
"rechte zijkant."
-#: src/libslic3r/PrintConfig.cpp:2855
+#: src/libslic3r/PrintConfig.cpp:2865
msgid "Pad around object"
msgstr "Basisplaat rondom object"
-#: src/libslic3r/PrintConfig.cpp:2857
+#: src/libslic3r/PrintConfig.cpp:2867
msgid "Create pad around object and ignore the support elevation"
msgstr "Genereer basisplaat rondom object en schakel objectverhoging uit"
-#: src/libslic3r/PrintConfig.cpp:2862
+#: src/libslic3r/PrintConfig.cpp:2872
msgid "Pad around object everywhere"
msgstr "Overal basisplaat rondom object"
-#: src/libslic3r/PrintConfig.cpp:2864
+#: src/libslic3r/PrintConfig.cpp:2874
msgid "Force pad around object everywhere"
msgstr "Forceer basisplaat overal rondom het object"
-#: src/libslic3r/PrintConfig.cpp:2869
+#: src/libslic3r/PrintConfig.cpp:2879
msgid "Pad object gap"
msgstr "Basisplaat - gat"
-#: src/libslic3r/PrintConfig.cpp:2871
+#: src/libslic3r/PrintConfig.cpp:2881
msgid ""
"The gap between the object bottom and the generated pad in zero elevation "
"mode."
@@ -10254,11 +10382,11 @@ msgstr ""
"Het gat tussen de onderkant van het object en de gegenereerde basisplaat in "
"de modus zonder verhoging."
-#: src/libslic3r/PrintConfig.cpp:2880
+#: src/libslic3r/PrintConfig.cpp:2890
msgid "Pad object connector stride"
msgstr "Basisplaat - verbindingstakafstand"
-#: src/libslic3r/PrintConfig.cpp:2882
+#: src/libslic3r/PrintConfig.cpp:2892
msgid ""
"Distance between two connector sticks which connect the object and the "
"generated pad."
@@ -10266,46 +10394,46 @@ msgstr ""
"Afstand tussen twee verbindingstakken die het object verbinden aan de "
"basisplaat."
-#: src/libslic3r/PrintConfig.cpp:2889
+#: src/libslic3r/PrintConfig.cpp:2899
msgid "Pad object connector width"
msgstr "Basisplaat - verbindingstakbreedte"
-#: src/libslic3r/PrintConfig.cpp:2891
+#: src/libslic3r/PrintConfig.cpp:2901
msgid ""
"Width of the connector sticks which connect the object and the generated pad."
msgstr ""
"Breedte van de verbindingstakken die het object en de basisplaat met elkaar "
"verbinden."
-#: src/libslic3r/PrintConfig.cpp:2898
+#: src/libslic3r/PrintConfig.cpp:2908
msgid "Pad object connector penetration"
msgstr "Basisplaat - Verbindingstakinsteek"
-#: src/libslic3r/PrintConfig.cpp:2901
+#: src/libslic3r/PrintConfig.cpp:2911
msgid "How much should the tiny connectors penetrate into the model body."
msgstr "Hoe ver de verbindingstakken in het model steken."
-#: src/libslic3r/PrintConfig.cpp:2908
+#: src/libslic3r/PrintConfig.cpp:2918
msgid "Enable hollowing"
msgstr "Uithollen toestaan"
-#: src/libslic3r/PrintConfig.cpp:2910
+#: src/libslic3r/PrintConfig.cpp:2920
msgid "Hollow out a model to have an empty interior"
msgstr "Hol een model uit voor een leeg binnenste"
-#: src/libslic3r/PrintConfig.cpp:2915
+#: src/libslic3r/PrintConfig.cpp:2925
msgid "Wall thickness"
msgstr "Wanddikte"
-#: src/libslic3r/PrintConfig.cpp:2917
+#: src/libslic3r/PrintConfig.cpp:2927
msgid "Minimum wall thickness of a hollowed model."
msgstr "Minimale wanddikte van een uitgehold model."
-#: src/libslic3r/PrintConfig.cpp:2925
+#: src/libslic3r/PrintConfig.cpp:2935
msgid "Accuracy"
msgstr "Nauwkeurigheid"
-#: src/libslic3r/PrintConfig.cpp:2927
+#: src/libslic3r/PrintConfig.cpp:2937
msgid ""
"Performance vs accuracy of calculation. Lower values may produce unwanted "
"artifacts."
@@ -10313,7 +10441,7 @@ msgstr ""
"Prestatie tegenover nauwkeurigheid van berekenen. Lagere waarde kunnen "
"ongewenste artefacten produceren."
-#: src/libslic3r/PrintConfig.cpp:2937
+#: src/libslic3r/PrintConfig.cpp:2947
msgid ""
"Hollowing is done in two steps: first, an imaginary interior is calculated "
"deeper (offset plus the closing distance) in the object and then it's "
@@ -10327,55 +10455,55 @@ msgstr ""
"binnenste ronder. Bij een waarde van 0 is het binnenste vrijwel gelijk aan "
"de buitenzijde."
-#: src/libslic3r/PrintConfig.cpp:3320
+#: src/libslic3r/PrintConfig.cpp:3330
msgid "Export OBJ"
msgstr "Exporteer OBJ"
-#: src/libslic3r/PrintConfig.cpp:3321
+#: src/libslic3r/PrintConfig.cpp:3331
msgid "Export the model(s) as OBJ."
msgstr "Exporteer de modellen als OBJ-bestand."
-#: src/libslic3r/PrintConfig.cpp:3332
+#: src/libslic3r/PrintConfig.cpp:3342
msgid "Export SLA"
msgstr "Exporteer SLA"
-#: src/libslic3r/PrintConfig.cpp:3333
+#: src/libslic3r/PrintConfig.cpp:3343
msgid "Slice the model and export SLA printing layers as PNG."
msgstr "Slice het model en exporteer SLA-printlagen als PNG-bestanden."
-#: src/libslic3r/PrintConfig.cpp:3338
+#: src/libslic3r/PrintConfig.cpp:3348
msgid "Export 3MF"
msgstr "Exporteer 3MF"
-#: src/libslic3r/PrintConfig.cpp:3339
+#: src/libslic3r/PrintConfig.cpp:3349
msgid "Export the model(s) as 3MF."
msgstr "Exporteer de modellen als 3MF-bestanden."
-#: src/libslic3r/PrintConfig.cpp:3343
+#: src/libslic3r/PrintConfig.cpp:3353
msgid "Export AMF"
msgstr "Exporteer AMF"
-#: src/libslic3r/PrintConfig.cpp:3344
+#: src/libslic3r/PrintConfig.cpp:3354
msgid "Export the model(s) as AMF."
msgstr "Exporteer de modellen als AMF-bestanden."
-#: src/libslic3r/PrintConfig.cpp:3348
+#: src/libslic3r/PrintConfig.cpp:3358
msgid "Export STL"
msgstr "Exporteer STL"
-#: src/libslic3r/PrintConfig.cpp:3349
+#: src/libslic3r/PrintConfig.cpp:3359
msgid "Export the model(s) as STL."
msgstr "Exporteer de modellen als STL-bestand."
-#: src/libslic3r/PrintConfig.cpp:3354
+#: src/libslic3r/PrintConfig.cpp:3364
msgid "Slice the model and export toolpaths as G-code."
msgstr "Slice het model en exporteer de bewegingen als gcode-bestand."
-#: src/libslic3r/PrintConfig.cpp:3359
+#: src/libslic3r/PrintConfig.cpp:3369
msgid "Slice"
msgstr "Slice"
-#: src/libslic3r/PrintConfig.cpp:3360
+#: src/libslic3r/PrintConfig.cpp:3370
msgid ""
"Slice the model as FFF or SLA based on the printer_technology configuration "
"value."
@@ -10383,71 +10511,71 @@ msgstr ""
"Slice het model als FFF of SLA, gebaseerd op de 'printer_technology'-"
"configuratiewaarde."
-#: src/libslic3r/PrintConfig.cpp:3365
+#: src/libslic3r/PrintConfig.cpp:3375
msgid "Help"
msgstr "Help"
-#: src/libslic3r/PrintConfig.cpp:3366
+#: src/libslic3r/PrintConfig.cpp:3376
msgid "Show this help."
msgstr "Toon deze hulp zien."
-#: src/libslic3r/PrintConfig.cpp:3371
+#: src/libslic3r/PrintConfig.cpp:3381
msgid "Help (FFF options)"
msgstr "Help (FFF-opties)"
-#: src/libslic3r/PrintConfig.cpp:3372
+#: src/libslic3r/PrintConfig.cpp:3382
msgid "Show the full list of print/G-code configuration options."
msgstr "Toon de volledige lijst van print- of G-code-configuratie-opties."
-#: src/libslic3r/PrintConfig.cpp:3376
+#: src/libslic3r/PrintConfig.cpp:3386
msgid "Help (SLA options)"
msgstr "Help (SLA opties)"
-#: src/libslic3r/PrintConfig.cpp:3377
+#: src/libslic3r/PrintConfig.cpp:3387
msgid "Show the full list of SLA print configuration options."
msgstr "Toon de volledige lijst van SLA-printconfiguratie-opties."
-#: src/libslic3r/PrintConfig.cpp:3381
+#: src/libslic3r/PrintConfig.cpp:3391
msgid "Output Model Info"
msgstr "Output model-info"
-#: src/libslic3r/PrintConfig.cpp:3382
+#: src/libslic3r/PrintConfig.cpp:3392
msgid "Write information about the model to the console."
msgstr "Schrijf informatie over het model naar de console."
-#: src/libslic3r/PrintConfig.cpp:3386
+#: src/libslic3r/PrintConfig.cpp:3396
msgid "Save config file"
msgstr "Sla configuratiebestand op"
-#: src/libslic3r/PrintConfig.cpp:3387
+#: src/libslic3r/PrintConfig.cpp:3397
msgid "Save configuration to the specified file."
msgstr "Sla configuratie op in aangegeven bestand."
-#: src/libslic3r/PrintConfig.cpp:3397
+#: src/libslic3r/PrintConfig.cpp:3407
msgid "Align XY"
msgstr "XY uitlijnen"
-#: src/libslic3r/PrintConfig.cpp:3398
+#: src/libslic3r/PrintConfig.cpp:3408
msgid "Align the model to the given point."
msgstr "Lijn de modellen uit op het gegeven punt."
-#: src/libslic3r/PrintConfig.cpp:3403
+#: src/libslic3r/PrintConfig.cpp:3413
msgid "Cut model at the given Z."
msgstr "Snijdt model op de ingestelde hoogte."
-#: src/libslic3r/PrintConfig.cpp:3424
+#: src/libslic3r/PrintConfig.cpp:3434
msgid "Center"
msgstr "Centreer"
-#: src/libslic3r/PrintConfig.cpp:3425
+#: src/libslic3r/PrintConfig.cpp:3435
msgid "Center the print around the given center."
msgstr "Centreer de print op het middelpunt."
-#: src/libslic3r/PrintConfig.cpp:3429
+#: src/libslic3r/PrintConfig.cpp:3439
msgid "Don't arrange"
msgstr "Niet schikken"
-#: src/libslic3r/PrintConfig.cpp:3430
+#: src/libslic3r/PrintConfig.cpp:3440
msgid ""
"Do not rearrange the given models before merging and keep their original XY "
"coordinates."
@@ -10455,27 +10583,27 @@ msgstr ""
"Herschik de modellen niet voor het samenvoegen en behoudt de originele X- en "
"Y-coördinaten."
-#: src/libslic3r/PrintConfig.cpp:3433
+#: src/libslic3r/PrintConfig.cpp:3443
msgid "Duplicate"
msgstr "Dupliceer"
-#: src/libslic3r/PrintConfig.cpp:3434
+#: src/libslic3r/PrintConfig.cpp:3444
msgid "Multiply copies by this factor."
msgstr "Meerdere kopieën van dit aantal."
-#: src/libslic3r/PrintConfig.cpp:3438
+#: src/libslic3r/PrintConfig.cpp:3448
msgid "Duplicate by grid"
msgstr "Dupliceer in raster"
-#: src/libslic3r/PrintConfig.cpp:3439
+#: src/libslic3r/PrintConfig.cpp:3449
msgid "Multiply copies by creating a grid."
msgstr "Meerdere kopieën in raster."
-#: src/libslic3r/PrintConfig.cpp:3442
+#: src/libslic3r/PrintConfig.cpp:3452
msgid "Merge"
msgstr "Samenvoegen"
-#: src/libslic3r/PrintConfig.cpp:3443
+#: src/libslic3r/PrintConfig.cpp:3453
msgid ""
"Arrange the supplied models in a plate and merge them in a single model in "
"order to perform actions once."
@@ -10483,7 +10611,7 @@ msgstr ""
"Schik de toegevoegde modellen en combineer ze tot één model om eenmalig "
"acties uit te voeren."
-#: src/libslic3r/PrintConfig.cpp:3448
+#: src/libslic3r/PrintConfig.cpp:3458
msgid ""
"Try to repair any non-manifold meshes (this option is implicitly added "
"whenever we need to slice the model to perform the requested action)."
@@ -10491,31 +10619,31 @@ msgstr ""
"Probeer alle niet-gesloten meshes te repareren (deze optie is impliciet "
"toegevoegd om, wanneer dat nodig is, onmogelijke modellen toch te slicen)."
-#: src/libslic3r/PrintConfig.cpp:3452
+#: src/libslic3r/PrintConfig.cpp:3462
msgid "Rotation angle around the Z axis in degrees."
msgstr "Rotatiehoek rond de Z-as in graden."
-#: src/libslic3r/PrintConfig.cpp:3456
+#: src/libslic3r/PrintConfig.cpp:3466
msgid "Rotate around X"
msgstr "Draai over de X-as"
-#: src/libslic3r/PrintConfig.cpp:3457
+#: src/libslic3r/PrintConfig.cpp:3467
msgid "Rotation angle around the X axis in degrees."
msgstr "Rotatiehoek rond de X-as in graden."
-#: src/libslic3r/PrintConfig.cpp:3461
+#: src/libslic3r/PrintConfig.cpp:3471
msgid "Rotate around Y"
msgstr "Draai over de Y-as"
-#: src/libslic3r/PrintConfig.cpp:3462
+#: src/libslic3r/PrintConfig.cpp:3472
msgid "Rotation angle around the Y axis in degrees."
msgstr "Rotatiehoek rond de Y-as in graden."
-#: src/libslic3r/PrintConfig.cpp:3467
+#: src/libslic3r/PrintConfig.cpp:3477
msgid "Scaling factor or percentage."
msgstr "Schalingsfactor of percentage."
-#: src/libslic3r/PrintConfig.cpp:3472
+#: src/libslic3r/PrintConfig.cpp:3482
msgid ""
"Detect unconnected parts in the given model(s) and split them into separate "
"objects."
@@ -10523,27 +10651,27 @@ msgstr ""
"Detecteer niet-verbonden onderdelen in het model en deel ze op in "
"verschillende objecten."
-#: src/libslic3r/PrintConfig.cpp:3475
+#: src/libslic3r/PrintConfig.cpp:3485
msgid "Scale to Fit"
msgstr "Verschaal naar passing"
-#: src/libslic3r/PrintConfig.cpp:3476
+#: src/libslic3r/PrintConfig.cpp:3486
msgid "Scale to fit the given volume."
msgstr "Verschaal naar passing in het gegeven volume."
-#: src/libslic3r/PrintConfig.cpp:3485
+#: src/libslic3r/PrintConfig.cpp:3495
msgid "Ignore non-existent config files"
msgstr "Negeer niet-bestaande configuratiebestanden"
-#: src/libslic3r/PrintConfig.cpp:3486
+#: src/libslic3r/PrintConfig.cpp:3496
msgid "Do not fail if a file supplied to --load does not exist."
msgstr "Geef geen fout als een bestand om te laden niet bestaat."
-#: src/libslic3r/PrintConfig.cpp:3489
+#: src/libslic3r/PrintConfig.cpp:3499
msgid "Load config file"
msgstr "Laad configuratiebestand"
-#: src/libslic3r/PrintConfig.cpp:3490
+#: src/libslic3r/PrintConfig.cpp:3500
msgid ""
"Load configuration from the specified file. It can be used more than once to "
"load options from multiple files."
@@ -10551,11 +10679,11 @@ msgstr ""
"Laad configuratie uit een specifiek bestand. Dit kan meerdere keren gebruikt "
"worden om instellingen uit meerdere bestanden te laden."
-#: src/libslic3r/PrintConfig.cpp:3493
+#: src/libslic3r/PrintConfig.cpp:3503
msgid "Output File"
msgstr "Outputbestand"
-#: src/libslic3r/PrintConfig.cpp:3494
+#: src/libslic3r/PrintConfig.cpp:3504
msgid ""
"The file where the output will be written (if not specified, it will be "
"based on the input file)."
@@ -10563,11 +10691,11 @@ msgstr ""
"Het bestand waaroverheen wordt geschreven (als dit niet aangegeven is, wort "
"dit gebaseerd op het inputbestand)."
-#: src/libslic3r/PrintConfig.cpp:3504
+#: src/libslic3r/PrintConfig.cpp:3514
msgid "Data directory"
msgstr "Bestandslocatie voor de data"
-#: src/libslic3r/PrintConfig.cpp:3505
+#: src/libslic3r/PrintConfig.cpp:3515
msgid ""
"Load and store settings at the given directory. This is useful for "
"maintaining different profiles or including configurations from a network "
@@ -10577,11 +10705,11 @@ msgstr ""
"verschillende profielen of het opnemen van configuraties van een "
"netwerkopslag."
-#: src/libslic3r/PrintConfig.cpp:3508
+#: src/libslic3r/PrintConfig.cpp:3518
msgid "Logging level"
msgstr "Logboekniveau"
-#: src/libslic3r/PrintConfig.cpp:3509
+#: src/libslic3r/PrintConfig.cpp:3519
msgid ""
"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:"
"trace\n"
@@ -10591,11 +10719,11 @@ msgstr ""
"debug, 5: traceer\n"
"Voorbeeld: loglevel = 2 geeft fataal-, fout- en waarschuwingslevelberichten."
-#: src/libslic3r/PrintConfig.cpp:3515
+#: src/libslic3r/PrintConfig.cpp:3525
msgid "Render with a software renderer"
msgstr "Render met software-renderer"
-#: src/libslic3r/PrintConfig.cpp:3516
+#: src/libslic3r/PrintConfig.cpp:3526
msgid ""
"Render with a software renderer. The bundled MESA software renderer is "
"loaded instead of the default OpenGL driver."
diff --git a/resources/localization/pl/PrusaSlicer.mo b/resources/localization/pl/PrusaSlicer.mo
index 6b70e132bd..b81f880a1b 100644
Binary files a/resources/localization/pl/PrusaSlicer.mo and b/resources/localization/pl/PrusaSlicer.mo differ
diff --git a/resources/localization/pl/PrusaSlicer_pl.po b/resources/localization/pl/PrusaSlicer_pl.po
index 7ad85d44cc..d360128fcc 100644
--- a/resources/localization/pl/PrusaSlicer_pl.po
+++ b/resources/localization/pl/PrusaSlicer_pl.po
@@ -5,7 +5,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
@@ -337,6 +337,10 @@ msgstr "Wyrażenie logiczne (Boole'owskie) używające wartości konfiguracji ak
msgid "A boolean expression using the configuration values of an active printer profile. If this expression evaluates to true, this profile is considered compatible with the active printer profile."
msgstr "Wyrażenie logiczne (Boole'owskie) używające wartości konfiguracji aktywnego profilu drukarki. Jeśli to wyrażenie jest prawdziwe to znaczy, że aktywny profil jest kompatybilny z drukarką."
+#: src/slic3r/GUI/Tab.cpp:975
+msgid "A copy of the current system preset will be created, which will be detached from the system preset."
+msgstr "Zostanie utworzona kopia obecnego zestawu ustawień i odłączona od ustawień systemowych."
+
#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "Generalną zasadą jest 160 do 230 °C dla PLA i 215 do 250 °C dla ABS."
@@ -1032,7 +1036,7 @@ msgstr "Mosty objętościowe"
#: src/slic3r/GUI/Plater.cpp:534 src/slic3r/GUI/Tab.cpp:1117
msgid "Brim"
-msgstr "Brim (obramowanie)"
+msgstr "Brim"
#: src/libslic3r/PrintConfig.cpp:244
msgid "Brim width"
@@ -1088,6 +1092,34 @@ msgstr "Anulowanie..."
msgid "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
msgstr "Nie można przeliczyć szerokości ekstruzji dla %1%: zmienna \"%2%\" jest niedostępna."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3017
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"Current layer range overlaps with the next layer range."
+msgstr ""
+"Nie można wstawić nowego zakresu wysokości po obecnym.\n"
+"Zakres pokrywałby się z kolejnym."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3008
+msgid ""
+"Cannot insert a new layer range after the current layer range.\n"
+"The next layer range is too thin to be split to two\n"
+"without violating the minimum layer height."
+msgstr ""
+"Nie można wstawić nowego zakresu wysokości po obecnym.\n"
+"Kolejny zakres jest zbyt niski, aby można było go podzielić\n"
+"z powodu minimalnej grubości warstwy."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3012
+msgid ""
+"Cannot insert a new layer range between the current and the next layer range.\n"
+"The gap between the current layer range and the next layer range\n"
+"is thinner than the minimum layer height allowed."
+msgstr ""
+"Nie można wstawić nowego zakresu wysokości pomiędzy obecne.\n"
+"Odstęp pomiędzy zakresami jest niższy \n"
+"niż dozwolona minimalna wysokość warstwy."
+
#: src/slic3r/GUI/Tab.cpp:3073
msgid "Cannot overwrite a system profile."
msgstr "Nie można nadpisać profilu systemowego."
@@ -1561,19 +1593,14 @@ msgstr "Sześcienny"
msgid "Current mode is %s"
msgstr "Obecny tryb to %s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "Obecny zestaw ustawień jest dziedziczony z"
+
#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "Obecny zestaw ustawień jest dziedziczony z zestawu domyślnego."
-#: src/slic3r/GUI/Tab.cpp:960
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Obecny zestaw ustawień jest dziedziczony z:\n"
-"%s"
-
#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Obecna wersja:"
@@ -1873,6 +1900,18 @@ msgstr "Odznaczenie prostokątem"
msgid "Deselects all objects"
msgstr "Odznacza wszystkie modele"
+#: src/slic3r/GUI/Tab.cpp:963
+msgid "Detach from system preset"
+msgstr "Odłącz od ustawień systemowych"
+
+#: src/slic3r/GUI/Tab.cpp:984
+msgid "Detach preset"
+msgstr "Odłącz zestaw ustawień"
+
+#: src/slic3r/GUI/Tab.cpp:3029
+msgid "Detached"
+msgstr "Odłączono"
+
#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Wykrywanie mostów przy obrysach"
@@ -2021,14 +2060,6 @@ msgstr ""
"Kliknij TAK, jeśli chcesz zmienić wartość na %s %%,\n"
"lub NIE, jeśli masz pewność, że %s %s jest prawidłową wartością."
-#: src/slic3r/GUI/ConfigWizard.cpp:1761
-msgid "Do you want to automatic select default filaments?"
-msgstr "Czy chcesz automatycznie wybrać domyślne filamenty?"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1772
-msgid "Do you want to automatic select default materials?"
-msgstr "Czy chcesz automatycznie wybrać domyślne materiały?"
-
#: src/slic3r/GUI/DoubleSlider.cpp:1920
msgid "Do you want to delete all saved tool changes?"
msgstr "Czy chcesz usunąć wszystkie zmiany narzędzi?"
@@ -2045,6 +2076,14 @@ msgstr "Czy chcesz spróbować ponownie"
msgid "Do you want to save your manually edited support points?"
msgstr "Czy chcesz zapisać ręcznie edytowane punkty podpór?"
+#: src/slic3r/GUI/ConfigWizard.cpp:1834
+msgid "Do you want to select default filaments for these FFF printer models?"
+msgstr "Czy chcesz ustawić domyślne filamenty dla tych modeli drukarek FFF?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1852
+msgid "Do you want to select default SLA materials for these printer models?"
+msgstr "Czy chcesz ustawić domyślne materiały SLA dla tych modeli drukarek?"
+
#: src/libslic3r/PrintConfig.cpp:3429
msgid "Don't arrange"
msgstr "Nie układaj"
@@ -2061,6 +2100,10 @@ msgstr "Nie używaj podpór pod mostami"
msgid "Downgrade"
msgstr "Deaktualizacja"
+#: src/libslic3r/PrintConfig.cpp:1695
+msgid "Draft shield"
+msgstr "Draft shield"
+
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1368
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1369
@@ -2136,6 +2179,23 @@ msgstr "Edytuj zaznaczenie - kliknij prawym przyciskiem"
msgid "Editing"
msgstr "Edytowanie"
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Ejec&t SD card / Flash drive"
+msgstr "Wysuń kar&tę SD / pamięć flash"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Eject SD card / Flash drive"
+msgstr "Wysuń kartę SD / pamięć flash"
+
+#: src/slic3r/GUI/MainFrame.cpp:547
+msgid "Eject SD card / Flash drive after the G-code was exported to it."
+msgstr "Wysuń kartę SD / pamięć flash po wyeksportowaniu na nią G-code."
+
+#: src/slic3r/GUI/Plater.cpp:2202
+#, c-format
+msgid "Ejecting of device %s(%s) has failed."
+msgstr "Wysuwanie urządzenia %s(%s) nie powiodło się."
+
#: src/libslic3r/PrintConfig.cpp:118
msgid "Elephant foot compensation"
msgstr "Kompensacja \"stopy słonia\""
@@ -2426,6 +2486,10 @@ msgstr "Eksport zawartości stołu jako AMF"
msgid "Export current plate as G-code"
msgstr "Eksport zawartości stołu jako G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export current plate as G-code to SD card / Flash drive"
+msgstr "Eksport zawartości stołu jako G-gode na kartę SD / pamięć flash"
+
#: src/slic3r/GUI/MainFrame.cpp:486
msgid "Export current plate as STL"
msgstr "Eksport zawartości stołu jako STL"
@@ -2447,6 +2511,10 @@ msgstr "Eksport pełnych ścieżek źródłowych modeli i części do plików 3M
msgid "Export G-code"
msgstr "Eksport G-code"
+#: src/slic3r/GUI/MainFrame.cpp:521
+msgid "Export G-code to SD card / Flash drive"
+msgstr "Eksport G-gode na kartę SD / pamięć flash"
+
#: src/libslic3r/PrintConfig.cpp:3320
msgid "Export OBJ"
msgstr "Eksport OBJ"
@@ -2948,10 +3016,10 @@ msgid "For support enforcers only"
msgstr "Tylko dla wymuszania podpór"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3265
+#: src/slic3r/GUI/Tab.cpp:3267
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"dla lewego przycisku: wskazuje na niesystemowy (lub inny niż domyślny) zestaw ustawień,\n"
"dla prawego przycisku: wskazuje, że ustawienia nie zostały zmodyfikowane."
@@ -3364,16 +3432,6 @@ msgstr "Plik certyfikatu HTTPS CA"
msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
msgstr "Plik HTTPS CA jest opcjonalny. Jest potrzebny jedynie w sytuacji, gdy używasz HTTPS z certyfikatem samopodpisanym."
-#: src/slic3r/GUI/Tab.cpp:1757
-#, c-format
-msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-"Plik certyfikatu HTTPS:\n"
-"W tym systemie, %s używa certyfikatu HTTPS z magazynu systemowego (Certificate Store) lub Keychain. Aby użyć własnego certyfikatu, zaimportuj plik do Certificate Store / Keychain."
-
#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Rozmiar ikon w odniesieniu do domyślnego"
@@ -3424,6 +3482,10 @@ msgstr "Włączenie powoduje pobieranie wbudowanych systemowych zestawów ustawi
msgid "If enabled, the 3D scene will be rendered in Retina resolution. If you are experiencing 3D performance problems, disabling this option may help."
msgstr "Po włączeniu podgląd 3D będzie renderowany w rozdzielczości Retina. Wyłącz tę opcję w przypadku wystąpienia problemów z wydajnością 3D."
+#: src/libslic3r/PrintConfig.cpp:1696
+msgid "If enabled, the skirt will be as tall as a highest printed object. This is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft."
+msgstr "Po włączeniu, wysokość skirt będzie taka sama, jak najwyższego modelu. Przydaje się podczas druku z ABS lub ASA - chroni wydruk przed podwijaniem się i odklejaniem od stołu przez przeciąg."
+
#: src/libslic3r/PrintConfig.cpp:1858
msgid "If enabled, the wipe tower will not be printed on layers with no toolchanges. On layers with a toolchange, extruder will travel downward to print the wipe tower. User is responsible for ensuring there is no collision with the print."
msgstr "Po włączeniu wieża czyszcząca nie będzie drukowana na warstwach, na których nie ma zmian koloru. Na kolejnych warstwach ze zmianami koloru ekstruder zjedzie w dół, aby kontynuować czyszczenie na wieży. Użytkownik musi upewnić się, że nie nastąpi kolizja głowicy z wydrukiem."
@@ -3572,7 +3634,7 @@ msgid ""
"indicates that some settings were changed and are not equal to the system (or default) values for the current option group.\n"
"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system (or default) values."
msgstr ""
-"oznacza, że niektóre ustawienia zostały zmodyfikowane i nie odpowiadają wartościom systemowym (lub domyślnym) w obecnej grupie opcji. \n"
+"oznacza, że niektóre ustawienia zostały zmodyfikowane i nie odpowiadają wartościom systemowym (lub domyślnym) w obecnej grupie opcji.\n"
"Kliknij ikonę OTWARTEJ KŁÓDKI, aby zresetować wszystkie ustawienia obecnej grupy ustawień do wartości systemowych (lub domyślnych)."
#. TRN Description for "LOCKED LOCK"
@@ -4003,7 +4065,7 @@ msgstr "Wczytaj kształt z STL..."
#: src/slic3r/GUI/BedShapeDialog.cpp:182 src/slic3r/GUI/BedShapeDialog.cpp:261
msgid "Load..."
-msgstr "Załaduje..."
+msgstr "Otwórz..."
#: src/slic3r/GUI/WipeTowerDialog.cpp:264
msgid "loaded"
@@ -4116,6 +4178,10 @@ msgstr "Max"
msgid "Max bridge length"
msgstr "Maksymalna długość mostu"
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Maks. liczba mostków na słupku"
+
#: src/libslic3r/PrintConfig.cpp:2822
msgid "Max merge distance"
msgstr "Maksymalny dystans łączenia"
@@ -4284,6 +4350,10 @@ msgstr "Maksymalny jerk Y"
msgid "Maximum jerk Z"
msgstr "Maksymalny jerk Z"
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid "Maximum number of bridges that can be placed on a pillar. Bridges hold support point pinheads and connect to pillars as small branches."
+msgstr "Maksymalna liczba mostków, która zostanie umieszczona na słupku podpory. Mostki wspierają łączniki podpór i łączą słupki podpór."
+
#: src/libslic3r/PrintConfig.cpp:598
msgid "Maximum volumetric speed allowed for this filament. Limits the maximum volumetric speed of a print to the minimum of print and filament volumetric speed. Set to zero for no limit."
msgstr "Maksymalna prędkość objętościowa dla tego filamentu. Ogranicza maksymalną prędkość objętościową do minimum objętościowej prędkości druku i filamentu. Ustaw zero aby usunąć ograniczenie."
@@ -4582,6 +4652,10 @@ msgstr "Ukończono naprawę modelu"
msgid "Model repaired successfully"
msgstr "Model naprawiono pomyślnie"
+#: src/slic3r/GUI/Tab.cpp:979
+msgid "Modifications to the current profile will be saved."
+msgstr "Modyfikacje zostaną zapisane na obecnym profilu."
+
#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "zmodyfikowano"
@@ -4954,6 +5028,11 @@ msgstr "obecnego Modelu"
msgid "Offset"
msgstr "Offset"
+#: src/slic3r/GUI/Tab.cpp:1755
+#, c-format
+msgid "On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
+msgstr "W tym systemie, %s używa certyfikatu HTTPS z magazynu systemowego (Certificate Store) lub Keychain."
+
#: src/slic3r/GUI/DoubleSlider.cpp:950
msgid "One layer mode"
msgstr "Tryb jednej warstwy"
@@ -5374,10 +5453,10 @@ msgstr "Zestaw ustawień (%s)"
msgid "Preset with name \"%1%\" already exists."
msgstr "Zestaw ustawień o nazwie \"%1%\" już istnieje."
-#: src/slic3r/GUI/Tab.cpp:3045
+#: src/slic3r/GUI/Tab.cpp:3029
msgctxt "PresetName"
-msgid "%1% - Copy"
-msgstr "%1% - Kopia"
+msgid "Copy"
+msgstr "Kopia"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
msgid "Press to activate deselection rectangle"
@@ -5852,7 +5931,7 @@ msgstr "Niższa szczegółowość"
#: src/slic3r/GUI/Plater.cpp:879
msgid "Remove device"
-msgstr "Usuń urządzenie"
+msgstr "Odłącz urządzenie"
#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:182
msgid "Remove extruder from sequence"
@@ -5899,9 +5978,9 @@ msgstr "Usuń zaznaczone punkty"
msgid "Remove the selected object"
msgstr "Usuń wybrany model"
-#: src/slic3r/GUI/ConfigWizard.cpp:438
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Usuń profile użytkownika - czysta instalacja (najpierw zostanie wykonany zrzut)"
+#: src/slic3r/GUI/ConfigWizard.cpp:453
+msgid "Remove user profiles (a snapshot will be taken beforehand)"
+msgstr "Usuń profile użytkownika (zostanie wykonany zrzut)"
#: src/slic3r/GUI/GUI_ObjectList.cpp:1636
msgid "Rename"
@@ -6423,8 +6502,8 @@ msgstr "Wybierz rodzaj potrzebnych podpór"
#: src/slic3r/GUI/DoubleSlider.cpp:1917
msgid ""
"Select YES if you want to delete all saved tool changes, \n"
-"\tNO if you want all tool changes switch to color changes, \n"
-"\tor CANCEL to leave it unchanged."
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
msgstr ""
"Wybierz TAK, jeśli chcesz usunąć wszystkie zapisane zmiany narzędzi,\n"
"NIE, jeśli chcesz przełączyć zmiany narzędzi na zmiany koloru lub\n"
@@ -7582,6 +7661,10 @@ msgstr ""
"Nie znaleziono urządzenia %s .\n"
"Jeśli urządzenie jest podłączone, to naciśnij przycisk Reset obok złącza USB ..."
+#: src/slic3r/GUI/Tab.cpp:976
+msgid "The current custom preset will be detached from the parent system preset."
+msgstr "Obecny niestandardowy zestaw ustawień zostanie odłączony od dziedziczącego zestawu systemowego."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
msgid ""
"The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
@@ -7644,6 +7727,14 @@ msgstr "Pierwsza warstwa zostanie zmniejszona o tą wartość w osiach X i Y aby
msgid "the following characters are not allowed:"
msgstr "następujące znaki nie są dozwolone:"
+#: src/slic3r/GUI/ConfigWizard.cpp:1830
+msgid "The following FFF printer models have no filament selected:"
+msgstr "Następujące modele drukarek FFF nie mają przypisanych filamentów:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1848
+msgid "The following SLA printer models have no materials selected:"
+msgstr "Następujące modele drukarek SLA nie mają przypisanych materiałów:"
+
#: src/slic3r/GUI/Tab.cpp:3461
msgid "the following suffix is not allowed:"
msgstr "następujący sufiks nie jest dozwolony:"
@@ -7738,9 +7829,13 @@ msgstr "Wybrany model nie może być podzielony ponieważ składa się z więcej
msgid "The selected object couldn't be split because it contains only one part."
msgstr "Wybrany model nie może być rozdzielony ponieważ zawiera tylko jedną część."
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "The selected project is no more available"
-msgstr "Wybrany projekt nie jest dostępny"
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list?"
+msgstr ""
+"Wybrany obiekt nie jest już dostępny.\n"
+"Czy chcesz usunąć go z listy niedawno używanych projektów?"
#: src/slic3r/GUI/DoubleSlider.cpp:998
msgid ""
@@ -7911,6 +8006,14 @@ msgstr ""
msgid "This %s version: %s"
msgstr "%s wersja: %s"
+#: src/slic3r/GUI/Tab.cpp:982
+msgid ""
+"This action is not revertable.\n"
+"Do you want to proceed?"
+msgstr ""
+"Tej czynności nie można odwrócić.\n"
+"Czy chcesz kontynuować?"
+
#: src/libslic3r/PrintConfig.cpp:165
msgid "This code is inserted between objects when using sequential printing. By default extruder and bed temperature are reset using non-wait command; however if M104, M109, M140 or M190 are detected in this custom code, Slic3r will not add temperature commands. Note that you can use placeholder variables for all Slic3r settings, so you can put a \"M109 S[first_layer_temperature]\" command wherever you want."
msgstr "Ten kod jest wykonywany pomiędzy drukiem poszczególnych modeli w trybie druku sekwencyjnego. Domyślnie przy komendzie non-wait temperatury dyszy i stołu są resetowane; jednakże jeśli przy tej opcji zostaną użyte komendy M104, M109, M140 lub M190 to Slic3r nie doda własnych komend do kontroli temperatury. Pamiętaj, że możesz używać zmiennych typu placeholder, więc np. komendę \"M109 S[first_layer_temperature]\" (temperatura pierwszej warstwy) możesz umieścić gdzie chcesz."
@@ -8080,7 +8183,7 @@ msgid "This is the lowest printable layer height for this extruder and limits th
msgstr "To jest najniższa możliwa do wydrukowania wysokość warstwy dla tego ekstrudera i jednocześnie dolny limit dla funkcji zmiennej wysokości warstwy. Zazwyczaj jest to 0.05 lub 0.1 mm."
#: src/libslic3r/GCode.cpp:639
-msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
+msgid "This is usually caused by negligibly small extrusions or by a faulty model. Try to repair the model or change its orientation on the bed."
msgstr "Dzieje się to zazwyczaj z powodu zbyt małych odcinków ekstruzji (są one pomijane) lub uszkodzenia modelu. Spróbuj naprawić model lub zmienić jego orientację na stole."
#: src/libslic3r/PrintConfig.cpp:2215
@@ -8224,6 +8327,10 @@ msgstr "Do modeli"
msgid "To parts"
msgstr "Na części"
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid "To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Aby użyć własnego certyfikatu, zaimportuj plik do Certificate Store / Keychain."
+
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
#, c-format
msgid "Toggle %c axis mirroring"
@@ -8981,14 +9088,6 @@ msgstr "Nie możesz wczytać projektu SLA mając na stole wieloczęściowy model
msgid "You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr "Nie możesz używać skalowania nierównomiernego dla kliku modeli/części"
-#: src/slic3r/GUI/ConfigWizard.cpp:1760
-msgid "You have to select at least one filament for selected printers"
-msgstr "Musisz wybrać co najmniej jeden filament dla zaznaczonych drukarek"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1771
-msgid "You have to select at least one material for selected printers"
-msgstr "Musisz wybrać co najmniej jeden materiał dla zaznaczonych drukarek"
-
#: src/slic3r/GUI/GLCanvas3DManager.cpp:287
msgid "You may need to update your graphics card driver."
msgstr "Może być wymagana aktualizacja sterowników karty graficznej."
diff --git a/resources/localization/pt_br/PrusaSlicer.mo b/resources/localization/pt_br/PrusaSlicer.mo
index 0c01dd31a2..152f1e2a16 100644
Binary files a/resources/localization/pt_br/PrusaSlicer.mo and b/resources/localization/pt_br/PrusaSlicer.mo differ
diff --git a/resources/localization/pt_br/PrusaSlicer_pt_br.po b/resources/localization/pt_br/PrusaSlicer_pt_br.po
index 30c0687a58..30b3eb569a 100644
--- a/resources/localization/pt_br/PrusaSlicer_pt_br.po
+++ b/resources/localization/pt_br/PrusaSlicer_pt_br.po
@@ -7,27 +7,27 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 16:39+0200\n"
-"PO-Revision-Date: 2019-12-21 19:55-0300\n"
+"POT-Creation-Date: 2020-03-05 13:51+0100\n"
+"PO-Revision-Date: 2020-03-11 09:32-0300\n"
+"Last-Translator: \n"
"Language-Team: \n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 2.2.4\n"
-"Last-Translator: \n"
-"Language: pt_BR\n"
-#: src/slic3r/GUI/AboutDialog.cpp:39 src/slic3r/GUI/AboutDialog.cpp:291
+#: src/slic3r/GUI/AboutDialog.cpp:41 src/slic3r/GUI/AboutDialog.cpp:294
msgid "Portions copyright"
msgstr "Direitos autorais das partes"
-#: src/slic3r/GUI/AboutDialog.cpp:127 src/slic3r/GUI/AboutDialog.cpp:256
+#: src/slic3r/GUI/AboutDialog.cpp:129 src/slic3r/GUI/AboutDialog.cpp:258
msgid "Copyright"
msgstr "Direitos autorais"
#. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:129
+#: src/slic3r/GUI/AboutDialog.cpp:131
msgid ""
"License agreements of all following programs (libraries) are part of "
"application license agreement"
@@ -35,25 +35,25 @@ msgstr ""
"Os contratos de licença de todos os seguintes programas (bibliotecas) são "
"parte do contrato de licença de aplicativo"
-#: src/slic3r/GUI/AboutDialog.cpp:199
+#: src/slic3r/GUI/AboutDialog.cpp:201
#, c-format
msgid "About %s"
msgstr "Sobre %s"
-#: src/slic3r/GUI/AboutDialog.cpp:231 src/slic3r/GUI/MainFrame.cpp:62
+#: src/slic3r/GUI/AboutDialog.cpp:233 src/slic3r/GUI/MainFrame.cpp:64
msgid "Version"
msgstr "Versão"
#. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:258
+#: src/slic3r/GUI/AboutDialog.cpp:260
msgid "is licensed under the"
msgstr "está licenciado sobre o(a)"
-#: src/slic3r/GUI/AboutDialog.cpp:259
+#: src/slic3r/GUI/AboutDialog.cpp:261
msgid "GNU Affero General Public License, version 3"
msgstr "Licensa GNU Affero General Public, versão 3"
-#: src/slic3r/GUI/AboutDialog.cpp:260
+#: src/slic3r/GUI/AboutDialog.cpp:262
msgid ""
"PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap "
"community."
@@ -61,7 +61,7 @@ msgstr ""
"PrusaSlicer é baseado no Slic3r criado por Alessandro Ranellucci e a "
"comunidade RepRap."
-#: src/slic3r/GUI/AboutDialog.cpp:261
+#: src/slic3r/GUI/AboutDialog.cpp:263
msgid ""
"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, "
"Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and "
@@ -71,7 +71,17 @@ msgstr ""
"Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik e "
"outros."
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:92
+#: src/slic3r/GUI/AppConfig.cpp:114
+msgid ""
+"Error parsing PrusaSlicer config file, it is probably corrupted. Try to "
+"manually delete the file to recover from the error. Your user profiles will "
+"not be affected."
+msgstr ""
+"Erro de análise da config do arquivo, ele provavelmente está corrompido. "
+"Tente excluir manualmente o arquivo para recuperar do erro. Seus perfis de "
+"usuário não serão afetados."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:110
msgid ""
"Copying of the temporary G-code to the output G-code failed. Maybe the SD "
"card is write locked?"
@@ -79,25 +89,61 @@ msgstr ""
"A cópia do G-código provisório G-código falhou na saída. Talvez o cartão SD "
"está bloqueado para escrita?"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:93
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:415
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:113
+msgid ""
+"Copying of the temporary G-code to the output G-code failed. There might be "
+"problem with target device, please try exporting again or using different "
+"device. The corrupted output G-code is at %1%.tmp."
+msgstr ""
+"A cópia do G-code temporário para o G-code de saída falhou. Pode haver "
+"problemas com o dispositivo de destino, por favor tente exportar novamente "
+"ou usar dispositivo diferente. O G-code de saída corrompido está em %1%.tmp."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:116
+msgid ""
+"Renaming of the G-code after copying to the selected destination folder has "
+"failed. Current path is %1%.tmp. Please try exporting again."
+msgstr ""
+"A renomeação do G-code após a cópia na pasta de destino selecionada falhou. "
+"O caminho atual é %1%.tmp. Por favor, tente exportar de novo."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:119
+msgid ""
+"Copying of the temporary G-code has finished but the original code at %1% "
+"couldn't be opened during copy check. The output G-code is at %2%.tmp."
+msgstr ""
+"A cópia do código G temporário foi concluída, mas o código original em %1% "
+"não pôde ser aberto durante a verificação de cópia. O código G de saída está "
+"em %2%.tmp."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:122
+msgid ""
+"Copying of the temporary G-code has finished but the exported code couldn't "
+"be opened during copy check. The output G-code is at %1%.tmp."
+msgstr ""
+"A cópia do código G temporário foi concluída, mas o código exportado não "
+"pôde ser aberto durante a verificação de cópia. O código G de saída está em "
+"%1%.tmp."
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:129
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:479
msgid "Running post-processing scripts"
msgstr "Aplicando scripts de pós-processamento"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:95
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:131
msgid "G-code file exported to %1%"
msgstr "Arquivo G-code exportado para %1%"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:99
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:117
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:135
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:185
msgid "Slicing complete"
msgstr "Fatiamento completo"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:113
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:181
msgid "Masked SLA file exported to %1%"
msgstr "Arquivo SLA mascarado exportado para %1%"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:155
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:223
#, c-format
msgid ""
"%s has encountered an error. It was likely caused by running out of memory. "
@@ -108,37 +154,37 @@ msgstr ""
"você tem certeza que você tem RAM suficiente em seu sistema, isso também "
"pode ser um bug e nós estaríamos contentes se você relatou."
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:417
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:481
msgid "Copying of the temporary G-code to the output G-code failed"
msgstr "A cópia do G-código provisório G-código falhou na saída"
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:426
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:506
msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue"
msgstr "Agendando upload para ` %1%` . Veja a aba -> Print Host Upload Queue"
-#: src/slic3r/GUI/BedShapeDialog.cpp:65
+#: src/slic3r/GUI/BedShapeDialog.cpp:66 src/slic3r/GUI/GUI_ObjectList.cpp:2060
msgid "Shape"
msgstr "Forma"
-#: src/slic3r/GUI/BedShapeDialog.cpp:72
+#: src/slic3r/GUI/BedShapeDialog.cpp:73
msgid "Rectangular"
msgstr "Retangular"
-#: src/slic3r/GUI/BedShapeDialog.cpp:76
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:393 src/slic3r/GUI/Plater.cpp:145
-#: src/slic3r/GUI/Tab.cpp:2524
+#: src/slic3r/GUI/BedShapeDialog.cpp:77
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:232 src/slic3r/GUI/Plater.cpp:160
+#: src/slic3r/GUI/Tab.cpp:2326
msgid "Size"
msgstr "Tamanho"
-#: src/slic3r/GUI/BedShapeDialog.cpp:77
+#: src/slic3r/GUI/BedShapeDialog.cpp:78
msgid "Size in X and Y of the rectangular plate."
msgstr "Tamanho no X e Y na mesa retangular."
-#: src/slic3r/GUI/BedShapeDialog.cpp:83
+#: src/slic3r/GUI/BedShapeDialog.cpp:84
msgid "Origin"
msgstr "Origem"
-#: src/slic3r/GUI/BedShapeDialog.cpp:84
+#: src/slic3r/GUI/BedShapeDialog.cpp:85
msgid ""
"Distance of the 0,0 G-code coordinate from the front left corner of the "
"rectangle."
@@ -146,50 +192,55 @@ msgstr ""
"Distância do ponto 0,0 da coordenada do G-code do canto esquerdo do "
"retângulo."
-#: src/slic3r/GUI/BedShapeDialog.cpp:88
+#: src/slic3r/GUI/BedShapeDialog.cpp:89
msgid "Circular"
msgstr "Circular"
-#: src/slic3r/GUI/BedShapeDialog.cpp:91 src/slic3r/GUI/ConfigWizard.cpp:123
-#: src/slic3r/GUI/ConfigWizard.cpp:576 src/slic3r/GUI/ConfigWizard.cpp:590
+#: src/slic3r/GUI/BedShapeDialog.cpp:92 src/slic3r/GUI/ConfigWizard.cpp:218
+#: src/slic3r/GUI/ConfigWizard.cpp:970 src/slic3r/GUI/ConfigWizard.cpp:984
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:87
#: src/slic3r/GUI/GUI_ObjectLayers.cpp:135
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:390
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84 src/slic3r/GUI/wxExtensions.cpp:509
-#: src/libslic3r/PrintConfig.cpp:70 src/libslic3r/PrintConfig.cpp:77
-#: src/libslic3r/PrintConfig.cpp:86 src/libslic3r/PrintConfig.cpp:220
-#: src/libslic3r/PrintConfig.cpp:295 src/libslic3r/PrintConfig.cpp:303
-#: src/libslic3r/PrintConfig.cpp:353 src/libslic3r/PrintConfig.cpp:363
-#: src/libslic3r/PrintConfig.cpp:488 src/libslic3r/PrintConfig.cpp:499
-#: src/libslic3r/PrintConfig.cpp:517 src/libslic3r/PrintConfig.cpp:695
-#: src/libslic3r/PrintConfig.cpp:1215 src/libslic3r/PrintConfig.cpp:1276
-#: src/libslic3r/PrintConfig.cpp:1294 src/libslic3r/PrintConfig.cpp:1312
-#: src/libslic3r/PrintConfig.cpp:1364 src/libslic3r/PrintConfig.cpp:1374
-#: src/libslic3r/PrintConfig.cpp:1495 src/libslic3r/PrintConfig.cpp:1503
-#: src/libslic3r/PrintConfig.cpp:1544 src/libslic3r/PrintConfig.cpp:1552
-#: src/libslic3r/PrintConfig.cpp:1562 src/libslic3r/PrintConfig.cpp:1570
-#: src/libslic3r/PrintConfig.cpp:1578 src/libslic3r/PrintConfig.cpp:1661
-#: src/libslic3r/PrintConfig.cpp:1878 src/libslic3r/PrintConfig.cpp:1948
-#: src/libslic3r/PrintConfig.cpp:1982 src/libslic3r/PrintConfig.cpp:2176
-#: src/libslic3r/PrintConfig.cpp:2183 src/libslic3r/PrintConfig.cpp:2190
-#: src/libslic3r/PrintConfig.cpp:2220 src/libslic3r/PrintConfig.cpp:2230
-#: src/libslic3r/PrintConfig.cpp:2240 src/libslic3r/PrintConfig.cpp:2403
-#: src/libslic3r/PrintConfig.cpp:2510 src/libslic3r/PrintConfig.cpp:2519
-#: src/libslic3r/PrintConfig.cpp:2528 src/libslic3r/PrintConfig.cpp:2538
-#: src/libslic3r/PrintConfig.cpp:2582 src/libslic3r/PrintConfig.cpp:2592
-#: src/libslic3r/PrintConfig.cpp:2604 src/libslic3r/PrintConfig.cpp:2624
-#: src/libslic3r/PrintConfig.cpp:2634 src/libslic3r/PrintConfig.cpp:2644
-#: src/libslic3r/PrintConfig.cpp:2662 src/libslic3r/PrintConfig.cpp:2677
-#: src/libslic3r/PrintConfig.cpp:2691 src/libslic3r/PrintConfig.cpp:2704
-#: src/libslic3r/PrintConfig.cpp:2742 src/libslic3r/PrintConfig.cpp:2752
-#: src/libslic3r/PrintConfig.cpp:2761 src/libslic3r/PrintConfig.cpp:2771
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:333
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:94
+#: src/slic3r/GUI/WipeTowerDialog.cpp:85 src/libslic3r/PrintConfig.cpp:75
+#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:91
+#: src/libslic3r/PrintConfig.cpp:122 src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:246 src/libslic3r/PrintConfig.cpp:321
+#: src/libslic3r/PrintConfig.cpp:329 src/libslic3r/PrintConfig.cpp:379
+#: src/libslic3r/PrintConfig.cpp:505 src/libslic3r/PrintConfig.cpp:516
+#: src/libslic3r/PrintConfig.cpp:534 src/libslic3r/PrintConfig.cpp:712
+#: src/libslic3r/PrintConfig.cpp:1231 src/libslic3r/PrintConfig.cpp:1292
+#: src/libslic3r/PrintConfig.cpp:1310 src/libslic3r/PrintConfig.cpp:1328
+#: src/libslic3r/PrintConfig.cpp:1384 src/libslic3r/PrintConfig.cpp:1394
+#: src/libslic3r/PrintConfig.cpp:1516 src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1565 src/libslic3r/PrintConfig.cpp:1573
+#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1591
+#: src/libslic3r/PrintConfig.cpp:1599 src/libslic3r/PrintConfig.cpp:1682
+#: src/libslic3r/PrintConfig.cpp:1914 src/libslic3r/PrintConfig.cpp:1985
+#: src/libslic3r/PrintConfig.cpp:2019 src/libslic3r/PrintConfig.cpp:2147
+#: src/libslic3r/PrintConfig.cpp:2226 src/libslic3r/PrintConfig.cpp:2233
+#: src/libslic3r/PrintConfig.cpp:2240 src/libslic3r/PrintConfig.cpp:2270
+#: src/libslic3r/PrintConfig.cpp:2280 src/libslic3r/PrintConfig.cpp:2290
+#: src/libslic3r/PrintConfig.cpp:2450 src/libslic3r/PrintConfig.cpp:2484
+#: src/libslic3r/PrintConfig.cpp:2623 src/libslic3r/PrintConfig.cpp:2632
+#: src/libslic3r/PrintConfig.cpp:2641 src/libslic3r/PrintConfig.cpp:2651
+#: src/libslic3r/PrintConfig.cpp:2705 src/libslic3r/PrintConfig.cpp:2715
+#: src/libslic3r/PrintConfig.cpp:2727 src/libslic3r/PrintConfig.cpp:2747
+#: src/libslic3r/PrintConfig.cpp:2757 src/libslic3r/PrintConfig.cpp:2767
+#: src/libslic3r/PrintConfig.cpp:2785 src/libslic3r/PrintConfig.cpp:2800
+#: src/libslic3r/PrintConfig.cpp:2814 src/libslic3r/PrintConfig.cpp:2825
+#: src/libslic3r/PrintConfig.cpp:2838 src/libslic3r/PrintConfig.cpp:2883
+#: src/libslic3r/PrintConfig.cpp:2893 src/libslic3r/PrintConfig.cpp:2902
+#: src/libslic3r/PrintConfig.cpp:2912 src/libslic3r/PrintConfig.cpp:2928
+#: src/libslic3r/PrintConfig.cpp:2952
msgid "mm"
msgstr "mm"
-#: src/slic3r/GUI/BedShapeDialog.cpp:92 src/libslic3r/PrintConfig.cpp:692
+#: src/slic3r/GUI/BedShapeDialog.cpp:93 src/libslic3r/PrintConfig.cpp:709
msgid "Diameter"
msgstr "Diâmetro"
-#: src/slic3r/GUI/BedShapeDialog.cpp:93
+#: src/slic3r/GUI/BedShapeDialog.cpp:94
msgid ""
"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
"center."
@@ -197,67 +248,71 @@ msgstr ""
"Diâmetro da mesa de impressão. Se assume que a origem (0,0) seja localizado "
"no centro."
-#: src/slic3r/GUI/BedShapeDialog.cpp:97 src/slic3r/GUI/GUI_Preview.cpp:247
-#: src/libslic3r/GCode/PreviewData.cpp:159
+#: src/slic3r/GUI/BedShapeDialog.cpp:98 src/slic3r/GUI/GUI_Preview.cpp:249
+#: src/libslic3r/ExtrusionEntity.cpp:322
msgid "Custom"
msgstr "Customizado"
-#: src/slic3r/GUI/BedShapeDialog.cpp:101
+#: src/slic3r/GUI/BedShapeDialog.cpp:102
msgid "Load shape from STL..."
msgstr "Carregar forma do STL..."
-#: src/slic3r/GUI/BedShapeDialog.cpp:154
+#: src/slic3r/GUI/BedShapeDialog.cpp:155
msgid "Settings"
-msgstr "config."
+msgstr "Config."
-#: src/slic3r/GUI/BedShapeDialog.cpp:171
+#: src/slic3r/GUI/BedShapeDialog.cpp:172
msgid "Texture"
msgstr "Textura"
-#: src/slic3r/GUI/BedShapeDialog.cpp:181 src/slic3r/GUI/BedShapeDialog.cpp:249
+#: src/slic3r/GUI/BedShapeDialog.cpp:182 src/slic3r/GUI/BedShapeDialog.cpp:261
msgid "Load..."
msgstr "Carregar..."
-#: src/slic3r/GUI/BedShapeDialog.cpp:189 src/slic3r/GUI/BedShapeDialog.cpp:257
-#: src/slic3r/GUI/Tab.cpp:3286
+#: src/slic3r/GUI/BedShapeDialog.cpp:190 src/slic3r/GUI/BedShapeDialog.cpp:269
+#: src/slic3r/GUI/Tab.cpp:3126
msgid "Remove"
msgstr "Remover"
-#: src/slic3r/GUI/BedShapeDialog.cpp:239
+#: src/slic3r/GUI/BedShapeDialog.cpp:223 src/slic3r/GUI/BedShapeDialog.cpp:302
+msgid "Not found:"
+msgstr "Não encontrado:"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:251
msgid "Model"
msgstr "Modelo"
-#: src/slic3r/GUI/BedShapeDialog.cpp:464
+#: src/slic3r/GUI/BedShapeDialog.cpp:487
msgid "Choose an STL file to import bed shape from:"
msgstr "Escolha um arquivo STL para importar o formato da mesa:"
-#: src/slic3r/GUI/BedShapeDialog.cpp:471 src/slic3r/GUI/BedShapeDialog.cpp:520
-#: src/slic3r/GUI/BedShapeDialog.cpp:543
+#: src/slic3r/GUI/BedShapeDialog.cpp:494 src/slic3r/GUI/BedShapeDialog.cpp:543
+#: src/slic3r/GUI/BedShapeDialog.cpp:566
msgid "Invalid file format."
msgstr "Formato de arquivo inválido."
-#: src/slic3r/GUI/BedShapeDialog.cpp:482
+#: src/slic3r/GUI/BedShapeDialog.cpp:505
msgid "Error! Invalid model"
msgstr "Erro! Modelo inválido"
-#: src/slic3r/GUI/BedShapeDialog.cpp:490
+#: src/slic3r/GUI/BedShapeDialog.cpp:513
msgid "The selected file contains no geometry."
msgstr "O arquivo selecionado não contém geometria."
-#: src/slic3r/GUI/BedShapeDialog.cpp:494
+#: src/slic3r/GUI/BedShapeDialog.cpp:517
msgid ""
"The selected file contains several disjoint areas. This is not supported."
msgstr "O arquivo selecionado contém áreas não juntas. Isso não é suportado."
-#: src/slic3r/GUI/BedShapeDialog.cpp:509
+#: src/slic3r/GUI/BedShapeDialog.cpp:532
msgid "Choose a file to import bed texture from (PNG/SVG):"
msgstr "Escolher um arquivo para importar a textura da mesa (PNG/SVG):"
-#: src/slic3r/GUI/BedShapeDialog.cpp:532
+#: src/slic3r/GUI/BedShapeDialog.cpp:555
msgid "Choose an STL file to import bed model from:"
msgstr "Escolha um arquivo STL para importar o modelo da mesa:"
-#: src/slic3r/GUI/BedShapeDialog.hpp:59 src/slic3r/GUI/ConfigWizard.cpp:535
+#: src/slic3r/GUI/BedShapeDialog.hpp:59 src/slic3r/GUI/ConfigWizard.cpp:929
msgid "Bed Shape"
msgstr "Formato da mesa"
@@ -305,6 +360,154 @@ msgstr ""
"O valor foi mudado e não é igual ao valor do sistema ou da última config. "
"salva"
+#: src/slic3r/GUI/ConfigManipulation.cpp:48
+msgid ""
+"Zero layer height is not valid.\n"
+"\n"
+"The layer height will be reset to 0.01."
+msgstr ""
+"A altura de camada zero não é válida.\n"
+"\n"
+"A altura da camada será redefinida para 0.01."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:49
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27 src/slic3r/GUI/Tab.cpp:1048
+#: src/libslic3r/PrintConfig.cpp:71
+msgid "Layer height"
+msgstr "Altura da camada"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:60
+msgid ""
+"Zero first layer height is not valid.\n"
+"\n"
+"The first layer height will be reset to 0.01."
+msgstr ""
+"A altura zero da primeira camada não é válida.\n"
+"\n"
+"A altura da primeira camada será redefinida para 0.01."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:61 src/libslic3r/PrintConfig.cpp:889
+msgid "First layer height"
+msgstr "Altura da primeira camada"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:81
+#, no-c-format
+msgid ""
+"The Spiral Vase mode requires:\n"
+"- one perimeter\n"
+"- no top solid layers\n"
+"- 0% fill density\n"
+"- no support material\n"
+"- Ensure vertical shell thickness enabled\n"
+"- Detect thin walls disabled"
+msgstr ""
+"O modo Vaso Espiral requer:\n"
+"- um perímetro\n"
+"- sem camadas sólidas superiores\n"
+"- 0% de densidade de enchimento\n"
+"- nenhum material de suporte\n"
+"- habilitar opção Garantir a espessura da casca vertical\n"
+"- desativar opção Detectar paredes finas"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:89
+msgid "Shall I adjust those settings in order to enable Spiral Vase?"
+msgstr "Devo ajustar essas configurações para habilitar o Vaso Espiral?"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:90
+msgid "Spiral Vase"
+msgstr "Vaso espiral"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:115
+msgid ""
+"The Wipe Tower currently supports the non-soluble supports only\n"
+"if they are printed with the current extruder without triggering a tool "
+"change.\n"
+"(both support_material_extruder and support_material_interface_extruder need "
+"to be set to 0)."
+msgstr ""
+"A torre de limpeza suporta atualmente os suportes não-solúveis\n"
+" somente se são imprimidos com o extrusor atual sem provocar uma mudança da "
+"ferramenta. \n"
+"(ambos support_material_extruder e support_material_interface_extruder "
+"precisam ser definidos como 0)."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:119
+msgid "Shall I adjust those settings in order to enable the Wipe Tower?"
+msgstr "Devo ajustar essas configurações para ativar a Torre limpa?"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:120
+#: src/slic3r/GUI/ConfigManipulation.cpp:140
+msgid "Wipe Tower"
+msgstr "Torre de limpeza"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:136
+msgid ""
+"For the Wipe Tower to work with the soluble supports, the support layers\n"
+"need to be synchronized with the object layers."
+msgstr ""
+"Para que a torre de limpeza funcione com os suportes solúveis, as camadas de "
+"suporte precisam ser sincronizadas com as camadas de objeto."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:139
+msgid "Shall I synchronize support layers in order to enable the Wipe Tower?"
+msgstr "Devo sincronizar camadas de suporte para habilitar a Torre Limpa?"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:159
+msgid ""
+"Supports work better, if the following feature is enabled:\n"
+"- Detect bridging perimeters"
+msgstr ""
+"Os suportes funcionam melhor, se o seguinte recurso estiver ativado:\n"
+"- Detectar perímetros de ponte"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:162
+msgid "Shall I adjust those settings for supports?"
+msgstr "Devo ajustar essas configurações para suportes?"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:163
+msgid "Support Generator"
+msgstr "Gerador de suporte"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:208
+msgid "The %1% infill pattern is not supposed to work at 100%% density."
+msgstr ""
+"O padrão de preenchimento %1% não deve funcionar com 100%% de densidade."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:210
+msgid "Shall I switch to rectilinear fill pattern?"
+msgstr "Devo mudar para padrão de preenchimento retilíneo?"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:211
+#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:96
+#: src/slic3r/GUI/GUI_ObjectList.cpp:615 src/slic3r/GUI/Plater.cpp:527
+#: src/slic3r/GUI/Tab.cpp:1090 src/slic3r/GUI/Tab.cpp:1091
+#: src/libslic3r/PrintConfig.cpp:203 src/libslic3r/PrintConfig.cpp:416
+#: src/libslic3r/PrintConfig.cpp:436 src/libslic3r/PrintConfig.cpp:776
+#: src/libslic3r/PrintConfig.cpp:790 src/libslic3r/PrintConfig.cpp:827
+#: src/libslic3r/PrintConfig.cpp:981 src/libslic3r/PrintConfig.cpp:991
+#: src/libslic3r/PrintConfig.cpp:1009 src/libslic3r/PrintConfig.cpp:1028
+#: src/libslic3r/PrintConfig.cpp:1047 src/libslic3r/PrintConfig.cpp:1728
+#: src/libslic3r/PrintConfig.cpp:1745
+msgid "Infill"
+msgstr "Preenchimento"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:317
+msgid "Head penetration should not be greater than the head width."
+msgstr "A penetração da cabeça não deve ser maior do que a largura da cabeça."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:319
+msgid "Invalid Head penetration"
+msgstr "Penetração inválida da cabeça"
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:330
+msgid "Pinhead diameter should be smaller than the pillar diameter."
+msgstr ""
+"O diâmetro da cabeça de pino deve ser menor do que o diâmetro do pilar."
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:332
+msgid "Invalid pinhead diameter"
+msgstr "Diâmetro inválido da cabeça de pino"
+
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
msgid "Upgrade"
msgstr "Atualização"
@@ -325,104 +528,105 @@ msgstr "Usuário"
msgid "Unknown"
msgstr "Desconhecido"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:39
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
msgid "Active"
msgstr "Ativar"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "slic3r version"
-msgstr "versão do slic3r"
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
+msgid "PrusaSlicer version"
+msgstr "Versão do PrusaSlicer"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1311
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Preset.cpp:1533
msgid "print"
msgstr "impressão"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:47
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
msgid "filaments"
msgstr "filamentos"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:48 src/slic3r/GUI/Preset.cpp:1315
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53 src/slic3r/GUI/Preset.cpp:1537
msgid "printer"
msgstr "impressora"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52 src/slic3r/GUI/Tab.cpp:961
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57 src/slic3r/GUI/Tab.cpp:970
msgid "vendor"
msgstr "fornecedor"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
msgid "version"
msgstr "versão"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "min slic3r version"
-msgstr "versão mínima do slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55
-msgid "max slic3r version"
-msgstr "versão máxima do slic3r"
-
#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:58
+msgid "min PrusaSlicer version"
+msgstr "versão mínima do PrusaSlicer"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60
+msgid "max PrusaSlicer version"
+msgstr "versão máxima do PrusaSlicer"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:63
msgid "model"
msgstr "modelo"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:58
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:63
msgid "variants"
msgstr "variantes"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:70
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75
#, c-format
msgid "Incompatible with this %s"
msgstr "Incompatível com isso %s"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:73
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:78
msgid "Activate"
msgstr "Ativar"
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:99
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:104
msgid "Configuration Snapshots"
-msgstr "config. das versões"
+msgstr "Config. das versões"
-#: src/slic3r/GUI/ConfigWizard.cpp:123
+#: src/slic3r/GUI/ConfigWizard.cpp:218
msgid "nozzle"
msgstr "bico de impressão"
-#: src/slic3r/GUI/ConfigWizard.cpp:127
+#: src/slic3r/GUI/ConfigWizard.cpp:222
msgid "Alternate nozzles:"
msgstr "Alternar bicos:"
-#: src/slic3r/GUI/ConfigWizard.cpp:193
+#: src/slic3r/GUI/ConfigWizard.cpp:289
msgid "All standard"
msgstr "Todos padrão"
-#: src/slic3r/GUI/ConfigWizard.cpp:194 src/slic3r/GUI/Tab.cpp:3336
+#: src/slic3r/GUI/ConfigWizard.cpp:289
+msgid "Standard"
+msgstr "Todos padrão"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:290 src/slic3r/GUI/ConfigWizard.cpp:573
+#: src/slic3r/GUI/Tab.cpp:3176
msgid "All"
msgstr "Todos"
-#: src/slic3r/GUI/ConfigWizard.cpp:195 src/slic3r/GUI/Plater.cpp:469
-#: src/slic3r/GUI/Plater.cpp:607 src/libslic3r/GCode/PreviewData.cpp:146
+#: src/slic3r/GUI/ConfigWizard.cpp:291 src/slic3r/GUI/ConfigWizard.cpp:574
+#: src/slic3r/GUI/Plater.cpp:499 src/slic3r/GUI/Plater.cpp:639
+#: src/libslic3r/ExtrusionEntity.cpp:309
msgid "None"
msgstr "Nenhum"
-#: src/slic3r/GUI/ConfigWizard.cpp:301
+#: src/slic3r/GUI/ConfigWizard.cpp:427
#, c-format
msgid "Welcome to the %s Configuration Assistant"
msgstr "Bem-vindo ao %s Assistente de config."
-#: src/slic3r/GUI/ConfigWizard.cpp:303
+#: src/slic3r/GUI/ConfigWizard.cpp:429
#, c-format
msgid "Welcome to the %s Configuration Wizard"
msgstr "Bem-vindo ao %s Assistente de config."
-#: src/slic3r/GUI/ConfigWizard.cpp:305
+#: src/slic3r/GUI/ConfigWizard.cpp:431
msgid "Welcome"
msgstr "Bem-vindo(a)"
-#: src/slic3r/GUI/ConfigWizard.cpp:309 src/slic3r/GUI/GUI_App.cpp:793
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:311
+#: src/slic3r/GUI/ConfigWizard.cpp:433
#, c-format
msgid ""
"Hello, welcome to %s! This %s helps you with the initial configuration; just "
@@ -431,47 +635,59 @@ msgstr ""
"Olá, bem-vindo ao %s! Isso %s te ajuda com a config. inicial; com apenas "
"algumas config. e você estará pronto para imprimir."
-#: src/slic3r/GUI/ConfigWizard.cpp:316
+#: src/slic3r/GUI/ConfigWizard.cpp:438
msgid ""
"Remove user profiles - install from scratch (a snapshot will be taken "
"beforehand)"
msgstr ""
"Remover perfis de usuário - instalar do zero (uma snapshot será salva antes)"
-#: src/slic3r/GUI/ConfigWizard.cpp:347
+#: src/slic3r/GUI/ConfigWizard.cpp:481
#, c-format
msgid "%s Family"
msgstr "%s Família"
-#: src/slic3r/GUI/ConfigWizard.cpp:384
-msgid "Custom Printer Setup"
-msgstr "config. da impressora customizada"
+#: src/slic3r/GUI/ConfigWizard.cpp:565
+msgid "Vendor:"
+msgstr "Fornecedor:"
-#: src/slic3r/GUI/ConfigWizard.cpp:384
+#: src/slic3r/GUI/ConfigWizard.cpp:566
+msgid "Profile:"
+msgstr "Perfil:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:603 src/slic3r/GUI/ConfigWizard.cpp:631
+msgid "(All)"
+msgstr "(Todos)"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:732
+msgid "Custom Printer Setup"
+msgstr "Config. da impressora customizada"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:732
msgid "Custom Printer"
msgstr "Impressora customizada"
-#: src/slic3r/GUI/ConfigWizard.cpp:386
+#: src/slic3r/GUI/ConfigWizard.cpp:734
msgid "Define a custom printer profile"
msgstr "Definir uma config. para a impressora customizada"
-#: src/slic3r/GUI/ConfigWizard.cpp:388
+#: src/slic3r/GUI/ConfigWizard.cpp:736
msgid "Custom profile name:"
msgstr "Nome customizado da config.:"
-#: src/slic3r/GUI/ConfigWizard.cpp:412
+#: src/slic3r/GUI/ConfigWizard.cpp:761
msgid "Automatic updates"
msgstr "Atualizações automáticas"
-#: src/slic3r/GUI/ConfigWizard.cpp:412
+#: src/slic3r/GUI/ConfigWizard.cpp:761
msgid "Updates"
msgstr "Atualizações"
-#: src/slic3r/GUI/ConfigWizard.cpp:420 src/slic3r/GUI/Preferences.cpp:69
+#: src/slic3r/GUI/ConfigWizard.cpp:769 src/slic3r/GUI/Preferences.cpp:64
msgid "Check for application updates"
msgstr "Verificar atualizações nas aplicações"
-#: src/slic3r/GUI/ConfigWizard.cpp:424
+#: src/slic3r/GUI/ConfigWizard.cpp:773
#, c-format
msgid ""
"If enabled, %s checks for new application versions online. When a new "
@@ -484,11 +700,11 @@ msgstr ""
"inicialização do aplicativo (nunca durante o uso do programa). Este é apenas "
"um mecanismos de notificação, nenhuma instalação automática é feita."
-#: src/slic3r/GUI/ConfigWizard.cpp:430 src/slic3r/GUI/Preferences.cpp:77
+#: src/slic3r/GUI/ConfigWizard.cpp:779 src/slic3r/GUI/Preferences.cpp:80
msgid "Update built-in Presets automatically"
msgstr "Atualizar predefinições incorporadas automaticamente"
-#: src/slic3r/GUI/ConfigWizard.cpp:434
+#: src/slic3r/GUI/ConfigWizard.cpp:783
#, c-format
msgid ""
"If enabled, %s downloads updates of built-in system presets in the "
@@ -501,7 +717,7 @@ msgstr ""
"separado. Quando uma nova versão predefinida se torna disponível, ela é "
"oferecida na inicialização do aplicativo."
-#: src/slic3r/GUI/ConfigWizard.cpp:437
+#: src/slic3r/GUI/ConfigWizard.cpp:786
msgid ""
"Updates are never applied without user's consent and never overwrite user's "
"customized settings."
@@ -509,7 +725,7 @@ msgstr ""
"Atualizações nunca são aplicadas sem a permissão do usuário e nunca sobre "
"escrevem as config. do usuário."
-#: src/slic3r/GUI/ConfigWizard.cpp:442
+#: src/slic3r/GUI/ConfigWizard.cpp:791
msgid ""
"Additionally a backup snapshot of the whole configuration is created before "
"an update is applied."
@@ -517,56 +733,111 @@ msgstr ""
"Além disso, uma captura de backup de toda a config. é criado antes que uma "
"atualização seja aplicada."
-#: src/slic3r/GUI/ConfigWizard.cpp:449
+#: src/slic3r/GUI/ConfigWizard.cpp:798 src/slic3r/GUI/GUI_ObjectList.cpp:1665
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3957 src/slic3r/GUI/Plater.cpp:3227
+#: src/slic3r/GUI/Plater.cpp:3936 src/slic3r/GUI/Plater.cpp:3965
+msgid "Reload from disk"
+msgstr "Recarregar a partir do disco"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:801
+msgid ""
+"Export full pathnames of models and parts sources into 3mf and amf files"
+msgstr ""
+"Exportar nomes completos de modelos e fontes de peças para arquivos 3mf e amf"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:805
+msgid ""
+"If enabled, allows the Reload from disk command to automatically find and "
+"load the files when invoked.\n"
+"If not enabled, the Reload from disk command will ask to select each file "
+"using an open file dialog."
+msgstr ""
+"Se ativado, permite que o comando Recarregar a partir do disco encontre e "
+"carregue automaticamente os arquivos quando invocado.\n"
+"Se não estiver habilitado, o comando Recarregar a partir do disco pedirá "
+"para selecionar cada arquivo usando uma caixa de diálogo de arquivo aberto."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:813
+msgid "View mode"
+msgstr "Modo de visualização"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:815
+msgid ""
+"PrusaSlicer's user interfaces comes in three variants:\n"
+"Simple, Advanced, and Expert.\n"
+"The Simple mode shows only the most frequently used settings relevant for "
+"regular 3D printing. The other two offer progressively more sophisticated "
+"fine-tuning, they are suitable for advanced and expert users, respectively."
+msgstr ""
+"As interfaces de usuário do PrusaSlicer vêm em três variantes:\n"
+"Simples, Avançado e Especialista.\n"
+"O modo Simples mostra apenas as configurações mais utilizadas para impressão "
+"3D regular. Os outros dois oferecem ajustes finos progressivamente mais "
+"sofisticados, são adequados para usuários avançados e experientes, "
+"respectivamente."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:820
+msgid "Simple mode"
+msgstr "Modo simples"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:821
+msgid "Advanced mode"
+msgstr "Modo avançado"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:822
+msgid "Expert mode"
+msgstr "Modo especialista"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:856
msgid "Other Vendors"
msgstr "Outros fornecedores"
-#: src/slic3r/GUI/ConfigWizard.cpp:451
+#: src/slic3r/GUI/ConfigWizard.cpp:860
#, c-format
-msgid "Pick another vendor supported by %s:"
-msgstr "Escolha outro fornecedor suportado por %s:"
+msgid "Pick another vendor supported by %s"
+msgstr "Escolha outro fornecedor suportado por %s"
-#: src/slic3r/GUI/ConfigWizard.cpp:497
+#: src/slic3r/GUI/ConfigWizard.cpp:891
msgid "Firmware Type"
msgstr "Tipo de Firmware"
-#: src/slic3r/GUI/ConfigWizard.cpp:497 src/slic3r/GUI/Tab.cpp:2149
+#: src/slic3r/GUI/ConfigWizard.cpp:891 src/slic3r/GUI/Tab.cpp:1949
msgid "Firmware"
msgstr "Firmware"
-#: src/slic3r/GUI/ConfigWizard.cpp:501
+#: src/slic3r/GUI/ConfigWizard.cpp:895
msgid "Choose the type of firmware used by your printer."
msgstr "Escolha o tipo de firmware utilizado na sua impressora."
-#: src/slic3r/GUI/ConfigWizard.cpp:535
+#: src/slic3r/GUI/ConfigWizard.cpp:929
msgid "Bed Shape and Size"
msgstr "Forma e tamanho da mesa"
-#: src/slic3r/GUI/ConfigWizard.cpp:538
+#: src/slic3r/GUI/ConfigWizard.cpp:932
msgid "Set the shape of your printer's bed."
msgstr "Insira o formato da mesa de impressão."
-#: src/slic3r/GUI/ConfigWizard.cpp:558
+#: src/slic3r/GUI/ConfigWizard.cpp:952
msgid "Filament and Nozzle Diameters"
msgstr "Diâmetro do bico e do filamento"
-#: src/slic3r/GUI/ConfigWizard.cpp:558
+#: src/slic3r/GUI/ConfigWizard.cpp:952
msgid "Print Diameters"
msgstr "Diâmetros de impressão"
-#: src/slic3r/GUI/ConfigWizard.cpp:572
+#: src/slic3r/GUI/ConfigWizard.cpp:966
msgid "Enter the diameter of your printer's hot end nozzle."
msgstr "Insira o diâmetro do bico de impressão."
-#: src/slic3r/GUI/ConfigWizard.cpp:575
+#: src/slic3r/GUI/ConfigWizard.cpp:969
msgid "Nozzle Diameter:"
msgstr "Diâmetro do bico:"
-#: src/slic3r/GUI/ConfigWizard.cpp:585
+#: src/slic3r/GUI/ConfigWizard.cpp:979
msgid "Enter the diameter of your filament."
msgstr "Coloque o diâmetro do seu filamento."
-#: src/slic3r/GUI/ConfigWizard.cpp:586
+#: src/slic3r/GUI/ConfigWizard.cpp:980
msgid ""
"Good precision is required, so use a caliper and do multiple measurements "
"along the filament, then compute the average."
@@ -574,35 +845,35 @@ msgstr ""
"É necessário uma boa precisão, utilize um paquímetro e realize várias "
"medições ao longo do filamento, faça uma média."
-#: src/slic3r/GUI/ConfigWizard.cpp:589
+#: src/slic3r/GUI/ConfigWizard.cpp:983
msgid "Filament Diameter:"
msgstr "Diâmetro do filamento:"
-#: src/slic3r/GUI/ConfigWizard.cpp:623
+#: src/slic3r/GUI/ConfigWizard.cpp:1017
msgid "Extruder and Bed Temperatures"
msgstr "Temperaturas da mesa e da extrusora"
-#: src/slic3r/GUI/ConfigWizard.cpp:623
+#: src/slic3r/GUI/ConfigWizard.cpp:1017
msgid "Temperatures"
msgstr "Temperaturas"
-#: src/slic3r/GUI/ConfigWizard.cpp:639
+#: src/slic3r/GUI/ConfigWizard.cpp:1033
msgid "Enter the temperature needed for extruding your filament."
msgstr "Coloque a temperatura necessária para extrusar seu filamento."
-#: src/slic3r/GUI/ConfigWizard.cpp:640
+#: src/slic3r/GUI/ConfigWizard.cpp:1034
msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
msgstr "A regra de ouro é 160 à 230°C para PLA, e 215 à 250°C para ABS."
-#: src/slic3r/GUI/ConfigWizard.cpp:643
+#: src/slic3r/GUI/ConfigWizard.cpp:1037
msgid "Extrusion Temperature:"
msgstr "Temperatura de extrusão:"
-#: src/slic3r/GUI/ConfigWizard.cpp:644 src/slic3r/GUI/ConfigWizard.cpp:658
+#: src/slic3r/GUI/ConfigWizard.cpp:1038 src/slic3r/GUI/ConfigWizard.cpp:1052
msgid "°C"
msgstr "°C"
-#: src/slic3r/GUI/ConfigWizard.cpp:653
+#: src/slic3r/GUI/ConfigWizard.cpp:1047
msgid ""
"Enter the bed temperature needed for getting your filament to stick to your "
"heated bed."
@@ -610,7 +881,7 @@ msgstr ""
"Coloque a temperatura da mesa necessária para fazer com que seu filamento "
"grude na mesa."
-#: src/slic3r/GUI/ConfigWizard.cpp:654
+#: src/slic3r/GUI/ConfigWizard.cpp:1048
msgid ""
"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
"no heated bed."
@@ -618,82 +889,461 @@ msgstr ""
"A regra de ouro é 60°C para PLA, e 110°C para ABS. Deixe em zero se não há "
"mesa aquecida."
-#: src/slic3r/GUI/ConfigWizard.cpp:657
+#: src/slic3r/GUI/ConfigWizard.cpp:1051
msgid "Bed Temperature:"
msgstr "Temperatura da mesa:"
-#: src/slic3r/GUI/ConfigWizard.cpp:1138
+#: src/slic3r/GUI/ConfigWizard.cpp:1471 src/slic3r/GUI/ConfigWizard.cpp:2013
+msgid "Filaments"
+msgstr "Filamentos"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1471 src/slic3r/GUI/ConfigWizard.cpp:2015
+msgid "SLA Materials"
+msgstr "Materiais"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1525
+msgid "FFF Technology Printers"
+msgstr "Impressoras de tecnologia Prusa FFF"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1530
+msgid "SLA Technology Printers"
+msgstr "Impressoras de tecnologia SLA"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1751 src/slic3r/GUI/DoubleSlider.cpp:1905
+#: src/slic3r/GUI/DoubleSlider.cpp:1926 src/slic3r/GUI/GUI.cpp:246
+msgid "Notice"
+msgstr "Aviso"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1760
+msgid "You have to select at least one filament for selected printers"
+msgstr ""
+"Você tem que selecionar pelo menos um filamento para impressoras selecionadas"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1761
+msgid "Do you want to automatic select default filaments?"
+msgstr "Deseja selecionar filamentos padrão automáticos?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1771
+msgid "You have to select at least one material for selected printers"
+msgstr ""
+"Você tem que selecionar pelo menos um material para impressoras selecionadas"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1772
+msgid "Do you want to automatic select default materials?"
+msgstr "Deseja selecionar automaticamente materiais padrão?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1976
msgid "Select all standard printers"
msgstr "Selecione todas as impressoras padrão"
-#: src/slic3r/GUI/ConfigWizard.cpp:1141
+#: src/slic3r/GUI/ConfigWizard.cpp:1979
msgid "< &Back"
msgstr "< &Voltar"
-#: src/slic3r/GUI/ConfigWizard.cpp:1142
+#: src/slic3r/GUI/ConfigWizard.cpp:1980
msgid "&Next >"
msgstr "&Próximo >"
-#: src/slic3r/GUI/ConfigWizard.cpp:1143
+#: src/slic3r/GUI/ConfigWizard.cpp:1981
msgid "&Finish"
msgstr "&Final"
-#: src/slic3r/GUI/ConfigWizard.cpp:1144 src/slic3r/GUI/FirmwareDialog.cpp:151
-#: src/slic3r/GUI/ProgressStatusBar.cpp:27
+#: src/slic3r/GUI/ConfigWizard.cpp:1982 src/slic3r/GUI/FirmwareDialog.cpp:151
+#: src/slic3r/GUI/ProgressStatusBar.cpp:26
msgid "Cancel"
msgstr "Cancelar"
-#: src/slic3r/GUI/ConfigWizard.cpp:1158
+#: src/slic3r/GUI/ConfigWizard.cpp:1995
msgid "Prusa FFF Technology Printers"
msgstr "Impressoras de tecnologia Prusa FFF"
-#: src/slic3r/GUI/ConfigWizard.cpp:1161
+#: src/slic3r/GUI/ConfigWizard.cpp:1998
msgid "Prusa MSLA Technology Printers"
msgstr "Impressoras de tecnologia Prusa MSLA"
-#: src/slic3r/GUI/ConfigWizard.cpp:1230
+#: src/slic3r/GUI/ConfigWizard.cpp:2013
+msgid "Filament Profiles Selection"
+msgstr "Seleção de Perfis de Filamento"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2013 src/slic3r/GUI/GUI_ObjectList.cpp:3554
+msgid "Type:"
+msgstr "Tipo:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2015
+msgid "SLA Material Profiles Selection"
+msgstr "Perfil de material SLA padrão"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2015
+msgid "Layer height:"
+msgstr "Altura da camada:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2109
msgid "Configuration Assistant"
msgstr "Assistente de config."
-#: src/slic3r/GUI/ConfigWizard.cpp:1231
+#: src/slic3r/GUI/ConfigWizard.cpp:2110
msgid "Configuration &Assistant"
msgstr "Assistente &de config."
-#: src/slic3r/GUI/ConfigWizard.cpp:1233
+#: src/slic3r/GUI/ConfigWizard.cpp:2112
msgid "Configuration Wizard"
msgstr "Assistente de config."
-#: src/slic3r/GUI/ConfigWizard.cpp:1234
+#: src/slic3r/GUI/ConfigWizard.cpp:2113
msgid "Configuration &Wizard"
msgstr "Assistente &de config."
-#: src/slic3r/GUI/Field.cpp:125
+#: src/slic3r/GUI/DoubleSlider.cpp:79
+msgid "Place bearings in slots and resume printing"
+msgstr "Coloque rolamentos em ranhuras e retome a impressão"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:950
+msgid "One layer mode"
+msgstr "Modo de uma camada"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:952
+msgid "Discard all custom changes"
+msgstr "Descarte todas as alterações personalizadas"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:955
+#, c-format
+msgid "Jump to height %s or Set extruder sequence for the entire print"
+msgstr ""
+"Pule para altura %s ou Definir seqüência de extrusora para toda a impressão"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:957 src/slic3r/GUI/DoubleSlider.cpp:1529
+#: src/slic3r/GUI/DoubleSlider.cpp:1651
+msgid "Jump to height"
+msgstr "Pule para altura"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:960
+msgid "Edit current color - Right click the colored slider segment"
+msgstr ""
+"Editar cor atual - Clique com o botão direito do mouse no segmento de "
+"controle deslizante colorido"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:970
+msgid "Print mode"
+msgstr "Modo da impressora"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:984
+msgid "Add extruder change - Left click"
+msgstr "Adicionar alteração extrusora - Clique à esquerda"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:986
+msgid ""
+"Add color change - Left click for predefined color or Shift + Left click for "
+"custom color selection"
+msgstr ""
+"Adicionar mudança de cor - Clique à esquerda para cor predefinida ou Shift + "
+"Clique à esquerda para seleção personalizada de cores"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:988
+msgid "Add color change - Left click"
+msgstr "Adicionar mudança de cor - Clique à esquerda"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:989
+msgid "or press \"+\" key"
+msgstr "ou pressione a tecla \"+\""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:991
+msgid "Add another code - Ctrl + Left click"
+msgstr "Adicionar outro código - Ctrl + Clique à esquerda"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:992
+msgid "Add another code - Right click"
+msgstr "Adicionar outro código - Clique com o botão direito"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:998
+msgid ""
+"The sequential print is on.\n"
+"It's impossible to apply any custom G-code for objects printing "
+"sequentually.\n"
+"This code won't be processed during G-code generation."
+msgstr ""
+"A impressão sequencial está.\n"
+"É impossível aplicar qualquer G-code personalizado para impressão sequencial "
+"de objetos.\n"
+"Este código não será processado durante a geração de G-code."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1005
+msgid "Color change (\"%1%\")"
+msgstr "Mudança de cor (\"%1%\")"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1006
+msgid "Color change (\"%1%\") for Extruder %2%"
+msgstr "Mudança de cor (\"%1%\") para Extrusor %2%"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1009
+msgid "Pause print (\"%1%\")"
+msgstr "Pausar impressão (\"%1%\")"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1011
+msgid "Extruder (tool) is changed to Extruder \"%1%\""
+msgstr "Extrusora (ferramenta) é alterada para Extrusora \"%1%\""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1019
+msgid "Note"
+msgstr "Nota"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1021
+msgid ""
+"G-code associated to this tick mark is in a conflict with print mode.\n"
+"Editing it will cause changes of Slider data."
+msgstr ""
+"O código G associado a esta marca de tique-taque está em conflito com o modo "
+"de impressão.\n"
+"Editá-lo causará alterações nos dados do Slider."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1024
+msgid ""
+"There is a color change for extruder that won't be used till the end of "
+"print job.\n"
+"This code won't be processed during G-code generation."
+msgstr ""
+"Há uma mudança de cor para extrusor que não será usada até o final do "
+"trabalho de impressão.\n"
+"Este código não será processado durante a geração de código G."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1027
+msgid ""
+"There is an extruder change set to the same extruder.\n"
+"This code won't be processed during G-code generation."
+msgstr ""
+"Há uma mudança extrusora definida para o mesmo extrusor.\n"
+"Este código não será processado durante a geração de código G."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1030
+msgid ""
+"There is a color change for extruder that has not been used before.\n"
+"Check your settings to avoid redundant color changes."
+msgstr ""
+"Há uma mudança de cor para extrusor que não foi usada antes.\n"
+"Verifique suas configurações para evitar alterações de cor redundantes."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1035
+msgid "Delete tick mark - Left click or press \"-\" key"
+msgstr ""
+"Excluir marca de marca de marca - Clique à esquerda ou pressione a tecla \"-"
+"\""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1037
+msgid "Edit tick mark - Ctrl + Left click"
+msgstr "Editar marca de tique - Ctrl + Clique à esquerda"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1038
+msgid "Edit tick mark - Right click"
+msgstr "Editar marca de tique - Clique com o botão direito do mouse"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1134 src/slic3r/GUI/DoubleSlider.cpp:1170
+#: src/slic3r/GUI/GLCanvas3D.cpp:977 src/slic3r/GUI/GUI_ObjectList.cpp:1705
+#: src/slic3r/GUI/Tab.cpp:2322 src/libslic3r/GCode/PreviewData.cpp:445
+#, c-format
+msgid "Extruder %d"
+msgstr "Extrusora %d"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1135 src/slic3r/GUI/GUI_ObjectList.cpp:1706
+msgid "active"
+msgstr "ativar"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1144
+msgid "Switch code to Change extruder"
+msgstr "Mudar código para extrusor de alterar"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1144 src/slic3r/GUI/GUI_ObjectList.cpp:1672
+msgid "Change extruder"
+msgstr "Mudar extrusora"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1145
+msgid "Change extruder (N/A)"
+msgstr "Extrusora de alterações (N/A)"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1147
+msgid "Use another extruder"
+msgstr "Use outra extrusora"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1171
+msgid "used"
+msgstr "usado"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1179
+msgid "Switch code to Color change (%1%) for:"
+msgstr "Mudar o código para mudança de cor (%1%) Para:"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1180
+msgid "Add color change (%1%) for:"
+msgstr "Add/Excluir mudança de cor (%1%) para:"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1477
+msgid "Add color change"
+msgstr "Adicionar mudança de cor"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1487
+msgid "Add pause print"
+msgstr "Adicionar impressão de pausa"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1490
+msgid "Add custom G-code"
+msgstr "Adicionar código G personalizado"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1508
+msgid "Edit color"
+msgstr "Editar cor"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1509
+msgid "Edit pause print message"
+msgstr "Editar mensagem de impressão de pausa"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1510
+msgid "Edit custom G-code"
+msgstr "Editar código G personalizado"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1516
+msgid "Delete color change"
+msgstr "Excluir alteração de cor"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1517
+msgid "Delete tool change"
+msgstr "Excluir alteração de ferramenta"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1518
+msgid "Delete pause print"
+msgstr "Excluir impressão de pausa"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1519
+msgid "Delete custom G-code"
+msgstr "Excluir código G personalizado"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1532
+msgid "Set extruder sequence for the entire print"
+msgstr "Definir sequência de extrusora para toda a impressão"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1618
+msgid "Enter custom G-code used on current layer"
+msgstr "Digite o código G personalizado usado na camada atual"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1619
+msgid "Custom G-code on current layer (%1% mm)."
+msgstr "Código G personalizado na camada atual (%1% mm)."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1634
+msgid "Enter short message shown on Printer display when a print is paused"
+msgstr ""
+"Digite mensagem curta mostrada no visor da impressora quando uma impressão é "
+"pausada"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1635
+msgid "Message for pause print on current layer (%1% mm)."
+msgstr "Mensagem para impressão de pausa na camada atual (%1% mm)."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1650
+msgid "Enter the height you want to jump to"
+msgstr "Digite a altura que você deseja saltar para"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1899
+msgid "The last color change data was saved for a single extruder printing."
+msgstr ""
+"Parâmetros de mudança de ferramenta com impressoras de multi material com "
+"apenas uma extrusora."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1900 src/slic3r/GUI/DoubleSlider.cpp:1916
+msgid "The last color change data was saved for a multi extruder printing."
+msgstr ""
+"Os últimos dados de mudança de cor foram salvos para uma impressão de vários "
+"extrusores."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1902
+msgid "Your current changes will delete all saved color changes."
+msgstr "Suas alterações atuais excluirão todas as alterações de cor salvas."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1903 src/slic3r/GUI/DoubleSlider.cpp:1924
+msgid "Are you sure you want to continue?"
+msgstr "Você tem certeza que deseja continuar?"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1917
+msgid ""
+"Select YES if you want to delete all saved tool changes, \n"
+"NO if you want all tool changes switch to color changes, \n"
+"or CANCEL to leave it unchanged."
+msgstr ""
+"Selecione SIM se quiser excluir todas as alterações de ferramenta salvas, \n"
+"NÃO, se você quiser que todas as alterações de ferramenta mudem para "
+"mudanças de cor, \n"
+"ou CANCELAR para deixá-lo inalterado."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1920
+msgid "Do you want to delete all saved tool changes?"
+msgstr "Deseja excluir todas as alterações de ferramenta salvas?"
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1922
+msgid ""
+"The last color change data was saved for a multi extruder printing with tool "
+"changes for whole print."
+msgstr ""
+"Os últimos dados de mudança de cor foram salvos para uma impressão multi-"
+"extrusora com alterações de ferramenta para impressão inteira."
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1923
+msgid "Your current changes will delete all saved extruder (tool) changes."
+msgstr ""
+"Suas alterações atuais excluirão todas as alterações do extrusor "
+"(ferramenta) salvos."
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:23
+msgid "Set extruder sequence"
+msgstr "Definir seqüência de extrusor"
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:39
+msgid "Set extruder change for every"
+msgstr "Definir a mudança de extrusor para cada"
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:52
+#: src/libslic3r/PrintConfig.cpp:362 src/libslic3r/PrintConfig.cpp:994
+#: src/libslic3r/PrintConfig.cpp:1505 src/libslic3r/PrintConfig.cpp:1690
+#: src/libslic3r/PrintConfig.cpp:1750 src/libslic3r/PrintConfig.cpp:1930
+#: src/libslic3r/PrintConfig.cpp:1976
+msgid "layers"
+msgstr "camadas"
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:136
+msgid "Set extruder(tool) sequence"
+msgstr "Definir sequência da extrusora (ferramenta)"
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:182
+msgid "Remove extruder from sequence"
+msgstr "Remover extrusor da seqüência"
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:192
+msgid "Add extruder to sequence"
+msgstr "Adicionar extrusor à seqüência"
+
+#: src/slic3r/GUI/Field.cpp:136
msgid "default value"
msgstr "valor padrão"
-#: src/slic3r/GUI/Field.cpp:128
+#: src/slic3r/GUI/Field.cpp:139
msgid "parameter name"
msgstr "nome do parâmetro"
-#: src/slic3r/GUI/Field.cpp:139 src/slic3r/GUI/OptionsGroup.cpp:569
+#: src/slic3r/GUI/Field.cpp:150 src/slic3r/GUI/OptionsGroup.cpp:581
msgid "N/A"
msgstr "N/D"
-#: src/slic3r/GUI/Field.cpp:158
+#: src/slic3r/GUI/Field.cpp:175
#, c-format
msgid "%s doesn't support percentage"
msgstr "%s não suporta porcentagem"
-#: src/slic3r/GUI/Field.cpp:174 src/slic3r/GUI/Field.cpp:197
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:337
+#: src/slic3r/GUI/Field.cpp:195 src/slic3r/GUI/Field.cpp:226
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:376
msgid "Invalid numeric input."
msgstr "Entrada numérica não válida."
-#: src/slic3r/GUI/Field.cpp:179
+#: src/slic3r/GUI/Field.cpp:204
msgid "Input value is out of range"
msgstr "Valor de entrada está fora do limite"
-#: src/slic3r/GUI/Field.cpp:206
+#: src/slic3r/GUI/Field.cpp:240
#, c-format
msgid ""
"Do you mean %s%% instead of %s %s?\n"
@@ -704,7 +1354,7 @@ msgstr ""
"Selecione SIM se quiser trocar esse valor para %s%%, \n"
"ou NÃO se você tem certeza que %s %s é o valor correto."
-#: src/slic3r/GUI/Field.cpp:209
+#: src/slic3r/GUI/Field.cpp:243
msgid "Parameter validation"
msgstr "Validação do parâmetro"
@@ -791,8 +1441,8 @@ msgstr "Atualizador de Firmware"
msgid "Firmware image:"
msgstr "Imagem do Firmware:"
-#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/Tab.cpp:1870
-#: src/slic3r/GUI/Tab.cpp:1926
+#: src/slic3r/GUI/FirmwareDialog.cpp:805 src/slic3r/GUI/Tab.cpp:1657
+#: src/slic3r/GUI/Tab.cpp:1719
msgid "Browse"
msgstr "Procurar"
@@ -825,11 +1475,12 @@ msgid "Advanced: Output log"
msgstr "Avançado: log de Saída"
#: src/slic3r/GUI/FirmwareDialog.cpp:852
+#: src/slic3r/GUI/Mouse3DController.cpp:336
#: src/slic3r/GUI/PrintHostDialogs.cpp:161
msgid "Close"
msgstr "Fechar"
-#: src/slic3r/GUI/FirmwareDialog.cpp:903
+#: src/slic3r/GUI/FirmwareDialog.cpp:902
msgid ""
"Are you sure you want to cancel firmware flashing?\n"
"This could leave your printer in an unusable state!"
@@ -837,35 +1488,107 @@ msgstr ""
"Você tem certeza que gostaria de cancelar a atualização de Firmware? \n"
"Isso poderia deixar a sua impressora inutilizável!"
-#: src/slic3r/GUI/FirmwareDialog.cpp:904
+#: src/slic3r/GUI/FirmwareDialog.cpp:903
msgid "Confirmation"
msgstr "Confirmação"
-#: src/slic3r/GUI/FirmwareDialog.cpp:907
+#: src/slic3r/GUI/FirmwareDialog.cpp:906
msgid "Cancelling..."
msgstr "Cancelando..."
-#: src/slic3r/GUI/GLCanvas3D.cpp:534
-msgid "Layers heights"
-msgstr "Altura de camada"
+#: src/slic3r/GUI/GLCanvas3D.cpp:234 src/slic3r/GUI/GLCanvas3D.cpp:4573
+msgid "Variable layer height"
+msgstr "Altura da camada variável"
-#: src/slic3r/GUI/GLCanvas3D.cpp:631
+#: src/slic3r/GUI/GLCanvas3D.cpp:237
+msgid "Left mouse button:"
+msgstr "Botão esquerdo do mouse:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:240
+msgid "Add detail"
+msgstr "Adicionar config."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:243
+msgid "Right mouse button:"
+msgstr "Botão direito do mouse:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:246
+msgid "Remove detail"
+msgstr "Remover detalhes"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:249
+msgid "Shift + Left mouse button:"
+msgstr "Shift + Botão do mouse esquerdo:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:252
+msgid "Reset to base"
+msgstr "Reset para base"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:255
+msgid "Shift + Right mouse button:"
+msgstr "Shift + Botão do mouse direito:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:258
+msgid "Smoothing"
+msgstr "Suavizando"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:261
+msgid "Mouse wheel:"
+msgstr "Scroll do mouse:"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:264
+msgid "Increase/decrease edit area"
+msgstr "Aumentar/diminuir a área de edição"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:267
+msgid "Adaptive"
+msgstr "Adaptativo"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:273
+msgid "Quality / Speed"
+msgstr "Qualidade / Velocidade"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:277
+msgid "Higher print quality versus higher print speed."
+msgstr "Maior qualidade de impressão versus maior velocidade de impressão."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:288
+msgid "Smooth"
+msgstr "Suave"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:294 src/libslic3r/PrintConfig.cpp:511
+msgid "Radius"
+msgstr "Raio"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:304
+msgid "Keep min"
+msgstr "Mantenha min."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:313
+msgid "Reset"
+msgstr "Redefinir"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:599
+msgid "Variable layer height - Manual edit"
+msgstr "Habilitar altura de camada variável"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:685
msgid "An object outside the print area was detected"
msgstr "Um objeto foi detectado fora da área de impressão"
-#: src/slic3r/GUI/GLCanvas3D.cpp:632
+#: src/slic3r/GUI/GLCanvas3D.cpp:686
msgid "A toolpath outside the print area was detected"
msgstr "Há movimentos fora da área de impressão"
-#: src/slic3r/GUI/GLCanvas3D.cpp:633
+#: src/slic3r/GUI/GLCanvas3D.cpp:687
msgid "SLA supports outside the print area were detected"
msgstr "Suportes de SLA foram detectados fora da área de impressão"
-#: src/slic3r/GUI/GLCanvas3D.cpp:634
-msgid "Some objects are not visible when editing supports"
-msgstr "Alguns objetos não são visíveis quando editando suportes"
+#: src/slic3r/GUI/GLCanvas3D.cpp:688
+msgid "Some objects are not visible"
+msgstr "Alguns objetos não são visíveis"
-#: src/slic3r/GUI/GLCanvas3D.cpp:636
+#: src/slic3r/GUI/GLCanvas3D.cpp:690
msgid ""
"An object outside the print area was detected\n"
"Resolve the current problem to continue slicing"
@@ -873,117 +1596,171 @@ msgstr ""
"Um objeto foi encontrado fora da área de impressão\n"
"Resolva o problema atual para continuar o fatiamento"
-#: src/slic3r/GUI/GLCanvas3D.cpp:1733
+#: src/slic3r/GUI/GLCanvas3D.cpp:904 src/slic3r/GUI/GLCanvas3D.cpp:933
+msgid "Default print color"
+msgstr "Cor de impressão padrão"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:934 src/slic3r/GUI/GLCanvas3D.cpp:943
+#: src/slic3r/GUI/GLCanvas3D.cpp:982
+msgid "Pause print or custom G-code"
+msgstr "Pausa impressão ou código G personalizado"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:955
+#, c-format
+msgid "up to %.2f mm"
+msgstr "até %.2f mm"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:959
+#, c-format
+msgid "above %.2f mm"
+msgstr "acima de %.2f mm"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:963
+#, c-format
+msgid "%.2f - %.2f mm"
+msgstr "%.2f - %.2f mm"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:995
+#, c-format
+msgid "Color change for Extruder %d at %.2f mm"
+msgstr "Mudança de cor para Extrusor %d em %.2f mm"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:1305
+msgid "Seq."
+msgstr "Seq."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:1701
+msgid "Variable layer height - Reset"
+msgstr "Habilitar altura de camada variável - Resetar"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:1709
+msgid "Variable layer height - Adaptive"
+msgstr "Habilitar altura de camada variável - Adaptativo"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:1717
+msgid "Variable layer height - Smooth all"
+msgstr "Habilitar altura de camada variável - Deixar tudo suave"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:2053
msgid "Mirror Object"
msgstr "Espelhar objeto"
-#: src/slic3r/GUI/GLCanvas3D.cpp:2970
+#: src/slic3r/GUI/GLCanvas3D.cpp:2921
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:570
+msgid "Gizmo-Move"
+msgstr "Gizmo-Mover"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:3001
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:572
+msgid "Gizmo-Rotate"
+msgstr "Gizmo-Rotacionar"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:3505
msgid "Move Object"
msgstr "Mover objeto"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3506
+#: src/slic3r/GUI/GLCanvas3D.cpp:4047
msgid "Undo History"
msgstr "Desfazer histórico"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3506
+#: src/slic3r/GUI/GLCanvas3D.cpp:4047
msgid "Redo History"
msgstr "Refazer histórico"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3524
+#: src/slic3r/GUI/GLCanvas3D.cpp:4065
#, c-format
msgid "Undo %1$d Action"
msgid_plural "Undo %1$d Actions"
msgstr[0] "Desfazer ação de %1$d"
msgstr[1] "Desfazer ações de %1$d"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3524
+#: src/slic3r/GUI/GLCanvas3D.cpp:4065
#, c-format
msgid "Redo %1$d Action"
msgid_plural "Redo %1$d Actions"
msgstr[0] "Refazer ação de %1$d"
msgstr[1] "Refazer ações de %1$d"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3571
+#: src/slic3r/GUI/GLCanvas3D.cpp:4467
msgid "Add..."
msgstr "Adicionar..."
-#: src/slic3r/GUI/GLCanvas3D.cpp:3579 src/slic3r/GUI/GUI_ObjectList.cpp:1501
-#: src/slic3r/GUI/Plater.cpp:3520 src/slic3r/GUI/Plater.cpp:3539
-#: src/slic3r/GUI/Tab.cpp:3286
+#: src/slic3r/GUI/GLCanvas3D.cpp:4475 src/slic3r/GUI/GUI_ObjectList.cpp:1719
+#: src/slic3r/GUI/Plater.cpp:3933 src/slic3r/GUI/Plater.cpp:3955
+#: src/slic3r/GUI/Tab.cpp:3126
msgid "Delete"
msgstr "Deletar"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3588 src/slic3r/GUI/Plater.cpp:4172
+#: src/slic3r/GUI/GLCanvas3D.cpp:4484 src/slic3r/GUI/KBShortcutsDialog.cpp:129
+#: src/slic3r/GUI/Plater.cpp:4671
msgid "Delete all"
msgstr "Deletar todos"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3597 src/slic3r/GUI/KBShortcutsDialog.cpp:137
-#: src/slic3r/GUI/Plater.cpp:2681
+#: src/slic3r/GUI/GLCanvas3D.cpp:4493 src/slic3r/GUI/KBShortcutsDialog.cpp:157
+#: src/slic3r/GUI/Plater.cpp:2756
msgid "Arrange"
msgstr "Arranjar"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3597 src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/GLCanvas3D.cpp:4493 src/slic3r/GUI/KBShortcutsDialog.cpp:158
msgid "Arrange selection"
msgstr "Arranjar seleção"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3609
+#: src/slic3r/GUI/GLCanvas3D.cpp:4505
msgid "Copy"
msgstr "Copiar"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3618
+#: src/slic3r/GUI/GLCanvas3D.cpp:4514
msgid "Paste"
msgstr "Colar"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3630 src/slic3r/GUI/Plater.cpp:3400
-#: src/slic3r/GUI/Plater.cpp:3412 src/slic3r/GUI/Plater.cpp:3526
+#: src/slic3r/GUI/GLCanvas3D.cpp:4526 src/slic3r/GUI/Plater.cpp:3790
+#: src/slic3r/GUI/Plater.cpp:3802 src/slic3r/GUI/Plater.cpp:3942
msgid "Add instance"
msgstr "Adicionar instância"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3641 src/slic3r/GUI/Plater.cpp:3528
+#: src/slic3r/GUI/GLCanvas3D.cpp:4537 src/slic3r/GUI/Plater.cpp:3944
msgid "Remove instance"
msgstr "Remover instância"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3654
+#: src/slic3r/GUI/GLCanvas3D.cpp:4550
msgid "Split to objects"
msgstr "Dividir em objetos"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3664 src/slic3r/GUI/GUI_ObjectList.cpp:1340
+#: src/slic3r/GUI/GLCanvas3D.cpp:4560 src/slic3r/GUI/GUI_ObjectList.cpp:1488
msgid "Split to parts"
msgstr "Dividir em partes"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3677 src/slic3r/GUI/GUI_ObjectList.cpp:2203
-msgid "Height ranges"
-msgstr "Limites de altura"
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:3728 src/slic3r/GUI/MainFrame.cpp:570
+#: src/slic3r/GUI/GLCanvas3D.cpp:4624 src/slic3r/GUI/KBShortcutsDialog.cpp:130
+#: src/slic3r/GUI/MainFrame.cpp:592
msgid "Undo"
msgstr "Desfazer"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3728 src/slic3r/GUI/GLCanvas3D.cpp:3761
+#: src/slic3r/GUI/GLCanvas3D.cpp:4624 src/slic3r/GUI/GLCanvas3D.cpp:4657
msgid "Click right mouse button to open History"
msgstr "Clique no botão direito para abrir o Histórico"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3745
+#: src/slic3r/GUI/GLCanvas3D.cpp:4641
msgid "Next Undo action: %1%"
msgstr "Próxima ação de desfazer: %1%"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3761 src/slic3r/GUI/MainFrame.cpp:573
+#: src/slic3r/GUI/GLCanvas3D.cpp:4657 src/slic3r/GUI/KBShortcutsDialog.cpp:131
+#: src/slic3r/GUI/MainFrame.cpp:595
msgid "Redo"
msgstr "Refazer"
-#: src/slic3r/GUI/GLCanvas3D.cpp:3777
+#: src/slic3r/GUI/GLCanvas3D.cpp:4673
msgid "Next Redo action: %1%"
msgstr "Próxima ação de refazer: %1%"
-#: src/slic3r/GUI/GLCanvas3D.cpp:5555
+#: src/slic3r/GUI/GLCanvas3D.cpp:6598
msgid "Selection-Add from rectangle"
msgstr "Seleção-Adicionar do retângulo"
-#: src/slic3r/GUI/GLCanvas3D.cpp:5574
+#: src/slic3r/GUI/GLCanvas3D.cpp:6617
msgid "Selection-Remove from rectangle"
msgstr "Seleção-remover do retângulo"
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:273
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:306
#, c-format
msgid ""
"PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
@@ -992,11 +1769,11 @@ msgstr ""
"PrusaSlicer requer drivers capazes de executar OpenGL 2.0, \n"
"enquanto a versão do OpenGL %s, renderização %s, fornecedor %s foi detectada."
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:276
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:309
msgid "You may need to update your graphics card driver."
msgstr "Você pode ter que atualizar os drivers da sua placa de vídeo."
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:279
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:312
msgid ""
"As a workaround, you may run PrusaSlicer with a software rendered 3D "
"graphics by running prusa-slicer.exe with the --sw_renderer parameter."
@@ -1005,28 +1782,28 @@ msgstr ""
"renderizando gráficos 3D por executar Prusa-slicer.exe com o parâmetro--"
"sw_renderer."
-#: src/slic3r/GUI/GLCanvas3DManager.cpp:281
+#: src/slic3r/GUI/GLCanvas3DManager.cpp:314
msgid "Unsupported OpenGL version"
msgstr "Versão do OpenGL não suportada"
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:40
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:145 src/libslic3r/PrintConfig.cpp:3212
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:42
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:144 src/libslic3r/PrintConfig.cpp:3412
msgid "Cut"
msgstr "Cortar"
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:150
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:168
msgid "Keep upper part"
msgstr "Manter parte superior"
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:151
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:169
msgid "Keep lower part"
msgstr "Manter parte inferior"
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:152
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:170
msgid "Rotate lower part upwards"
msgstr "Rotacione as partes inferiores para cima"
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:155
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:175
msgid "Perform cut"
msgstr "Aplicar o corte"
@@ -1034,264 +1811,289 @@ msgstr "Aplicar o corte"
msgid "Place on face"
msgstr "Colocar em uma face"
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40
+msgid "Hollow this object"
+msgstr "Deixar este objeto oco"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
+msgid "Preview hollowed and drilled model"
+msgstr "Modelo de visualização oco e perfurado"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
+msgid "Offset"
+msgstr "Compensamento do Z"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
+msgid "Quality"
+msgstr "Qualidade"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44
+#: src/libslic3r/PrintConfig.cpp:2944
+msgid "Closing distance"
+msgstr "Distância de fechamento"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45
+msgid "Hole diameter"
+msgstr "Diâmetro do orifício"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46
+msgid "Hole depth"
+msgstr "Profundidade do orifício"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47
+msgid "Remove selected holes"
+msgstr "Remover os buracos selecionados"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48
+msgid "Remove all holes"
+msgstr "Remova todos os buracos"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
+msgid "Clipping of view"
+msgstr "Recorte de vista"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58
+msgid "Reset direction"
+msgstr "Restabelecer direção"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51
+msgid "Show supports"
+msgstr "Mostrar suportes"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:423
+msgid "Add drainage hole"
+msgstr "Adicionar orifício de drenagem"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:541
+msgid "Delete drainage hole"
+msgstr "Excluir orifício de drenagem"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:815
+msgid "Hollowing parameter change"
+msgstr "Mudança de parâmetro de suporte"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:887
+msgid "Change drainage hole diameter"
+msgstr "Mudar o diâmetro do orifício de drenagem"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:979
+msgid "Hollow and drill"
+msgstr "Oco e broca"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:1061
+msgid "Move drainage hole"
+msgstr "Mover o orifício de drenagem"
+
#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:48
msgid "Move"
msgstr "Mover"
-#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:177
-msgid "Position (mm)"
-msgstr "Posição (mm)"
-
-#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:177
-msgid "Displacement (mm)"
-msgstr "Deslocamento (mm)"
-
#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:449
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:477
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:496
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:514
-#: src/libslic3r/PrintConfig.cpp:3261
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:480
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:499
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:517
+#: src/libslic3r/PrintConfig.cpp:3461
msgid "Rotate"
msgstr "Rotacionar"
-#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:482
-msgid "Rotation (deg)"
-msgstr "Rotacionar (graus)"
-
#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:47
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:392
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:497
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:515
-#: src/libslic3r/PrintConfig.cpp:3276
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:230
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:500
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:518
+#: src/libslic3r/PrintConfig.cpp:3476
msgid "Scale"
msgstr "Escala"
-#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:292
-msgid "Scale (%)"
-msgstr "Escala (%)"
-
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:44
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47
msgid "Head diameter"
msgstr "Diâmetro da cabeça"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:45
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
msgid "Lock supports under new islands"
msgstr "Travar suportes debaixo de novas ilhas"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:46
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1449
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1361
msgid "Remove selected points"
msgstr "Remover pontos selecionados"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
msgid "Remove all points"
msgstr "Remover todos os pontos"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1452
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1364
msgid "Apply changes"
msgstr "Aplicar mudanças"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1453
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1365
msgid "Discard changes"
msgstr "Descartar mudanças"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
msgid "Minimal points distance"
msgstr "Distância mínima entre pontos"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
-#: src/libslic3r/PrintConfig.cpp:2651
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
+#: src/libslic3r/PrintConfig.cpp:2774
msgid "Support points density"
msgstr "Densidade dos pontos de suporte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1455
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1367
msgid "Auto-generate points"
msgstr "Pontos gerados automaticamente"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56
msgid "Manual editing"
msgstr "Edição manual"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
-msgid "Clipping of view"
-msgstr "Recorte de vista"
-
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
-msgid "Reset direction"
-msgstr "Restabelecer direção"
-
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:531
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:484
msgid "Add support point"
msgstr "Adicionar ponto de suporte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:719
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:621
msgid "Delete support point"
msgstr "Deletar ponto de suporte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:920
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:810
msgid "Change point head diameter"
msgstr "Mudar o diâmetro do ponto da cabeça"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:986
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:878
msgid "Support parameter change"
msgstr "Mudança de parâmetro de suporte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1094
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:986
msgid "SLA Support Points"
msgstr "Pontos de suporte SLA"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1115
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1007
msgid "SLA gizmo turned on"
msgstr "Gizmo de SLA ligado"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1137
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1035
msgid "Do you want to save your manually edited support points?"
msgstr "Você deseja salvar os pontos manualmente editados?"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1138
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1036
msgid "Save changes?"
msgstr "Salvar mudanças?"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1150
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1048
msgid "SLA gizmo turned off"
msgstr "Gizmo de SLA desligado"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1187
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1087
msgid "Move support point"
msgstr "Mover pontos de suporte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1286
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1186
msgid "Support points edit"
msgstr "Edição de pontos de suporte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
-msgid ""
-"Autogeneration will erase all manually edited points.\n"
-"\n"
-"Are you sure you want to do it?\n"
-msgstr ""
-"Gerar automaticamente irá apagar todos os pontos manualmente editados. Tem "
-"certeza que quer gerar?\n"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1258
+msgid "Autogeneration will erase all manually edited points."
+msgstr "Gerar automaticamente irá apagar todos os pontos manualmente editados."
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357 src/slic3r/GUI/GUI.cpp:289
-#: src/slic3r/GUI/WipeTowerDialog.cpp:44 src/slic3r/GUI/WipeTowerDialog.cpp:328
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1259
+msgid "Are you sure you want to do it?"
+msgstr "Tem certeza que quer fazer isso?"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1260 src/slic3r/GUI/GUI.cpp:258
+#: src/slic3r/GUI/Tab.cpp:3086 src/slic3r/GUI/WipeTowerDialog.cpp:45
+#: src/slic3r/GUI/WipeTowerDialog.cpp:366
msgid "Warning"
msgstr "Aviso"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1360
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1263
msgid "Autogenerate support points"
msgstr "Pontos de suporte gerados automaticamente"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1412
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1324
msgid "SLA gizmo keyboard shortcuts"
msgstr "Atalhos no teclado para gizmo SLA"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1423
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1335
msgid "Note: some shortcuts work in (non)editing mode only."
msgstr "Nota: alguns atalhos funcionam somente em modos que não editam."
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1441
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1444
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1445
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357
msgid "Left click"
msgstr "Clique esquerdo"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1441
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1353
msgid "Add point"
msgstr "Adicionar ponto"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1442
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
msgid "Right click"
msgstr "Clique direito"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1442
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1354
msgid "Remove point"
msgstr "Remover ponto"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1443
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1446
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1447
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1358
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1359
msgid "Drag"
msgstr "Arrastar"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1443
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1355
msgid "Move point"
msgstr "Mover ponto"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1444
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1356
msgid "Add point to selection"
msgstr "Adicionar ponto à seleção"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1445
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1357
msgid "Remove point from selection"
msgstr "Remover ponto da seleção"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1446
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1358
msgid "Select by rectangle"
msgstr "Selecionar por retângulo"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1447
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1359
msgid "Deselect by rectangle"
msgstr "Desselecionar por retângulo"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1448
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1360
msgid "Select all points"
msgstr "Selecionar todos os pontos"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1450
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1362
msgid "Mouse wheel"
msgstr "Scroll do mouse"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1450
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1362
msgid "Move clipping plane"
msgstr "Mover plano de recorte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1451
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1363
msgid "Reset clipping plane"
msgstr "Restabelecer plano de recorte"
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1454
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1366
msgid "Switch to editing mode"
msgstr "Alterar para modo de edição"
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:569
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:497
msgid "Gizmo-Place on Face"
msgstr "Gizmo-Colocar em uma face"
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:641
-msgid "Gizmo-Move"
-msgstr "Gizmo-Mover"
-
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:646
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:571
msgid "Gizmo-Scale"
msgstr "Gizmo-Escala"
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:651
-msgid "Gizmo-Rotate"
-msgstr "Gizmo-Rotacionar"
-
-#: src/slic3r/GUI/GUI.cpp:141 src/slic3r/GUI/Tab.cpp:3145
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-"É impossível imprimir objetos com múltiplas partes com a tecnologia SLA."
-
-#: src/slic3r/GUI/GUI.cpp:142
-msgid "Please check and fix your object list."
-msgstr "Favor verificar e concertar sua lista de objetos."
-
-#: src/slic3r/GUI/GUI.cpp:143 src/slic3r/GUI/Plater.cpp:2246
-#: src/slic3r/GUI/Tab.cpp:3147
-msgid "Attention!"
-msgstr "Atenção!"
-
-#: src/slic3r/GUI/GUI.cpp:283
-msgid "Notice"
-msgstr "Aviso"
-
-#: src/slic3r/GUI/GUI_App.cpp:132
+#: src/slic3r/GUI/GUI_App.cpp:138
#, c-format
msgid ""
"%s has encountered an error. It was likely caused by running out of memory. "
@@ -1306,127 +2108,141 @@ msgstr ""
"\n"
"O aplicativo será encerrado agora."
-#: src/slic3r/GUI/GUI_App.cpp:135
+#: src/slic3r/GUI/GUI_App.cpp:141
msgid "Fatal error"
msgstr "Erro fatal"
-#: src/slic3r/GUI/GUI_App.cpp:442
+#: src/slic3r/GUI/GUI_App.cpp:446
msgid "Changing of an application language"
msgstr "Alteração de um idioma do aplicativo"
-#: src/slic3r/GUI/GUI_App.cpp:450 src/slic3r/GUI/GUI_App.cpp:459
+#: src/slic3r/GUI/GUI_App.cpp:454 src/slic3r/GUI/GUI_App.cpp:463
msgid "Recreating"
msgstr "Recriando"
-#: src/slic3r/GUI/GUI_App.cpp:463
+#: src/slic3r/GUI/GUI_App.cpp:470
msgid "Loading of current presets"
msgstr "Carregando presets"
-#: src/slic3r/GUI/GUI_App.cpp:471
+#: src/slic3r/GUI/GUI_App.cpp:478
msgid "Loading of a mode view"
msgstr "Carregamento de um modelo de vista"
-#: src/slic3r/GUI/GUI_App.cpp:551
+#: src/slic3r/GUI/GUI_App.cpp:559
msgid "Choose one file (3MF/AMF):"
msgstr "Escolha um arquivo (3MF/AMF):"
-#: src/slic3r/GUI/GUI_App.cpp:563
+#: src/slic3r/GUI/GUI_App.cpp:571
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Escolha um ou mais arquivos (STL/OBJ/AMF/3MF/PRUSA):"
-#: src/slic3r/GUI/GUI_App.cpp:625
+#: src/slic3r/GUI/GUI_App.cpp:633
msgid "Select the language"
msgstr "Selecione a linguagem"
-#: src/slic3r/GUI/GUI_App.cpp:625
+#: src/slic3r/GUI/GUI_App.cpp:633
msgid "Language"
msgstr "Linguagem"
-#: src/slic3r/GUI/GUI_App.cpp:796
+#: src/slic3r/GUI/GUI_App.cpp:801
+#, c-format
+msgid "Run %s"
+msgstr "Executar %s"
+
+#: src/slic3r/GUI/GUI_App.cpp:804
msgid "&Configuration Snapshots"
msgstr "&Captura das config."
-#: src/slic3r/GUI/GUI_App.cpp:796
+#: src/slic3r/GUI/GUI_App.cpp:804
msgid "Inspect / activate configuration snapshots"
msgstr "Inspecionar / ativar capturas de config."
-#: src/slic3r/GUI/GUI_App.cpp:797
+#: src/slic3r/GUI/GUI_App.cpp:805
msgid "Take Configuration &Snapshot"
msgstr "Capturar &config."
-#: src/slic3r/GUI/GUI_App.cpp:797
+#: src/slic3r/GUI/GUI_App.cpp:805
msgid "Capture a configuration snapshot"
msgstr "Capturar uma config."
-#: src/slic3r/GUI/GUI_App.cpp:800
+#: src/slic3r/GUI/GUI_App.cpp:806
+msgid "Check for updates"
+msgstr "Verificar Atualizações"
+
+#: src/slic3r/GUI/GUI_App.cpp:806
+msgid "Check for configuration updates"
+msgstr "Verificar atualizações nas aplicações"
+
+#: src/slic3r/GUI/GUI_App.cpp:808
msgid "&Preferences"
msgstr "&Preferências"
-#: src/slic3r/GUI/GUI_App.cpp:806
+#: src/slic3r/GUI/GUI_App.cpp:814
msgid "Application preferences"
msgstr "Preferências de aplicação"
-#: src/slic3r/GUI/GUI_App.cpp:809 src/slic3r/GUI/wxExtensions.cpp:3043
+#: src/slic3r/GUI/GUI_App.cpp:817 src/slic3r/GUI/wxExtensions.cpp:756
msgid "Simple"
msgstr "Simples"
-#: src/slic3r/GUI/GUI_App.cpp:809
+#: src/slic3r/GUI/GUI_App.cpp:817
msgid "Simple View Mode"
msgstr "Modo simples de visualização"
-#: src/slic3r/GUI/GUI_App.cpp:810 src/slic3r/GUI/GUI_ObjectList.cpp:97
-#: src/slic3r/GUI/GUI_ObjectList.cpp:620 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1076 src/slic3r/GUI/Tab.cpp:1174
-#: src/slic3r/GUI/Tab.cpp:1177 src/slic3r/GUI/Tab.cpp:1685
-#: src/slic3r/GUI/Tab.cpp:2169 src/slic3r/GUI/Tab.cpp:3785
-#: src/slic3r/GUI/wxExtensions.cpp:3044 src/libslic3r/PrintConfig.cpp:83
-#: src/libslic3r/PrintConfig.cpp:197 src/libslic3r/PrintConfig.cpp:360
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:2226
+#: src/slic3r/GUI/GUI_App.cpp:818 src/slic3r/GUI/GUI_ObjectList.cpp:104
+#: src/slic3r/GUI/GUI_ObjectList.cpp:623 src/slic3r/GUI/Tab.cpp:1086
+#: src/slic3r/GUI/Tab.cpp:1101 src/slic3r/GUI/Tab.cpp:1200
+#: src/slic3r/GUI/Tab.cpp:1203 src/slic3r/GUI/Tab.cpp:1469
+#: src/slic3r/GUI/Tab.cpp:1969 src/slic3r/GUI/Tab.cpp:3665
+#: src/slic3r/GUI/wxExtensions.cpp:757 src/libslic3r/PrintConfig.cpp:88
+#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:223
+#: src/libslic3r/PrintConfig.cpp:1037 src/libslic3r/PrintConfig.cpp:2276
+#: src/libslic3r/PrintConfig.cpp:2448
msgid "Advanced"
msgstr "Avançado"
-#: src/slic3r/GUI/GUI_App.cpp:810
+#: src/slic3r/GUI/GUI_App.cpp:818
msgid "Advanced View Mode"
msgstr "Modo avançado de visualização"
-#: src/slic3r/GUI/GUI_App.cpp:811 src/slic3r/GUI/wxExtensions.cpp:3045
+#: src/slic3r/GUI/GUI_App.cpp:819 src/slic3r/GUI/wxExtensions.cpp:758
msgid "Expert"
msgstr "Especialista"
-#: src/slic3r/GUI/GUI_App.cpp:811
+#: src/slic3r/GUI/GUI_App.cpp:819
msgid "Expert View Mode"
msgstr "Modo especialista de visualização"
-#: src/slic3r/GUI/GUI_App.cpp:816
+#: src/slic3r/GUI/GUI_App.cpp:824
msgid "Mode"
msgstr "Modo"
-#: src/slic3r/GUI/GUI_App.cpp:816
+#: src/slic3r/GUI/GUI_App.cpp:824
#, c-format
msgid "%s View Mode"
msgstr "%s Modo de visualização"
-#: src/slic3r/GUI/GUI_App.cpp:818
-msgid "Change Application &Language"
-msgstr "Mudar &idioma"
+#: src/slic3r/GUI/GUI_App.cpp:826
+msgid "&Language"
+msgstr "&Linguagem"
-#: src/slic3r/GUI/GUI_App.cpp:820
+#: src/slic3r/GUI/GUI_App.cpp:828
msgid "Flash printer &firmware"
msgstr "Atualizar firmware &da impressora"
-#: src/slic3r/GUI/GUI_App.cpp:820
+#: src/slic3r/GUI/GUI_App.cpp:828
msgid "Upload a firmware image into an Arduino based printer"
msgstr "Atualizar o firmware para uma impressora baseada em Arduino"
-#: src/slic3r/GUI/GUI_App.cpp:832
+#: src/slic3r/GUI/GUI_App.cpp:843
msgid "Taking configuration snapshot"
msgstr "Capturando a config."
-#: src/slic3r/GUI/GUI_App.cpp:832
+#: src/slic3r/GUI/GUI_App.cpp:843
msgid "Snapshot name"
msgstr "Nome da captura"
-#: src/slic3r/GUI/GUI_App.cpp:875
+#: src/slic3r/GUI/GUI_App.cpp:886
msgid ""
"Switching the language will trigger application restart.\n"
"You will lose content of the plater."
@@ -1434,30 +2250,48 @@ msgstr ""
"Alterar a linguagem fará com que o aplicativo reinicie.\n"
"Você irá perder conteúdo na bandeja."
-#: src/slic3r/GUI/GUI_App.cpp:877
+#: src/slic3r/GUI/GUI_App.cpp:888
msgid "Do you want to proceed?"
msgstr "Você quer prosseguir?"
-#: src/slic3r/GUI/GUI_App.cpp:878
+#: src/slic3r/GUI/GUI_App.cpp:889
msgid "Language selection"
msgstr "Seleção de linguagem"
-#: src/slic3r/GUI/GUI_App.cpp:901
+#: src/slic3r/GUI/GUI_App.cpp:912
msgid "&Configuration"
msgstr "&Configuração"
-#: src/slic3r/GUI/GUI_App.cpp:923
+#: src/slic3r/GUI/GUI_App.cpp:936
msgid "The presets on the following tabs were modified"
msgstr "Os presets seguintes foram modificados"
-#: src/slic3r/GUI/GUI_App.cpp:923 src/slic3r/GUI/Tab.cpp:3133
+#: src/slic3r/GUI/GUI_App.cpp:936 src/slic3r/GUI/Tab.cpp:2948
msgid "Discard changes and continue anyway?"
msgstr "Descartar mudanças e continuar assim mesmo?"
-#: src/slic3r/GUI/GUI_App.cpp:926
+#: src/slic3r/GUI/GUI_App.cpp:939
msgid "Unsaved Presets"
msgstr "config. não salvas"
+#: src/slic3r/GUI/GUI_App.cpp:1088 src/slic3r/GUI/Tab.cpp:2960
+msgid "It's impossible to print multi-part object(s) with SLA technology."
+msgstr ""
+"É impossível imprimir objetos com múltiplas partes com a tecnologia SLA."
+
+#: src/slic3r/GUI/GUI_App.cpp:1089
+msgid "Please check and fix your object list."
+msgstr "Favor verificar e concertar sua lista de objetos."
+
+#: src/slic3r/GUI/GUI_App.cpp:1090 src/slic3r/GUI/Plater.cpp:2315
+#: src/slic3r/GUI/Tab.cpp:2962
+msgid "Attention!"
+msgstr "Atenção!"
+
+#: src/slic3r/GUI/GUI_App.cpp:1107
+msgid "Select a gcode file:"
+msgstr "Selecione um arquivo gcode:"
+
#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27
msgid "Start at height"
msgstr "Começar na altura"
@@ -1466,11 +2300,6 @@ msgstr "Começar na altura"
msgid "Stop at height"
msgstr "Parar na altura"
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:27 src/slic3r/GUI/Tab.cpp:1033
-#: src/libslic3r/PrintConfig.cpp:66
-msgid "Layer height"
-msgstr "Altura da camada"
-
#: src/slic3r/GUI/GUI_ObjectLayers.cpp:153
msgid "Remove layer range"
msgstr "Remover limite da camada"
@@ -1479,50 +2308,38 @@ msgstr "Remover limite da camada"
msgid "Add layer range"
msgstr "Adicionar limite da camada"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:88
-#: src/slic3r/GUI/GUI_ObjectList.cpp:611 src/libslic3r/PrintConfig.cpp:67
-#: src/libslic3r/PrintConfig.cpp:160 src/libslic3r/PrintConfig.cpp:392
-#: src/libslic3r/PrintConfig.cpp:453 src/libslic3r/PrintConfig.cpp:461
-#: src/libslic3r/PrintConfig.cpp:867 src/libslic3r/PrintConfig.cpp:1051
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1420
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:2037
-#: src/libslic3r/PrintConfig.cpp:2095
+#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:95
+#: src/slic3r/GUI/GUI_ObjectList.cpp:614 src/libslic3r/PrintConfig.cpp:72
+#: src/libslic3r/PrintConfig.cpp:175 src/libslic3r/PrintConfig.cpp:184
+#: src/libslic3r/PrintConfig.cpp:408 src/libslic3r/PrintConfig.cpp:470
+#: src/libslic3r/PrintConfig.cpp:478 src/libslic3r/PrintConfig.cpp:890
+#: src/libslic3r/PrintConfig.cpp:1075 src/libslic3r/PrintConfig.cpp:1374
+#: src/libslic3r/PrintConfig.cpp:1441 src/libslic3r/PrintConfig.cpp:1622
+#: src/libslic3r/PrintConfig.cpp:2074 src/libslic3r/PrintConfig.cpp:2133
+#: src/libslic3r/PrintConfig.cpp:2142
msgid "Layers and Perimeters"
msgstr "Camadas e perímetros"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:89
-#: src/slic3r/GUI/GUI_ObjectList.cpp:612 src/slic3r/GUI/Plater.cpp:497
-#: src/slic3r/GUI/Tab.cpp:1065 src/slic3r/GUI/Tab.cpp:1066
-#: src/libslic3r/PrintConfig.cpp:177 src/libslic3r/PrintConfig.cpp:400
-#: src/libslic3r/PrintConfig.cpp:420 src/libslic3r/PrintConfig.cpp:754
-#: src/libslic3r/PrintConfig.cpp:768 src/libslic3r/PrintConfig.cpp:805
-#: src/libslic3r/PrintConfig.cpp:958 src/libslic3r/PrintConfig.cpp:968
-#: src/libslic3r/PrintConfig.cpp:986 src/libslic3r/PrintConfig.cpp:1004
-#: src/libslic3r/PrintConfig.cpp:1023 src/libslic3r/PrintConfig.cpp:1708
-#: src/libslic3r/PrintConfig.cpp:1725
-msgid "Infill"
-msgstr "Preenchimento"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:90
-#: src/slic3r/GUI/GUI_ObjectList.cpp:613 src/slic3r/GUI/GUI_Preview.cpp:244
-#: src/slic3r/GUI/Tab.cpp:1094 src/slic3r/GUI/Tab.cpp:1095
-#: src/libslic3r/PrintConfig.cpp:344 src/libslic3r/PrintConfig.cpp:1481
-#: src/libslic3r/PrintConfig.cpp:1830 src/libslic3r/PrintConfig.cpp:1836
-#: src/libslic3r/PrintConfig.cpp:1844 src/libslic3r/PrintConfig.cpp:1856
-#: src/libslic3r/PrintConfig.cpp:1866 src/libslic3r/PrintConfig.cpp:1874
-#: src/libslic3r/PrintConfig.cpp:1889 src/libslic3r/PrintConfig.cpp:1910
-#: src/libslic3r/PrintConfig.cpp:1921 src/libslic3r/PrintConfig.cpp:1937
-#: src/libslic3r/PrintConfig.cpp:1946 src/libslic3r/PrintConfig.cpp:1955
-#: src/libslic3r/PrintConfig.cpp:1966 src/libslic3r/PrintConfig.cpp:1980
-#: src/libslic3r/PrintConfig.cpp:1988 src/libslic3r/PrintConfig.cpp:1989
-#: src/libslic3r/PrintConfig.cpp:1998 src/libslic3r/PrintConfig.cpp:2006
-#: src/libslic3r/PrintConfig.cpp:2020 src/libslic3r/GCode/PreviewData.cpp:156
+#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:97
+#: src/slic3r/GUI/GUI_ObjectList.cpp:616 src/slic3r/GUI/GUI_Preview.cpp:246
+#: src/slic3r/GUI/Tab.cpp:1119 src/slic3r/GUI/Tab.cpp:1120
+#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/PrintConfig.cpp:370
+#: src/libslic3r/PrintConfig.cpp:1502 src/libslic3r/PrintConfig.cpp:1866
+#: src/libslic3r/PrintConfig.cpp:1872 src/libslic3r/PrintConfig.cpp:1880
+#: src/libslic3r/PrintConfig.cpp:1892 src/libslic3r/PrintConfig.cpp:1902
+#: src/libslic3r/PrintConfig.cpp:1910 src/libslic3r/PrintConfig.cpp:1925
+#: src/libslic3r/PrintConfig.cpp:1946 src/libslic3r/PrintConfig.cpp:1958
+#: src/libslic3r/PrintConfig.cpp:1974 src/libslic3r/PrintConfig.cpp:1983
+#: src/libslic3r/PrintConfig.cpp:1992 src/libslic3r/PrintConfig.cpp:2003
+#: src/libslic3r/PrintConfig.cpp:2017 src/libslic3r/PrintConfig.cpp:2025
+#: src/libslic3r/PrintConfig.cpp:2026 src/libslic3r/PrintConfig.cpp:2035
+#: src/libslic3r/PrintConfig.cpp:2043 src/libslic3r/PrintConfig.cpp:2057
msgid "Support material"
msgstr "Material de suporte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:94
-#: src/slic3r/GUI/GUI_ObjectList.cpp:617 src/libslic3r/PrintConfig.cpp:2202
-#: src/libslic3r/PrintConfig.cpp:2210
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:101
+#: src/slic3r/GUI/GUI_ObjectList.cpp:620 src/libslic3r/PrintConfig.cpp:2252
+#: src/libslic3r/PrintConfig.cpp:2260
msgid "Wipe options"
msgstr "Opções de limpeza"
@@ -1546,487 +2363,508 @@ msgstr "Adicionar reforço de suporte"
msgid "Add support blocker"
msgstr "Adicionar bloqueador de suporte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:91 src/slic3r/GUI/GUI_ObjectList.cpp:614
-#: src/slic3r/GUI/GUI_Preview.cpp:223 src/slic3r/GUI/Tab.cpp:1119
-#: src/libslic3r/PrintConfig.cpp:209 src/libslic3r/PrintConfig.cpp:441
-#: src/libslic3r/PrintConfig.cpp:896 src/libslic3r/PrintConfig.cpp:1024
-#: src/libslic3r/PrintConfig.cpp:1410 src/libslic3r/PrintConfig.cpp:1647
-#: src/libslic3r/PrintConfig.cpp:1696 src/libslic3r/PrintConfig.cpp:1747
-#: src/libslic3r/PrintConfig.cpp:2080
+#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:617
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/Tab.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:235 src/libslic3r/PrintConfig.cpp:458
+#: src/libslic3r/PrintConfig.cpp:919 src/libslic3r/PrintConfig.cpp:1048
+#: src/libslic3r/PrintConfig.cpp:1431 src/libslic3r/PrintConfig.cpp:1668
+#: src/libslic3r/PrintConfig.cpp:1716 src/libslic3r/PrintConfig.cpp:1768
+#: src/libslic3r/PrintConfig.cpp:2118
msgid "Speed"
msgstr "Velocidade"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:92 src/slic3r/GUI/GUI_ObjectList.cpp:615
-#: src/slic3r/GUI/Tab.cpp:1154 src/slic3r/GUI/Tab.cpp:2043
-#: src/libslic3r/PrintConfig.cpp:471 src/libslic3r/PrintConfig.cpp:979
-#: src/libslic3r/PrintConfig.cpp:1389 src/libslic3r/PrintConfig.cpp:1717
-#: src/libslic3r/PrintConfig.cpp:1902 src/libslic3r/PrintConfig.cpp:1928
+#: src/slic3r/GUI/GUI_ObjectList.cpp:99 src/slic3r/GUI/GUI_ObjectList.cpp:618
+#: src/slic3r/GUI/Tab.cpp:1179 src/slic3r/GUI/Tab.cpp:1840
+#: src/libslic3r/PrintConfig.cpp:488 src/libslic3r/PrintConfig.cpp:1002
+#: src/libslic3r/PrintConfig.cpp:1409 src/libslic3r/PrintConfig.cpp:1737
+#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1965
msgid "Extruders"
msgstr "Exrtrusoras"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:93 src/slic3r/GUI/GUI_ObjectList.cpp:616
-#: src/libslic3r/PrintConfig.cpp:431 src/libslic3r/PrintConfig.cpp:538
-#: src/libslic3r/PrintConfig.cpp:855 src/libslic3r/PrintConfig.cpp:987
-#: src/libslic3r/PrintConfig.cpp:1398 src/libslic3r/PrintConfig.cpp:1737
-#: src/libslic3r/PrintConfig.cpp:1911 src/libslic3r/PrintConfig.cpp:2069
+#: src/slic3r/GUI/GUI_ObjectList.cpp:100 src/slic3r/GUI/GUI_ObjectList.cpp:619
+#: src/libslic3r/PrintConfig.cpp:447 src/libslic3r/PrintConfig.cpp:555
+#: src/libslic3r/PrintConfig.cpp:877 src/libslic3r/PrintConfig.cpp:1010
+#: src/libslic3r/PrintConfig.cpp:1418 src/libslic3r/PrintConfig.cpp:1757
+#: src/libslic3r/PrintConfig.cpp:1947 src/libslic3r/PrintConfig.cpp:2106
msgid "Extrusion Width"
msgstr "Espessura da extrusão"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:99 src/slic3r/GUI/GUI_ObjectList.cpp:622
-#: src/slic3r/GUI/Plater.cpp:465 src/slic3r/GUI/Tab.cpp:3737
-#: src/slic3r/GUI/Tab.cpp:3738 src/libslic3r/PrintConfig.cpp:2501
-#: src/libslic3r/PrintConfig.cpp:2508 src/libslic3r/PrintConfig.cpp:2517
-#: src/libslic3r/PrintConfig.cpp:2526 src/libslic3r/PrintConfig.cpp:2536
-#: src/libslic3r/PrintConfig.cpp:2562 src/libslic3r/PrintConfig.cpp:2569
-#: src/libslic3r/PrintConfig.cpp:2580 src/libslic3r/PrintConfig.cpp:2590
-#: src/libslic3r/PrintConfig.cpp:2599 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2622 src/libslic3r/PrintConfig.cpp:2631
-#: src/libslic3r/PrintConfig.cpp:2641 src/libslic3r/PrintConfig.cpp:2652
-#: src/libslic3r/PrintConfig.cpp:2660
+#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/GUI_ObjectList.cpp:625
+#: src/slic3r/GUI/Plater.cpp:495 src/slic3r/GUI/Tab.cpp:3606
+#: src/slic3r/GUI/Tab.cpp:3607 src/libslic3r/PrintConfig.cpp:2614
+#: src/libslic3r/PrintConfig.cpp:2621 src/libslic3r/PrintConfig.cpp:2630
+#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2649
+#: src/libslic3r/PrintConfig.cpp:2685 src/libslic3r/PrintConfig.cpp:2692
+#: src/libslic3r/PrintConfig.cpp:2703 src/libslic3r/PrintConfig.cpp:2713
+#: src/libslic3r/PrintConfig.cpp:2722 src/libslic3r/PrintConfig.cpp:2735
+#: src/libslic3r/PrintConfig.cpp:2745 src/libslic3r/PrintConfig.cpp:2754
+#: src/libslic3r/PrintConfig.cpp:2764 src/libslic3r/PrintConfig.cpp:2775
+#: src/libslic3r/PrintConfig.cpp:2783
msgid "Supports"
msgstr "Suportes"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:100 src/slic3r/GUI/GUI_ObjectList.cpp:623
-#: src/slic3r/GUI/Plater.cpp:603 src/slic3r/GUI/Tab.cpp:3769
-#: src/slic3r/GUI/Tab.cpp:3770 src/libslic3r/PrintConfig.cpp:2668
-#: src/libslic3r/PrintConfig.cpp:2675 src/libslic3r/PrintConfig.cpp:2689
-#: src/libslic3r/PrintConfig.cpp:2699 src/libslic3r/PrintConfig.cpp:2721
-#: src/libslic3r/PrintConfig.cpp:2732 src/libslic3r/PrintConfig.cpp:2739
-#: src/libslic3r/PrintConfig.cpp:2750 src/libslic3r/PrintConfig.cpp:2759
-#: src/libslic3r/PrintConfig.cpp:2768
+#: src/slic3r/GUI/GUI_ObjectList.cpp:107 src/slic3r/GUI/GUI_ObjectList.cpp:626
+#: src/slic3r/GUI/Plater.cpp:635 src/slic3r/GUI/Tab.cpp:3640
+#: src/slic3r/GUI/Tab.cpp:3641 src/libslic3r/PrintConfig.cpp:2791
+#: src/libslic3r/PrintConfig.cpp:2798 src/libslic3r/PrintConfig.cpp:2812
+#: src/libslic3r/PrintConfig.cpp:2823 src/libslic3r/PrintConfig.cpp:2833
+#: src/libslic3r/PrintConfig.cpp:2855 src/libslic3r/PrintConfig.cpp:2866
+#: src/libslic3r/PrintConfig.cpp:2873 src/libslic3r/PrintConfig.cpp:2880
+#: src/libslic3r/PrintConfig.cpp:2891 src/libslic3r/PrintConfig.cpp:2900
+#: src/libslic3r/PrintConfig.cpp:2909
msgid "Pad"
msgstr "Bloco"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:260
+#: src/slic3r/GUI/GUI_ObjectList.cpp:108 src/slic3r/GUI/Tab.cpp:3658
+#: src/slic3r/GUI/Tab.cpp:3659 src/libslic3r/SLA/Hollowing.cpp:46
+#: src/libslic3r/SLA/Hollowing.cpp:58 src/libslic3r/SLA/Hollowing.cpp:67
+#: src/libslic3r/SLA/Hollowing.cpp:76 src/libslic3r/PrintConfig.cpp:2919
+#: src/libslic3r/PrintConfig.cpp:2926 src/libslic3r/PrintConfig.cpp:2936
+#: src/libslic3r/PrintConfig.cpp:2945
+msgid "Hollowing"
+msgstr "Deixar oco"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:270
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:153
msgid "Name"
msgstr "Nome"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:271 src/slic3r/GUI/GUI_ObjectList.cpp:373
+#: src/slic3r/GUI/GUI_ObjectList.cpp:278 src/slic3r/GUI/Tab.cpp:1433
+#: src/slic3r/GUI/wxExtensions.cpp:598 src/libslic3r/PrintConfig.cpp:487
+msgid "Extruder"
+msgstr "Extrusora"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:282 src/slic3r/GUI/GUI_ObjectList.cpp:395
msgid "Editing"
msgstr "Edição"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:318
+#: src/slic3r/GUI/GUI_ObjectList.cpp:340
#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr "Auto reparando (%d erros):\n"
+msgid "Auto-repaired (%d errors):"
+msgstr "Auto reparando (%d erros):"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:325
+#: src/slic3r/GUI/GUI_ObjectList.cpp:347
msgid "degenerate facets"
msgstr "facetas degeneradas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:326
+#: src/slic3r/GUI/GUI_ObjectList.cpp:348
msgid "edges fixed"
msgstr "arestas fixadas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:327
+#: src/slic3r/GUI/GUI_ObjectList.cpp:349
msgid "facets removed"
msgstr "facetas removidas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:328
+#: src/slic3r/GUI/GUI_ObjectList.cpp:350
msgid "facets added"
msgstr "facetas adicionadas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:329
+#: src/slic3r/GUI/GUI_ObjectList.cpp:351
msgid "facets reversed"
msgstr "facetas reversidas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:330
+#: src/slic3r/GUI/GUI_ObjectList.cpp:352
msgid "backwards edges"
msgstr "arestas viradas para trás"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:338
+#: src/slic3r/GUI/GUI_ObjectList.cpp:360
msgid "Right button click the icon to fix STL through Netfabb"
msgstr ""
"Clique com o botão direito no ícone para arrumar STL através do Netfabb"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:375
+#: src/slic3r/GUI/GUI_ObjectList.cpp:397
msgid "Right button click the icon to change the object settings"
msgstr "Clique com o botão direito no ícone para mudar as config. do objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:377
+#: src/slic3r/GUI/GUI_ObjectList.cpp:399
msgid "Click the icon to change the object settings"
msgstr "Clique no ícone para mudar as config. do objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:381
+#: src/slic3r/GUI/GUI_ObjectList.cpp:403
msgid "Right button click the icon to change the object printable property"
msgstr ""
"Clique com o botão direito no ícone para mudar a propriedade de impressão do "
"objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:383
+#: src/slic3r/GUI/GUI_ObjectList.cpp:405
msgid "Click the icon to change the object printable property"
msgstr "Clique no ícone para mudar a propriedade de impressão do objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:428 src/slic3r/GUI/GUI_ObjectList.cpp:449
-#: src/slic3r/GUI/GUI_ObjectList.cpp:461 src/slic3r/GUI/GUI_ObjectList.cpp:3642
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3652
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3684 src/slic3r/GUI/wxExtensions.cpp:603
-#: src/slic3r/GUI/wxExtensions.cpp:660 src/slic3r/GUI/wxExtensions.cpp:685
-#: src/slic3r/GUI/wxExtensions.cpp:893
+#: src/slic3r/GUI/GUI_ObjectList.cpp:458 src/slic3r/GUI/GUI_ObjectList.cpp:470
+#: src/slic3r/GUI/GUI_ObjectList.cpp:918 src/slic3r/GUI/GUI_ObjectList.cpp:3968
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3978
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4013
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:200
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:257
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:282
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:490
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:1753
msgid "default"
msgstr "padrão"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:433 src/slic3r/GUI/Tab.cpp:1649
-#: src/libslic3r/PrintConfig.cpp:470
-msgid "Extruder"
-msgstr "Extrusora"
+#: src/slic3r/GUI/GUI_ObjectList.cpp:537
+msgid "Change Extruder"
+msgstr "Mudar extrusora"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:546
+#: src/slic3r/GUI/GUI_ObjectList.cpp:552
msgid "Rename Object"
msgstr "Renomear objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:546
+#: src/slic3r/GUI/GUI_ObjectList.cpp:552
msgid "Rename Sub-object"
msgstr "Renomear sub-objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:987 src/slic3r/GUI/GUI_ObjectList.cpp:3464
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1092
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3782
msgid "Instances to Separated Objects"
msgstr "Instâncias para separar objetos"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1005
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1107
msgid "Volumes in Object reordered"
msgstr "Volume reorganizados no objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1005
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1107
msgid "Object reordered"
msgstr "Objeto reorganizado"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1060
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1376
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1382
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1623
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1183
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1531
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1537
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1850
#, c-format
msgid "Quick Add Settings (%s)"
msgstr "Adicionar config. rapidamente (%s)"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1137
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1266
msgid "Select showing settings"
msgstr "Selecionar config. mostradas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1186
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1315
msgid "Add Settings for Layers"
msgstr "Adicionar config. para camadas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1187
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1316
msgid "Add Settings for Sub-object"
msgstr "Adicionar config. para sub-objetos"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1188
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1317
msgid "Add Settings for Object"
msgstr "Adicionar config. para objetos"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1249
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1387
msgid "Add Settings Bundle for Height range"
msgstr "Adicionar pacote de config. para intervalo de altura"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1250
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1388
msgid "Add Settings Bundle for Sub-object"
msgstr "Adicionar pacote de config. para subobjeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1251
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1389
msgid "Add Settings Bundle for Object"
msgstr "Adicionar pacote de config. para objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1290
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1428
msgid "Load"
msgstr "Carregar"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1295
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1320
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1323
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1433
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1465
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1469
msgid "Box"
msgstr "Caixa"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1295
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1433
msgid "Cylinder"
msgstr "Cilindro"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1295
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1433
msgid "Sphere"
msgstr "Esfera"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1295
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1433
msgid "Slab"
msgstr "Placa"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1347
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1501
msgid "Height range Modifier"
msgstr "Modificador de intervalo de altura"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1355
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1510
msgid "Add settings"
msgstr "Adicionar config."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1422
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1590
msgid "Change type"
msgstr "Mudar o tipo"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1429
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1577
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1600
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1612
msgid "Set as a Separated Object"
msgstr "Configurar como objeto separado"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1435
-msgid "Printable"
-msgstr "Imprimível"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1442
-msgid "Rename"
-msgstr "Renomear"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1453
-msgid "Fix through the Netfabb"
-msgstr "Arrumar através do Netfabb"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1463 src/slic3r/GUI/Plater.cpp:3552
-msgid "Export as STL"
-msgstr "Exportar como STL"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1470
-msgid "Change extruder"
-msgstr "Mudar extrusora"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1489 src/libslic3r/PrintConfig.cpp:309
-msgid "Default"
-msgstr "Padrão"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1495
-msgid "Select new extruder for the object/part"
-msgstr "Selecionar nova extrusora para objeto/parte"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1507
-msgid "Scale to print volume"
-msgstr "Escalar para volume de impressão"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1507
-msgid "Scale the selected object to fit the print volume"
-msgstr "Escale o objeto selecionado para se adequar ao volume de impressão"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1577
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1612
msgid "Set as a Separated Objects"
msgstr "Definir como objetos separados"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1652
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1622
+msgid "Printable"
+msgstr "Imprimível"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1637
+msgid "Rename"
+msgstr "Renomear"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1648
+msgid "Fix through the Netfabb"
+msgstr "Arrumar através do Netfabb"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1658 src/slic3r/GUI/Plater.cpp:3968
+msgid "Export as STL"
+msgstr "Exportar como STL"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1665
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3957 src/slic3r/GUI/Plater.cpp:3936
+msgid "Reload the selected volumes from disk"
+msgstr "Recarregue os volumes selecionados do disco"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1672
+msgid "Set extruder for selected items"
+msgstr "Definir extrusora para itens selecionados"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1705 src/libslic3r/PrintConfig.cpp:335
+msgid "Default"
+msgstr "Padrão"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1725
+msgid "Scale to print volume"
+msgstr "Escalar para volume de impressão"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1725
+msgid "Scale the selected object to fit the print volume"
+msgstr "Escale o objeto selecionado para se adequar ao volume de impressão"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1794
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2052
+msgid "Add Shape"
+msgstr "Adicionar forma"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1880
msgid "Load Part"
msgstr "Carregar parte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1687
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1919
msgid "Error!"
msgstr "Erro!"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1732
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1994
msgid "Add Generic Subobject"
msgstr "Adicionar sub-objeto genérico"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1739
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2023
msgid "Generic"
msgstr "Genérico"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1843
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1945
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2141
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2243
msgid "Last instance of an object cannot be deleted."
msgstr "A última instância de um objeto não pode ser excluída."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1855
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2153
msgid "Delete Settings"
msgstr "Deletar config."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1879
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2177
msgid "Delete All Instances from Object"
msgstr "Excluir todas as instâncias do objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1895
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2193
msgid "Delete Height Range"
msgstr "Excluir limite de altura"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1926
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2224
msgid "From Object List You can't delete the last solid part from object."
msgstr ""
"Na lista de objetos não é possível excluir a última parte sólida do objeto."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1930
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2228
msgid "Delete Subobject"
msgstr "Deletar sub-objeto"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1949
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2247
msgid "Delete Instance"
msgstr "Deletar instância"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1973 src/slic3r/GUI/Plater.cpp:2838
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2271 src/slic3r/GUI/Plater.cpp:2980
msgid ""
"The selected object couldn't be split because it contains only one part."
msgstr "O seguinte objeto não pode ser dividido pois contém uma parte."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1977
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2275
msgid "Split to Parts"
msgstr "Dividir em partes"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2025
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2329
msgid "Add Layers"
msgstr "Adicionar camadas"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2455
msgid "Group manipulation"
msgstr "Manipulação de grupos"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2162
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2467
msgid "Object manipulation"
msgstr "Manipulação de objetos"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2175
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2480
msgid "Object Settings to modify"
msgstr "config. do objeto para modificar"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2179
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2484
msgid "Part Settings to modify"
msgstr "config. da parte para modificar"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2184
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2489
msgid "Layer range Settings to modify"
msgstr "config. de intervalo de camada para modificar"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2190
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2495
msgid "Part manipulation"
msgstr "Manipulação da parte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2196
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2501
msgid "Instance manipulation"
msgstr "Manipulação da instância"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2203
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2508
+msgid "Height ranges"
+msgstr "Limites de altura"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2508
msgid "Settings for height range"
msgstr "config. para intervalo de altura"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2388
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2694
msgid "Delete Selected Item"
msgstr "Excluir item selecionado"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2525
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2831
msgid "Delete Selected"
msgstr "Excluir seleção"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2584
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2613
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2631
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2897
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2926
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2944
msgid "Add Height Range"
msgstr "Adicionar intervalo de altura"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2690
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3004
msgid "Edit Height Range"
msgstr "Editar intervalo de altura"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2974
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3292
msgid "Selection-Remove from list"
msgstr "Seleção-Remover da lista"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2982
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3300
msgid "Selection-Add from list"
msgstr "Seleção-Adicionar da lista"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3100
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3418
msgid "Object or Instance"
msgstr "Objeto ou instância"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3101
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3234
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3419
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3552
msgid "Part"
msgstr "Parte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3101
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3419
msgid "Layer"
msgstr "Camada"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3103
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3421
msgid "Unsupported selection"
msgstr "Seleção não suportada"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3104
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3422
#, c-format
msgid "You started your selection with %s Item."
msgstr "Você iniciou sua seleção com o item de %s."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3105
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3423
#, c-format
msgid "In this mode you can select only other %s Items%s"
msgstr "Neste modo, você pode selecionar apenas outros %s itens%s"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3108
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3426
msgid "of a current Object"
msgstr "de um objeto atual"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3113
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3188 src/slic3r/GUI/Plater.cpp:126
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3431
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3506 src/slic3r/GUI/Plater.cpp:141
msgid "Info"
msgstr "Informação"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3229
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3547
msgid "You can't change a type of the last solid part of the object."
msgstr "Não é possível alterar um tipo da última parte sólida do objeto."
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3234
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3552
msgid "Modifier"
msgstr "Modificador"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3234
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3552
msgid "Support Enforcer"
msgstr "Reforçador de suporte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3234
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3552
msgid "Support Blocker"
msgstr "Bloqueador de suporte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3236
-msgid "Type:"
-msgstr "Tipo:"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3236
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3554
msgid "Select type of part"
msgstr "Selecione o tipo de parte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3241
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3559
msgid "Change Part Type"
msgstr "Mudar o tipo da parte"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3486
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3804
msgid "Enter new name"
msgstr "Insira o novo nome"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3486
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3804
msgid "Renaming"
msgstr "Renomeando"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3502
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3608 src/slic3r/GUI/Tab.cpp:3618
-#: src/slic3r/GUI/Tab.cpp:3622
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3820
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3927 src/slic3r/GUI/Tab.cpp:3458
+#: src/slic3r/GUI/Tab.cpp:3462
msgid "The supplied name is not valid;"
msgstr "O nome inserido não é valido;"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3503
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3609 src/slic3r/GUI/Tab.cpp:3619
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3821
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3928 src/slic3r/GUI/Tab.cpp:3459
msgid "the following characters are not allowed:"
msgstr "os seguintes caracteres não são permitidos:"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3632
-msgid "Set extruder for selected items"
-msgstr "Definir extrusora para itens selecionados"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3633
-msgid "Select extruder number for selected objects and/or parts"
-msgstr "Selecione o número da extrusora para objetos e/ou peças selecionados"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3646
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3972
msgid "Select extruder number:"
msgstr "Selecione o número da extrusora:"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3647
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3973
msgid "This extruder will be set for selected items"
msgstr "Esta extrusora será ajustada para artigos selecionados"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3759 src/slic3r/GUI/Selection.cpp:1473
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3998
+msgid "Change Extruders"
+msgstr "Mudar extrusoras"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4095 src/slic3r/GUI/Selection.cpp:1475
msgid "Set Printable"
msgstr "Definir como imprimível"
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3759 src/slic3r/GUI/Selection.cpp:1473
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4095 src/slic3r/GUI/Selection.cpp:1475
msgid "Set Unprintable"
msgstr "Definir não imprimível"
@@ -2045,79 +2883,77 @@ msgid "Select coordinate space, in which the transformation will be performed."
msgstr ""
"Selecione o espaço de coordenadas, no qual a transformação será executada."
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:125
-msgid "Object Manipulation"
-msgstr "Manipulação de objeto"
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:178
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:155 src/libslic3r/GCode.cpp:638
msgid "Object name"
msgstr "Nome do objeto"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:214
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:215
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:457
+msgid "Position"
+msgstr "Posição"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:216
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:458
+#: src/slic3r/GUI/Mouse3DController.cpp:271
+#: src/slic3r/GUI/Mouse3DController.cpp:294
+msgid "Rotation"
+msgstr "Rotação"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:263
#, c-format
msgid "Toggle %c axis mirroring"
msgstr "Ativar espelhamento do eixo %c"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:247
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:297
msgid "Set Mirror"
msgstr "Definir espelhamento"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:287
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:292
-msgid "Reset scale"
-msgstr "Restabelecer escala"
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:305
-msgid "Reset rotation"
-msgstr "Restabelecer rotação"
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:330
-msgid "Reset Rotation"
-msgstr "Restabelecer Rotação"
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:342
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:357
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:337
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:349
msgid "Drop to bed"
msgstr "Soltar na mesa"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:390
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:454
-msgid "Position"
-msgstr "Posição"
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:363
+msgid "Reset rotation"
+msgstr "Restabelecer rotação"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:391
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:455
-msgid "Rotation"
-msgstr "Rotação"
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:385
+msgid "Reset Rotation"
+msgstr "Restabelecer Rotação"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:456
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:397
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:399
+msgid "Reset scale"
+msgstr "Restabelecer escala"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:459
msgid "Scale factors"
msgstr "Fatores de escala"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:513
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:516
msgid "Translate"
msgstr "Tradução"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:565
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:578
msgid ""
"You cannot use non-uniform scaling mode for multiple objects/parts selection"
msgstr ""
"Não é possível usar o modo de dimensionamento não uniforme para vários "
"objetos/seleção de peças"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:735
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:750
msgid "Set Position"
msgstr "Definir posição"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:766
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:781
msgid "Set Orientation"
msgstr "Definir orientação"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:831
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:846
msgid "Set Scale"
msgstr "Definir escala"
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:915
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:875
msgid ""
"The currently manipulated object is tilted (rotation angles are not "
"multiples of 90°).\n"
@@ -2131,7 +2967,7 @@ msgstr ""
"sistema de coordenadas do mundo,\n"
"uma vez que a rotação é incorporada nas coordenadas do objeto."
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:918
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:878
msgid ""
"This operation is irreversible.\n"
"Do you want to proceed?"
@@ -2152,387 +2988,491 @@ msgstr "Remover parâmetro"
msgid "Delete Option %s"
msgstr "Excluir opção %s"
-#: src/slic3r/GUI/GUI_ObjectSettings.cpp:146
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:152
#, c-format
msgid "Change Option %s"
msgstr "Alterar opção %s"
-#: src/slic3r/GUI/GUI_Preview.cpp:217
+#: src/slic3r/GUI/GUI_Preview.cpp:218
msgid "View"
msgstr "Vista"
-#: src/slic3r/GUI/GUI_Preview.cpp:220 src/slic3r/GUI/GUI_Preview.cpp:569
-#: src/libslic3r/GCode/PreviewData.cpp:378
+#: src/slic3r/GUI/GUI_Preview.cpp:221 src/slic3r/GUI/GUI_Preview.cpp:575
+#: src/libslic3r/GCode/PreviewData.cpp:345
msgid "Feature type"
msgstr "Tipo de recurso"
-#: src/slic3r/GUI/GUI_Preview.cpp:221 src/libslic3r/PrintConfig.cpp:483
+#: src/slic3r/GUI/GUI_Preview.cpp:222 src/libslic3r/PrintConfig.cpp:500
msgid "Height"
msgstr "Altura"
-#: src/slic3r/GUI/GUI_Preview.cpp:222 src/libslic3r/PrintConfig.cpp:2188
+#: src/slic3r/GUI/GUI_Preview.cpp:223 src/libslic3r/PrintConfig.cpp:2238
msgid "Width"
msgstr "Espessura"
-#: src/slic3r/GUI/GUI_Preview.cpp:224
+#: src/slic3r/GUI/GUI_Preview.cpp:225 src/slic3r/GUI/Tab.cpp:1456
+msgid "Fan speed"
+msgstr "Velocidade do ventoinha"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:226
msgid "Volumetric flow rate"
msgstr "Taxa de fluxo volumétrico"
-#: src/slic3r/GUI/GUI_Preview.cpp:225 src/slic3r/GUI/GUI_Preview.cpp:333
-#: src/slic3r/GUI/GUI_Preview.cpp:515 src/slic3r/GUI/GUI_Preview.cpp:568
-#: src/slic3r/GUI/GUI_Preview.cpp:774 src/libslic3r/GCode/PreviewData.cpp:388
+#: src/slic3r/GUI/GUI_Preview.cpp:227 src/slic3r/GUI/GUI_Preview.cpp:335
+#: src/slic3r/GUI/GUI_Preview.cpp:519 src/slic3r/GUI/GUI_Preview.cpp:574
+#: src/slic3r/GUI/GUI_Preview.cpp:835 src/libslic3r/GCode/PreviewData.cpp:357
msgid "Tool"
msgstr "Ferramenta"
-#: src/slic3r/GUI/GUI_Preview.cpp:226 src/slic3r/GUI/GUI_Preview.cpp:566
-#: src/libslic3r/GCode/PreviewData.cpp:390
+#: src/slic3r/GUI/GUI_Preview.cpp:228 src/slic3r/GUI/GUI_Preview.cpp:572
+#: src/libslic3r/GCode/PreviewData.cpp:359
msgid "Color Print"
msgstr "Impressão colorida"
-#: src/slic3r/GUI/GUI_Preview.cpp:229
+#: src/slic3r/GUI/GUI_Preview.cpp:231
msgid "Show"
msgstr "Mostrar"
-#: src/slic3r/GUI/GUI_Preview.cpp:232 src/slic3r/GUI/GUI_Preview.cpp:233
+#: src/slic3r/GUI/GUI_Preview.cpp:234 src/slic3r/GUI/GUI_Preview.cpp:235
msgid "Feature types"
msgstr "Tipos de características"
-#: src/slic3r/GUI/GUI_Preview.cpp:235 src/libslic3r/GCode/PreviewData.cpp:147
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/ExtrusionEntity.cpp:310
msgid "Perimeter"
msgstr "Perímetro"
-#: src/slic3r/GUI/GUI_Preview.cpp:236 src/libslic3r/GCode/PreviewData.cpp:148
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/ExtrusionEntity.cpp:311
msgid "External perimeter"
msgstr "Perímetro externo"
-#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/GCode/PreviewData.cpp:149
+#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/ExtrusionEntity.cpp:312
msgid "Overhang perimeter"
msgstr "Perímetro de angulação"
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/GCode/PreviewData.cpp:150
+#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/ExtrusionEntity.cpp:313
msgid "Internal infill"
msgstr "Preenchimento interno"
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:1736
-#: src/libslic3r/PrintConfig.cpp:1746 src/libslic3r/GCode/PreviewData.cpp:151
+#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/ExtrusionEntity.cpp:314
+#: src/libslic3r/PrintConfig.cpp:1756 src/libslic3r/PrintConfig.cpp:1767
msgid "Solid infill"
msgstr "Preenchimento sólido"
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2068
-#: src/libslic3r/PrintConfig.cpp:2079 src/libslic3r/GCode/PreviewData.cpp:152
+#: src/slic3r/GUI/GUI_Preview.cpp:242 src/libslic3r/ExtrusionEntity.cpp:315
+#: src/libslic3r/PrintConfig.cpp:2105 src/libslic3r/PrintConfig.cpp:2117
msgid "Top solid infill"
msgstr "Preenchimento do sólido do topo"
-#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/GCode/PreviewData.cpp:153
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/ExtrusionEntity.cpp:316
msgid "Bridge infill"
msgstr "Preenchimento de pontes"
-#: src/slic3r/GUI/GUI_Preview.cpp:242 src/libslic3r/PrintConfig.cpp:895
-#: src/libslic3r/GCode/PreviewData.cpp:154
+#: src/slic3r/GUI/GUI_Preview.cpp:244 src/libslic3r/ExtrusionEntity.cpp:317
+#: src/libslic3r/PrintConfig.cpp:918
msgid "Gap fill"
msgstr "Preenchimento de vão"
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/Tab.cpp:1085
-#: src/libslic3r/GCode/PreviewData.cpp:155
+#: src/slic3r/GUI/GUI_Preview.cpp:245 src/slic3r/GUI/Tab.cpp:1110
+#: src/libslic3r/ExtrusionEntity.cpp:318
msgid "Skirt"
msgstr "Saia"
-#: src/slic3r/GUI/GUI_Preview.cpp:245 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/GCode/PreviewData.cpp:157
+#: src/slic3r/GUI/GUI_Preview.cpp:247 src/libslic3r/ExtrusionEntity.cpp:320
+#: src/libslic3r/PrintConfig.cpp:1991
msgid "Support material interface"
msgstr "Interface do material de suporte"
-#: src/slic3r/GUI/GUI_Preview.cpp:246 src/slic3r/GUI/Tab.cpp:1165
-#: src/libslic3r/GCode/PreviewData.cpp:158
+#: src/slic3r/GUI/GUI_Preview.cpp:248 src/slic3r/GUI/Tab.cpp:1190
+#: src/libslic3r/ExtrusionEntity.cpp:321
msgid "Wipe tower"
msgstr "Torre de limpeza"
-#: src/slic3r/GUI/GUI_Preview.cpp:251 src/libslic3r/PrintConfig.cpp:2102
+#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/PrintConfig.cpp:2152
msgid "Travel"
msgstr "Viagem"
-#: src/slic3r/GUI/GUI_Preview.cpp:252
+#: src/slic3r/GUI/GUI_Preview.cpp:254
msgid "Retractions"
msgstr "Retrações"
-#: src/slic3r/GUI/GUI_Preview.cpp:253
+#: src/slic3r/GUI/GUI_Preview.cpp:255
msgid "Unretractions"
msgstr "Retorno da retração"
-#: src/slic3r/GUI/GUI_Preview.cpp:254
+#: src/slic3r/GUI/GUI_Preview.cpp:256
msgid "Shells"
msgstr "Paredes"
-#: src/slic3r/GUI/GUI_Preview.cpp:255
+#: src/slic3r/GUI/GUI_Preview.cpp:257
msgid "Legend"
msgstr "Legenda"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:14 src/slic3r/GUI/MainFrame.cpp:683
+#: src/slic3r/GUI/Job.hpp:123
+msgid "ERROR: not enough resources to execute a new job."
+msgstr "ERRO: não há recursos suficientes para executar um novo trabalho."
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:41 src/slic3r/GUI/MainFrame.cpp:719
msgid "Keyboard Shortcuts"
msgstr "Atalhos do teclado"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr "Abra o projeto STL/OBJ/AMF/3MF com config., excluir mesa"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr "Importação STL/OBJ/AMF/3MF sem config., manter a mesa"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr "Carregar config. de um .ini/AMF/3mf/Gcode"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110 src/slic3r/GUI/Plater.cpp:837
-#: src/slic3r/GUI/Plater.cpp:4822 src/libslic3r/PrintConfig.cpp:3163
-msgid "Export G-code"
-msgstr "Exportar G-code"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Save project (3MF)"
-msgstr "Salvar projeto (3MF)"
-
#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr "Carregar config. de um. ini/AMF/3mf/Gcode e mesclar"
+msgid "New project, clear plater"
+msgstr "Novo projeto, limpar a bandeja"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
+msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
+msgstr "Abra o projeto STL/OBJ/AMF/3MF com config, clear plater"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+msgid "Save project (3mf)"
+msgstr "Salvar projeto (3MF)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
+msgid "Save project as (3mf)"
+msgstr "Salvar projeto como (3mf)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
msgid "(Re)slice"
msgstr "(Re)fatiar"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
+msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
+msgstr "Importar STL/OBJ/AMF/3MF sem config, manter bandeja"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
+msgid "Import Config from ini/amf/3mf/gcode"
+msgstr "Config importação de ini/amf/3mf/gcode"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
+msgid "Load Config from ini/amf/3mf/gcode and merge"
+msgstr "Carregar config. de um. ini/AMF/3mf/Gcode e mesclar"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122 src/slic3r/GUI/Plater.cpp:891
+#: src/slic3r/GUI/Plater.cpp:5522 src/libslic3r/PrintConfig.cpp:3363
+msgid "Export G-code"
+msgstr "Exportar G-code"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Plater.cpp:5523
+msgid "Send G-code"
+msgstr "Enviar G-code"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+msgid "Export config"
+msgstr "Exportar config."
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Select all objects"
+msgstr "Selecionar todos os objetos"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
+msgid "Deselect all"
+msgstr "Desmarcar todos"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
+msgid "Delete selected"
+msgstr "Deletar seleção"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+msgid "Copy to clipboard"
+msgstr "Copiar para a área de transferência"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+msgid "Paste from clipboard"
+msgstr "Colar da área de transferência"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+msgid "Reload plater from disk"
+msgstr "Recarregar bandeja do disco"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
msgid "Select Plater Tab"
msgstr "Selecione a guia de bandeja"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
msgid "Select Print Settings Tab"
msgstr "Selecione a guia config. de impressão"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
msgid "Select Filament Settings Tab"
msgstr "Selecione a guia config. de filamento"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
msgid "Select Printer Settings Tab"
msgstr "Selecione a guia config. da impressora"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
msgid "Switch to 3D"
msgstr "Mude para 3D"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
msgid "Switch to Preview"
msgstr "Mudar para pré-visualização"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
#: src/slic3r/GUI/PrintHostDialogs.cpp:136
msgid "Print host upload queue"
msgstr "Fila de carregamento do host de impressão"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:125
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
msgid "Camera view"
msgstr "Vista da câmera"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Add Instance of the selected object"
-msgstr "Adicionar instância do objeto selecionado"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
+msgid "Show/Hide object/instance labels"
+msgstr "Mostrar/Ocultar rótulos de objeto/instância"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
-msgid "Remove Instance of the selected object"
-msgstr "Remover instância do objeto selecionado"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:149 src/slic3r/GUI/Preferences.cpp:10
+msgid "Preferences"
+msgstr "Preferências"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:151
msgid "Show keyboard shortcuts list"
msgstr "Mostrar lista dos atalhos no teclado"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
-msgid "Press to select multiple object or move multiple object with mouse"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
+msgid "Commands"
+msgstr "Comandos"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:159
+msgid "Add Instance of the selected object"
+msgstr "Adicionar instância do objeto selecionado"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:160
+msgid "Remove Instance of the selected object"
+msgstr "Remover instância do objeto selecionado"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:161
+msgid ""
+"Press to select multiple objects\n"
+"or move multiple objects with mouse"
msgstr ""
"Aperte para selecionar múltiplos objetos ou mover múltiplos objetos com o "
"mouse"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:131
-msgid "Main Shortcuts"
-msgstr "Atalhos principais"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:162
+msgid "Press to activate selection rectangle"
+msgstr "Pressione para ativar o retângulo de seleção"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Select All objects"
-msgstr "Selecionar todos os objetos"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
+msgid "Press to activate deselection rectangle"
+msgstr "Pressione para ativar o retângulo de desseleção"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Delete selected"
-msgstr "Deletar seleção"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Delete All"
-msgstr "Deletar todos"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Copy to clipboard"
-msgstr "Copiar para a área de transferência"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Paste from clipboard"
-msgstr "Colar da área de transferência"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Gizmo move"
-msgstr "Gizmo-Mover"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Gizmo scale"
-msgstr "Gizmo-Escala"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Gizmo rotate"
-msgstr "Gizmo-Rotacionar"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Gizmo cut"
-msgstr "Gizmo-Cortar"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:148
-msgid "Gizmo Place face on bed"
-msgstr "Colocar face do Gizmo na mesa"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Gizmo SLA support points"
-msgstr "Pontos de suporte do Gizmo SLA"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:150
-#, c-format
-msgid ""
-"Press to activate selection rectangle\n"
-"or to snap by 5% in Gizmo scale\n"
-"or to snap by 1mm in Gizmo move"
-msgstr ""
-"Pressione para ativar o retângulo de seleção\n"
-"ou para encaixar em 5% i na escala Gizmo\n"
-"ou para encaixar por 1mm em Gizmo mover"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:151
-msgid ""
-"Press to scale selection to fit print volume\n"
-"in Gizmo scale"
-msgstr ""
-"Pressione para dimensionar a seleção ao volume de impressão\n"
-"na escala Gizmo"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:152
-msgid ""
-"Press to activate deselection rectangle\n"
-"or to scale or rotate selected objects\n"
-"around their own center"
-msgstr ""
-"Pressione para ativar o retângulo de deseleção\n"
-"ou para dimensionar ou girar objetos selecionados\n"
-"em torno de seu próprio centro"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:153
-msgid "Press to activate one direction scaling in Gizmo scale"
-msgstr "Pressione para ativar um dimensionamento de direção na escala Gizmo"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
-msgid "Change camera type (perspective, orthographic)"
-msgstr "Alterar tipo de câmera (perspectiva, ortográfica)"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Zoom to Bed"
-msgstr "Ampliar para a mesa"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Zoom to all objects in scene, if none selected"
-msgstr "Ampliar para todos os objetos na cena, se nenhum selecionado"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:157
-msgid "Zoom to selected object"
-msgstr "Ampliar para o objeto selecionado"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Zoom in"
-msgstr "Ampliar"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:159
-msgid "Zoom out"
-msgstr "Dimiuir"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:160
-msgid "Unselect gizmo / Clear selection"
-msgstr "Desmarcar Gizmo/limpar seleção"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
-msgid "Plater Shortcuts"
-msgstr "Atalhos da bandeja"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:181
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:193
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:204
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:214
msgid "Arrow Up"
msgstr "Seta para cima"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:181
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
-msgid "Upper Layer"
-msgstr "Camada superior"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+msgid "Move selection 10 mm in positive Y direction"
+msgstr "Mover seleção 10 mm na direção Y positiva"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:194
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:205
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:215
msgid "Arrow Down"
msgstr "Seta para baixo"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
-msgid "Lower Layer"
-msgstr "Camada inferior"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+msgid "Move selection 10 mm in negative Y direction"
+msgstr "Mover seleção 10 mm na direção Y negativa"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
-msgid "Show/Hide (L)egend"
-msgstr "Mostrar/ocultar (L) egenda"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:187
-msgid "Preview Shortcuts"
-msgstr "Atalhos de visualização"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:193
-msgid "Move current slider thumb Up"
-msgstr "Mover a barra de rolagem para cima"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:194
-msgid "Move current slider thumb Down"
-msgstr "Mover a barra de rolagem para baixo"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:195
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:216
msgid "Arrow Left"
msgstr "Seta esquerda"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:195
-msgid "Set upper thumb to current slider thumb"
-msgstr "Definir o polegar superior para o polegar deslizante atual"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
+msgid "Move selection 10 mm in negative X direction"
+msgstr "Mover seleção 10 mm na direção X negativa"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:196
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
msgid "Arrow Right"
msgstr "Seta direita"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
+msgid "Move selection 10 mm in positive X direction"
+msgstr "Mover seleção 10 mm na direção X positiva"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:168
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
+msgid "Any arrow"
+msgstr "Qualquer flecha"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:168
+msgid "Movement step set to 1 mm"
+msgstr "Passo de movimento definido para 1 mm"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
+msgid "Movement in camera space"
+msgstr "Movimento no espaço da câmera"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+msgid "Page Up"
+msgstr "Page Up"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+msgid "Rotate selection 45 degrees CCW"
+msgstr "Seleção rotatura 45 graus CCW"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+msgid "Page Down"
+msgstr "Page Down"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+msgid "Rotate selection 45 degrees CW"
+msgstr "Seleção de rotação 45 graus CW"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+msgid "Gizmo move"
+msgstr "Gizmo-Mover"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
+msgid "Gizmo scale"
+msgstr "Gizmo-Escala"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:174
+msgid "Gizmo rotate"
+msgstr "Gizmo-Rotacionar"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+msgid "Gizmo cut"
+msgstr "Gizmo-Cortar"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+msgid "Gizmo Place face on bed"
+msgstr "Colocar face do Gizmo na mesa"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Gizmo SLA hollow"
+msgstr "Gizmo de SLA ligado"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Gizmo SLA support points"
+msgstr "Pontos de suporte do Gizmo SLA"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+msgid "Unselect gizmo or clear selection"
+msgstr "Desmarcar Gizmo/limpar seleção"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:180
+msgid "Change camera type (perspective, orthographic)"
+msgstr "Alterar tipo de câmera (perspectiva, ortográfica)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:181
+msgid "Zoom to Bed"
+msgstr "Ampliar para a mesa"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid ""
+"Zoom to selected object\n"
+"or all objects in scene, if none selected"
+msgstr ""
+"Zoom para objeto selecionado\n"
+"ou todos os objetos em cena, se nenhum selecionado"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
+msgid "Zoom in"
+msgstr "Ampliar"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
+msgid "Zoom out"
+msgstr "Dimiuir"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
+msgid "Show/Hide 3Dconnexion devices settings dialog"
+msgstr "Mostrar/Ocultar a caixa de configurações de dispositivos 3Dconnexion"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:192 src/slic3r/GUI/MainFrame.cpp:214
+msgid "Plater"
+msgstr "Bandeja"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:195
+#, no-c-format
+msgid ""
+"Press to snap by 5% in Gizmo scale\n"
+"or to snap by 1mm in Gizmo move"
+msgstr ""
+"Pressione para estalar 5% na escala Gizmo\n"
+"ou para estalar por 1mm no movimento Gizmo"
+
#: src/slic3r/GUI/KBShortcutsDialog.cpp:196
+msgid ""
+"Scale selection to fit print volume\n"
+"in Gizmo scale"
+msgstr ""
+"Seleção de escala para caber volume de impressão\n"
+"na escala Gizmo"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:197
+msgid "Press to activate one direction scaling in Gizmo scale"
+msgstr "Pressione para ativar um dimensionamento de direção na escala Gizmo"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
+msgid ""
+"Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\n"
+"selected objects around their own center"
+msgstr ""
+"Pressione para escalar (na escala de Gizmo) ou girar (em Gizmo girar)\n"
+"objetos selecionados em torno de seu próprio centro"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:201
+msgid "Gizmos"
+msgstr "Aparelhos"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:204
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:206
+msgid "Upper Layer"
+msgstr "Camada superior"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:205
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:207
+msgid "Lower Layer"
+msgstr "Camada inferior"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:208
+msgid "Show/Hide Legend"
+msgstr "Ligar/Desligar Legenda"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:211 src/slic3r/GUI/Plater.cpp:4107
+#: src/slic3r/GUI/Tab.cpp:2392
+msgid "Preview"
+msgstr "Visualização"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:214
+msgid "Move current slider thumb Up"
+msgstr "Mover a barra de rolagem para cima"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:215
+msgid "Move current slider thumb Down"
+msgstr "Mover a barra de rolagem para baixo"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:216
+msgid "Set upper thumb to current slider thumb"
+msgstr "Definir o polegar superior para o polegar deslizante atual"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
msgid "Set lower thumb to current slider thumb"
msgstr "Definir o polegar inferior para o polegar deslizante atual"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:197
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:218
msgid "Add color change marker for current layer"
msgstr "Adicionar mudança de cor para a camada atual"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:219
msgid "Delete color change marker for current layer"
msgstr "Excluir mudança de cor para a camada atual"
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:200
-msgid "Layers Slider Shortcuts"
-msgstr "Atalhos da barra de rolagem de camadas"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:222
+msgid "Layers Slider"
+msgstr "Controle deslizante de camadas"
-#: src/slic3r/GUI/MainFrame.cpp:64
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:245
+msgid "Keyboard shortcuts"
+msgstr "Atalhos do teclado"
+
+#: src/slic3r/GUI/MainFrame.cpp:66
msgid ""
" - Remember to check for updates at http://github.com/prusa3d/PrusaSlicer/"
"releases"
@@ -2540,571 +3480,616 @@ msgstr ""
" - Lembre-se de verificar por atualizações em http://github.com/prusa3d/"
"PrusaSlicer/releases"
-#: src/slic3r/GUI/MainFrame.cpp:159
+#: src/slic3r/GUI/MainFrame.cpp:184
msgid "based on Slic3r"
msgstr "baseado no Slic3r"
-#: src/slic3r/GUI/MainFrame.cpp:189
-msgid "Plater"
-msgstr "Bandeja"
-
-#: src/slic3r/GUI/MainFrame.cpp:400
+#: src/slic3r/GUI/MainFrame.cpp:415
msgid "&New Project"
msgstr "&Novo projeto"
-#: src/slic3r/GUI/MainFrame.cpp:400
+#: src/slic3r/GUI/MainFrame.cpp:415
msgid "Start a new project"
msgstr "Começar um novo projeto"
-#: src/slic3r/GUI/MainFrame.cpp:403
+#: src/slic3r/GUI/MainFrame.cpp:418
msgid "&Open Project"
msgstr "&Abrir projeto"
-#: src/slic3r/GUI/MainFrame.cpp:403
+#: src/slic3r/GUI/MainFrame.cpp:418
msgid "Open a project file"
msgstr "Abrir novo projeto"
-#: src/slic3r/GUI/MainFrame.cpp:408
+#: src/slic3r/GUI/MainFrame.cpp:423
msgid "Recent projects"
msgstr "Projetos recentes"
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "The selected project is no more available"
-msgstr "O projeto selecionado não está mais disponível"
+#: src/slic3r/GUI/MainFrame.cpp:432
+msgid ""
+"The selected project is no longer available.\n"
+"Do you want to remove it from the recent projects list ?"
+msgstr ""
+"O projeto selecionado não está mais disponível.\n"
+"Você quer removê-lo da lista de projetos recentes?"
-#: src/slic3r/GUI/MainFrame.cpp:417 src/slic3r/GUI/MainFrame.cpp:755
+#: src/slic3r/GUI/MainFrame.cpp:432 src/slic3r/GUI/MainFrame.cpp:796
#: src/slic3r/GUI/PrintHostDialogs.cpp:231
msgid "Error"
msgstr "Erro"
-#: src/slic3r/GUI/MainFrame.cpp:441
+#: src/slic3r/GUI/MainFrame.cpp:457
msgid "&Save Project"
msgstr "&Salvar projeto"
-#: src/slic3r/GUI/MainFrame.cpp:441
+#: src/slic3r/GUI/MainFrame.cpp:457
msgid "Save current project file"
msgstr "Salvar arquivo"
-#: src/slic3r/GUI/MainFrame.cpp:445 src/slic3r/GUI/MainFrame.cpp:447
+#: src/slic3r/GUI/MainFrame.cpp:461 src/slic3r/GUI/MainFrame.cpp:463
msgid "Save Project &as"
msgstr "Salvar projeto &como"
-#: src/slic3r/GUI/MainFrame.cpp:445 src/slic3r/GUI/MainFrame.cpp:447
+#: src/slic3r/GUI/MainFrame.cpp:461 src/slic3r/GUI/MainFrame.cpp:463
msgid "Save current project file as"
msgstr "Salvar arquivo atual como"
-#: src/slic3r/GUI/MainFrame.cpp:455
+#: src/slic3r/GUI/MainFrame.cpp:471
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Import STL/OBJ/AM&F/3MF"
-#: src/slic3r/GUI/MainFrame.cpp:455
+#: src/slic3r/GUI/MainFrame.cpp:471
msgid "Load a model"
msgstr "Carregar um modelo"
-#: src/slic3r/GUI/MainFrame.cpp:459
+#: src/slic3r/GUI/MainFrame.cpp:475
msgid "Import &Config"
msgstr "Importar &config."
-#: src/slic3r/GUI/MainFrame.cpp:459
+#: src/slic3r/GUI/MainFrame.cpp:475
msgid "Load exported configuration file"
msgstr "Carregar config. de arquivo exportado"
-#: src/slic3r/GUI/MainFrame.cpp:461
+#: src/slic3r/GUI/MainFrame.cpp:478
msgid "Import Config from &project"
msgstr "Importar Config do &projeto"
-#: src/slic3r/GUI/MainFrame.cpp:461
+#: src/slic3r/GUI/MainFrame.cpp:478
msgid "Load configuration from project file"
msgstr "Carregar config. de arquivo de projeto"
-#: src/slic3r/GUI/MainFrame.cpp:464
+#: src/slic3r/GUI/MainFrame.cpp:482
msgid "Import Config &Bundle"
msgstr "Importar coleção &de config."
-#: src/slic3r/GUI/MainFrame.cpp:464
+#: src/slic3r/GUI/MainFrame.cpp:482
msgid "Load presets from a bundle"
msgstr "Carregar predefinições de um pacote"
-#: src/slic3r/GUI/MainFrame.cpp:466
+#: src/slic3r/GUI/MainFrame.cpp:485
msgid "&Import"
msgstr "&Importar"
-#: src/slic3r/GUI/MainFrame.cpp:469 src/slic3r/GUI/MainFrame.cpp:719
+#: src/slic3r/GUI/MainFrame.cpp:488 src/slic3r/GUI/MainFrame.cpp:760
msgid "Export &G-code"
msgstr "Exportar &G-code"
-#: src/slic3r/GUI/MainFrame.cpp:469
+#: src/slic3r/GUI/MainFrame.cpp:488
msgid "Export current plate as G-code"
msgstr "Exporte a bandeja atual como o G-code"
-#: src/slic3r/GUI/MainFrame.cpp:473 src/slic3r/GUI/MainFrame.cpp:720
+#: src/slic3r/GUI/MainFrame.cpp:492 src/slic3r/GUI/MainFrame.cpp:761
msgid "S&end G-code"
msgstr "E&nviar G-code"
-#: src/slic3r/GUI/MainFrame.cpp:473
+#: src/slic3r/GUI/MainFrame.cpp:492
msgid "Send to print current plate as G-code"
msgstr "Enviar para imprimir a bandeja atual como G-code"
-#: src/slic3r/GUI/MainFrame.cpp:478
+#: src/slic3r/GUI/MainFrame.cpp:497
msgid "Export plate as &STL"
msgstr "Exportar bandeja como &STL"
-#: src/slic3r/GUI/MainFrame.cpp:478
+#: src/slic3r/GUI/MainFrame.cpp:497
msgid "Export current plate as STL"
msgstr "Exporte a bandeja atual como STL"
-#: src/slic3r/GUI/MainFrame.cpp:481
+#: src/slic3r/GUI/MainFrame.cpp:500
msgid "Export plate as STL &including supports"
msgstr "Exportar bandeja como STL &incluindo suportes"
-#: src/slic3r/GUI/MainFrame.cpp:481
+#: src/slic3r/GUI/MainFrame.cpp:500
msgid "Export current plate as STL including supports"
msgstr "Exporte a bandeja atual como o STL que inclui suportes"
-#: src/slic3r/GUI/MainFrame.cpp:484
+#: src/slic3r/GUI/MainFrame.cpp:503
msgid "Export plate as &AMF"
msgstr "Exportar bandeja como &AMF"
-#: src/slic3r/GUI/MainFrame.cpp:484
+#: src/slic3r/GUI/MainFrame.cpp:503
msgid "Export current plate as AMF"
msgstr "Exporte a bandeja atual como o AMF"
-#: src/slic3r/GUI/MainFrame.cpp:488
+#: src/slic3r/GUI/MainFrame.cpp:507
msgid "Export &toolpaths as OBJ"
msgstr "Exportar &percurso da ferramenta como OBJ"
-#: src/slic3r/GUI/MainFrame.cpp:488
+#: src/slic3r/GUI/MainFrame.cpp:507
msgid "Export toolpaths as OBJ"
msgstr "Exportar percursos como OBJ"
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:511
msgid "Export &Config"
msgstr "Exportar &config."
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:511
msgid "Export current configuration to file"
msgstr "Exporte a config. atual para o arquivo"
-#: src/slic3r/GUI/MainFrame.cpp:494
+#: src/slic3r/GUI/MainFrame.cpp:514
msgid "Export Config &Bundle"
msgstr "Exportar coleção &de config."
-#: src/slic3r/GUI/MainFrame.cpp:494
+#: src/slic3r/GUI/MainFrame.cpp:514
msgid "Export all presets to file"
msgstr "Exporte todas as predefinições para o arquivo"
-#: src/slic3r/GUI/MainFrame.cpp:496
+#: src/slic3r/GUI/MainFrame.cpp:517
msgid "&Export"
msgstr "&Exportar"
-#: src/slic3r/GUI/MainFrame.cpp:502
+#: src/slic3r/GUI/MainFrame.cpp:523
msgid "Quick Slice"
msgstr "Fatiamento rápido"
-#: src/slic3r/GUI/MainFrame.cpp:502
+#: src/slic3r/GUI/MainFrame.cpp:523
msgid "Slice a file into a G-code"
msgstr "Fatiar um arquivo em um G-code"
-#: src/slic3r/GUI/MainFrame.cpp:508
+#: src/slic3r/GUI/MainFrame.cpp:529
msgid "Quick Slice and Save As"
msgstr "Salvamento rápido e salvar como"
-#: src/slic3r/GUI/MainFrame.cpp:508
+#: src/slic3r/GUI/MainFrame.cpp:529
msgid "Slice a file into a G-code, save as"
msgstr "Fatiar um arquivo em um G-code, salvar como"
-#: src/slic3r/GUI/MainFrame.cpp:514
+#: src/slic3r/GUI/MainFrame.cpp:535
msgid "Repeat Last Quick Slice"
msgstr "Repetir Último Fatiamento Rápido"
-#: src/slic3r/GUI/MainFrame.cpp:514
+#: src/slic3r/GUI/MainFrame.cpp:535
msgid "Repeat last quick slice"
msgstr "Repetir último fatiamento rápido"
-#: src/slic3r/GUI/MainFrame.cpp:522
+#: src/slic3r/GUI/MainFrame.cpp:543
msgid "(Re)Slice No&w"
msgstr "(Re)Fatiar ago&ra"
-#: src/slic3r/GUI/MainFrame.cpp:522
+#: src/slic3r/GUI/MainFrame.cpp:543
msgid "Start new slicing process"
msgstr "Começar novo processo de fatiamento"
-#: src/slic3r/GUI/MainFrame.cpp:526
+#: src/slic3r/GUI/MainFrame.cpp:547
msgid "&Repair STL file"
msgstr "&Reparar arquivo STL"
-#: src/slic3r/GUI/MainFrame.cpp:526
+#: src/slic3r/GUI/MainFrame.cpp:547
msgid "Automatically repair an STL file"
msgstr "Reparar automaticamente um arquivo STL"
-#: src/slic3r/GUI/MainFrame.cpp:529
+#: src/slic3r/GUI/MainFrame.cpp:551
msgid "&Quit"
msgstr "&Sair"
-#: src/slic3r/GUI/MainFrame.cpp:529
+#: src/slic3r/GUI/MainFrame.cpp:551
#, c-format
msgid "Quit %s"
msgstr "Sair %s"
-#: src/slic3r/GUI/MainFrame.cpp:554
+#: src/slic3r/GUI/MainFrame.cpp:576
msgid "&Select all"
msgstr "&Selecionar todos"
-#: src/slic3r/GUI/MainFrame.cpp:555
+#: src/slic3r/GUI/MainFrame.cpp:577
msgid "Selects all objects"
msgstr "Selecionar todos os objetos"
-#: src/slic3r/GUI/MainFrame.cpp:557
+#: src/slic3r/GUI/MainFrame.cpp:579
msgid "D&eselect all"
msgstr "D&eselecionar todos"
-#: src/slic3r/GUI/MainFrame.cpp:558
+#: src/slic3r/GUI/MainFrame.cpp:580
msgid "Deselects all objects"
msgstr "Deselecionar todos os objetos"
-#: src/slic3r/GUI/MainFrame.cpp:561
+#: src/slic3r/GUI/MainFrame.cpp:583
msgid "&Delete selected"
msgstr "&Excluir seleção"
-#: src/slic3r/GUI/MainFrame.cpp:562
+#: src/slic3r/GUI/MainFrame.cpp:584
msgid "Deletes the current selection"
msgstr "Excluir a seleção atual"
-#: src/slic3r/GUI/MainFrame.cpp:564
+#: src/slic3r/GUI/MainFrame.cpp:586
msgid "Delete &all"
msgstr "Excluir &todos"
-#: src/slic3r/GUI/MainFrame.cpp:565
+#: src/slic3r/GUI/MainFrame.cpp:587
msgid "Deletes all objects"
msgstr "Excluir todos os objetos"
-#: src/slic3r/GUI/MainFrame.cpp:569
+#: src/slic3r/GUI/MainFrame.cpp:591
msgid "&Undo"
msgstr "&Desfazer"
-#: src/slic3r/GUI/MainFrame.cpp:572
+#: src/slic3r/GUI/MainFrame.cpp:594
msgid "&Redo"
msgstr "&Refazer"
-#: src/slic3r/GUI/MainFrame.cpp:577
+#: src/slic3r/GUI/MainFrame.cpp:599
msgid "&Copy"
msgstr "&Copiar"
-#: src/slic3r/GUI/MainFrame.cpp:578
+#: src/slic3r/GUI/MainFrame.cpp:600
msgid "Copy selection to clipboard"
msgstr "Copiar seleção para a área de transferência"
-#: src/slic3r/GUI/MainFrame.cpp:580
+#: src/slic3r/GUI/MainFrame.cpp:602
msgid "&Paste"
msgstr "&Colar"
-#: src/slic3r/GUI/MainFrame.cpp:581
+#: src/slic3r/GUI/MainFrame.cpp:603
msgid "Paste clipboard"
msgstr "Colar área de transferência"
-#: src/slic3r/GUI/MainFrame.cpp:590
+#: src/slic3r/GUI/MainFrame.cpp:607
+msgid "Re&load from disk"
+msgstr "Re&load do disco"
+
+#: src/slic3r/GUI/MainFrame.cpp:608
+msgid "Reload the plater from disk"
+msgstr "Recarregar a bendeja do disco"
+
+#: src/slic3r/GUI/MainFrame.cpp:617
msgid "&Plater Tab"
msgstr "&Bandeja"
-#: src/slic3r/GUI/MainFrame.cpp:590
+#: src/slic3r/GUI/MainFrame.cpp:617
msgid "Show the plater"
msgstr "Mostrar a bandeja"
-#: src/slic3r/GUI/MainFrame.cpp:597
+#: src/slic3r/GUI/MainFrame.cpp:625
msgid "P&rint Settings Tab"
msgstr "C&onfig. de impressão"
-#: src/slic3r/GUI/MainFrame.cpp:597
+#: src/slic3r/GUI/MainFrame.cpp:625
msgid "Show the print settings"
msgstr "Mostrar as config. de impressão"
-#: src/slic3r/GUI/MainFrame.cpp:599 src/slic3r/GUI/MainFrame.cpp:722
+#: src/slic3r/GUI/MainFrame.cpp:628 src/slic3r/GUI/MainFrame.cpp:763
msgid "&Filament Settings Tab"
msgstr "&config. de filamentos"
-#: src/slic3r/GUI/MainFrame.cpp:599
+#: src/slic3r/GUI/MainFrame.cpp:628
msgid "Show the filament settings"
msgstr "Mostrar as config. de filamento"
-#: src/slic3r/GUI/MainFrame.cpp:602
+#: src/slic3r/GUI/MainFrame.cpp:632
msgid "Print&er Settings Tab"
msgstr "A&ba de config. da impressora"
-#: src/slic3r/GUI/MainFrame.cpp:602
+#: src/slic3r/GUI/MainFrame.cpp:632
msgid "Show the printer settings"
msgstr "Mostrar as config. da impressora"
-#: src/slic3r/GUI/MainFrame.cpp:606
+#: src/slic3r/GUI/MainFrame.cpp:637
msgid "3&D"
msgstr "3&D"
-#: src/slic3r/GUI/MainFrame.cpp:606
+#: src/slic3r/GUI/MainFrame.cpp:637
msgid "Show the 3D editing view"
msgstr "Mostrar a vista de edição 3D"
-#: src/slic3r/GUI/MainFrame.cpp:609
+#: src/slic3r/GUI/MainFrame.cpp:640
msgid "Pre&view"
msgstr "Pre&visualização"
-#: src/slic3r/GUI/MainFrame.cpp:609
+#: src/slic3r/GUI/MainFrame.cpp:640
msgid "Show the 3D slices preview"
msgstr "Mostrar a pré-visualização do fatiamento 3D"
-#: src/slic3r/GUI/MainFrame.cpp:628
+#: src/slic3r/GUI/MainFrame.cpp:659
msgid "Print &Host Upload Queue"
msgstr "Imprimir &Fila de upload do Host"
-#: src/slic3r/GUI/MainFrame.cpp:628
+#: src/slic3r/GUI/MainFrame.cpp:659
msgid "Display the Print Host Upload Queue window"
msgstr "Exibir a janela fila de upload do host de impressão"
-#: src/slic3r/GUI/MainFrame.cpp:637
+#: src/slic3r/GUI/MainFrame.cpp:669
msgid "Iso"
msgstr "Isométrico"
-#: src/slic3r/GUI/MainFrame.cpp:637
+#: src/slic3r/GUI/MainFrame.cpp:669
msgid "Iso View"
msgstr "Vista isométrica"
#. TRN To be shown in the main menu View->Top
#. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:641 src/libslic3r/PrintConfig.cpp:2094
+#: src/slic3r/GUI/MainFrame.cpp:673 src/libslic3r/PrintConfig.cpp:2132
+#: src/libslic3r/PrintConfig.cpp:2141
msgid "Top"
msgstr "Topo"
-#: src/slic3r/GUI/MainFrame.cpp:641
+#: src/slic3r/GUI/MainFrame.cpp:673
msgid "Top View"
msgstr "Vista do topo"
#. TRN To be shown in the main menu View->Bottom
#. TRN To be shown in Print Settings "Bottom solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:644 src/libslic3r/PrintConfig.cpp:159
+#. TRN To be shown in Print Settings "Top solid layers"
+#: src/slic3r/GUI/MainFrame.cpp:676 src/libslic3r/PrintConfig.cpp:174
+#: src/libslic3r/PrintConfig.cpp:183
msgid "Bottom"
msgstr "Base"
-#: src/slic3r/GUI/MainFrame.cpp:644
+#: src/slic3r/GUI/MainFrame.cpp:676
msgid "Bottom View"
msgstr "Vista da base"
-#: src/slic3r/GUI/MainFrame.cpp:646
+#: src/slic3r/GUI/MainFrame.cpp:678
msgid "Front"
msgstr "Frente"
-#: src/slic3r/GUI/MainFrame.cpp:646
+#: src/slic3r/GUI/MainFrame.cpp:678
msgid "Front View"
msgstr "Vista da frente"
-#: src/slic3r/GUI/MainFrame.cpp:648 src/libslic3r/PrintConfig.cpp:1611
+#: src/slic3r/GUI/MainFrame.cpp:680 src/libslic3r/PrintConfig.cpp:1632
msgid "Rear"
msgstr "Traseira"
-#: src/slic3r/GUI/MainFrame.cpp:648
+#: src/slic3r/GUI/MainFrame.cpp:680
msgid "Rear View"
msgstr "Vista traseira"
-#: src/slic3r/GUI/MainFrame.cpp:650
+#: src/slic3r/GUI/MainFrame.cpp:682
msgid "Left"
msgstr "Esquerda"
-#: src/slic3r/GUI/MainFrame.cpp:650
+#: src/slic3r/GUI/MainFrame.cpp:682
msgid "Left View"
msgstr "Vista esquerda"
-#: src/slic3r/GUI/MainFrame.cpp:652
+#: src/slic3r/GUI/MainFrame.cpp:684
msgid "Right"
msgstr "Direita"
-#: src/slic3r/GUI/MainFrame.cpp:652
+#: src/slic3r/GUI/MainFrame.cpp:684
msgid "Right View"
msgstr "Vista direita"
-#: src/slic3r/GUI/MainFrame.cpp:659
+#: src/slic3r/GUI/MainFrame.cpp:687
+msgid "Show &labels"
+msgstr "Mostrar &rótulos"
+
+#: src/slic3r/GUI/MainFrame.cpp:687
+msgid "Show object/instance labels in 3D scene"
+msgstr "Mostrar rótulos de objeto/instância em cena 3D"
+
+#: src/slic3r/GUI/MainFrame.cpp:695
msgid "Prusa 3D &Drivers"
msgstr "Drivers 3D &Prusa"
-#: src/slic3r/GUI/MainFrame.cpp:659
+#: src/slic3r/GUI/MainFrame.cpp:695
msgid "Open the Prusa3D drivers download page in your browser"
msgstr "Abrir a página para baixar os drivers da Prusa3D no seu navegador"
-#: src/slic3r/GUI/MainFrame.cpp:661
+#: src/slic3r/GUI/MainFrame.cpp:697
msgid "Software &Releases"
msgstr "Lançamentos de &software"
-#: src/slic3r/GUI/MainFrame.cpp:661
+#: src/slic3r/GUI/MainFrame.cpp:697
msgid "Open the software releases page in your browser"
msgstr "Abrir a página de lançamentos de software no seu navegador"
-#: src/slic3r/GUI/MainFrame.cpp:667
+#: src/slic3r/GUI/MainFrame.cpp:703
#, c-format
msgid "%s &Website"
msgstr "%s &Site"
-#: src/slic3r/GUI/MainFrame.cpp:668
+#: src/slic3r/GUI/MainFrame.cpp:704
#, c-format
msgid "Open the %s website in your browser"
msgstr "Abra o site do %s no seu navegador"
-#: src/slic3r/GUI/MainFrame.cpp:674
+#: src/slic3r/GUI/MainFrame.cpp:710
msgid "System &Info"
msgstr "Informação &do sistema"
-#: src/slic3r/GUI/MainFrame.cpp:674
+#: src/slic3r/GUI/MainFrame.cpp:710
msgid "Show system information"
msgstr "Mostrar a informação do sistema"
-#: src/slic3r/GUI/MainFrame.cpp:676
+#: src/slic3r/GUI/MainFrame.cpp:712
msgid "Show &Configuration Folder"
msgstr "Mostrar &pasta de config."
-#: src/slic3r/GUI/MainFrame.cpp:676
+#: src/slic3r/GUI/MainFrame.cpp:712
msgid "Show user configuration folder (datadir)"
msgstr "Mostrar pasta de config. do usuário (datadir)"
-#: src/slic3r/GUI/MainFrame.cpp:678
+#: src/slic3r/GUI/MainFrame.cpp:714
msgid "Report an I&ssue"
msgstr "Reportar um p&roblema"
-#: src/slic3r/GUI/MainFrame.cpp:678
+#: src/slic3r/GUI/MainFrame.cpp:714
#, c-format
msgid "Report an issue on %s"
msgstr "Relatar um problema em %s"
-#: src/slic3r/GUI/MainFrame.cpp:680
+#: src/slic3r/GUI/MainFrame.cpp:716
#, c-format
msgid "&About %s"
msgstr "&Sobre %s"
-#: src/slic3r/GUI/MainFrame.cpp:680
+#: src/slic3r/GUI/MainFrame.cpp:716
msgid "Show about dialog"
msgstr "Mostrar diálogo sobre"
-#: src/slic3r/GUI/MainFrame.cpp:683
+#: src/slic3r/GUI/MainFrame.cpp:719
msgid "Show the list of the keyboard shortcuts"
msgstr "Mostrar lista dos atalhos no teclado"
-#: src/slic3r/GUI/MainFrame.cpp:691
+#: src/slic3r/GUI/MainFrame.cpp:732
msgid "&File"
msgstr "&Arquivo"
-#: src/slic3r/GUI/MainFrame.cpp:692
+#: src/slic3r/GUI/MainFrame.cpp:733
msgid "&Edit"
msgstr "&Editar"
-#: src/slic3r/GUI/MainFrame.cpp:693
+#: src/slic3r/GUI/MainFrame.cpp:734
msgid "&Window"
msgstr "&Janela"
-#: src/slic3r/GUI/MainFrame.cpp:694
+#: src/slic3r/GUI/MainFrame.cpp:735
msgid "&View"
msgstr "&Vista"
-#: src/slic3r/GUI/MainFrame.cpp:697
+#: src/slic3r/GUI/MainFrame.cpp:738
msgid "&Help"
msgstr "&Ajuda"
-#: src/slic3r/GUI/MainFrame.cpp:719
+#: src/slic3r/GUI/MainFrame.cpp:760
msgid "E&xport"
msgstr "E&xportar"
-#: src/slic3r/GUI/MainFrame.cpp:720
+#: src/slic3r/GUI/MainFrame.cpp:761
msgid "S&end to print"
msgstr "E&nviar para impressora"
-#: src/slic3r/GUI/MainFrame.cpp:722
+#: src/slic3r/GUI/MainFrame.cpp:763
msgid "Mate&rial Settings Tab"
msgstr "A&ba de config. de material"
-#: src/slic3r/GUI/MainFrame.cpp:743
+#: src/slic3r/GUI/MainFrame.cpp:784
msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Escolha um arquivo para fatiar (STL/OBJ/AMF/3MF/PRUSA):"
-#: src/slic3r/GUI/MainFrame.cpp:754
+#: src/slic3r/GUI/MainFrame.cpp:795
msgid "No previously sliced file."
msgstr "Sem arquivo fatiado anteriormente."
-#: src/slic3r/GUI/MainFrame.cpp:760
+#: src/slic3r/GUI/MainFrame.cpp:801
msgid "Previously sliced file ("
msgstr "Arquivo fatiado anteriormente ("
-#: src/slic3r/GUI/MainFrame.cpp:760
+#: src/slic3r/GUI/MainFrame.cpp:801
msgid ") not found."
msgstr ") não encontrado."
-#: src/slic3r/GUI/MainFrame.cpp:761
+#: src/slic3r/GUI/MainFrame.cpp:802
msgid "File Not Found"
msgstr "Arquivo não encontrado"
-#: src/slic3r/GUI/MainFrame.cpp:796
+#: src/slic3r/GUI/MainFrame.cpp:837
#, c-format
msgid "Save %s file as:"
msgstr "Salve o arquivo %s como:"
-#: src/slic3r/GUI/MainFrame.cpp:796
+#: src/slic3r/GUI/MainFrame.cpp:837
msgid "SVG"
msgstr "SVG"
-#: src/slic3r/GUI/MainFrame.cpp:796
+#: src/slic3r/GUI/MainFrame.cpp:837
msgid "G-code"
msgstr "G-code"
-#: src/slic3r/GUI/MainFrame.cpp:808
+#: src/slic3r/GUI/MainFrame.cpp:849
msgid "Save zip file as:"
msgstr "Salvar arquivo compactado(zip) como:"
-#: src/slic3r/GUI/MainFrame.cpp:817 src/slic3r/GUI/Plater.cpp:2981
-#: src/slic3r/GUI/Plater.cpp:4533 src/slic3r/GUI/Tab.cpp:1194
-#: src/slic3r/GUI/Tab.cpp:3786
+#: src/slic3r/GUI/MainFrame.cpp:858 src/slic3r/GUI/Plater.cpp:3123
+#: src/slic3r/GUI/Plater.cpp:5109 src/slic3r/GUI/Tab.cpp:1220
+#: src/slic3r/GUI/Tab.cpp:3666
msgid "Slicing"
msgstr "Fatiamento"
#. TRN "Processing input_file_basename"
-#: src/slic3r/GUI/MainFrame.cpp:819
+#: src/slic3r/GUI/MainFrame.cpp:860
#, c-format
msgid "Processing %s"
msgstr "Processando %s"
-#: src/slic3r/GUI/MainFrame.cpp:842
+#: src/slic3r/GUI/MainFrame.cpp:883
msgid " was successfully sliced."
msgstr " foi fatiado com sucesso."
-#: src/slic3r/GUI/MainFrame.cpp:844
+#: src/slic3r/GUI/MainFrame.cpp:885
msgid "Slicing Done!"
msgstr "Fatiamento completo!"
-#: src/slic3r/GUI/MainFrame.cpp:859
+#: src/slic3r/GUI/MainFrame.cpp:900
msgid "Select the STL file to repair:"
msgstr "Selecione o arquivo STL para corrigir:"
-#: src/slic3r/GUI/MainFrame.cpp:869
+#: src/slic3r/GUI/MainFrame.cpp:910
msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
msgstr ""
"Salvar arquivo OBJ (menos propenso a erros de coordenada que STL) como:"
-#: src/slic3r/GUI/MainFrame.cpp:881
+#: src/slic3r/GUI/MainFrame.cpp:922
msgid "Your file was repaired."
msgstr "Seu arquivo foi corrigido."
-#: src/slic3r/GUI/MainFrame.cpp:881 src/libslic3r/PrintConfig.cpp:3257
+#: src/slic3r/GUI/MainFrame.cpp:922 src/libslic3r/PrintConfig.cpp:3457
msgid "Repair"
msgstr "Corrigir"
-#: src/slic3r/GUI/MainFrame.cpp:895
+#: src/slic3r/GUI/MainFrame.cpp:936
msgid "Save configuration as:"
msgstr "Salvar config. como:"
-#: src/slic3r/GUI/MainFrame.cpp:914 src/slic3r/GUI/MainFrame.cpp:976
+#: src/slic3r/GUI/MainFrame.cpp:955 src/slic3r/GUI/MainFrame.cpp:1017
msgid "Select configuration to load:"
msgstr "Selecionar config. para carregar:"
-#: src/slic3r/GUI/MainFrame.cpp:950
+#: src/slic3r/GUI/MainFrame.cpp:991
msgid "Save presets bundle as:"
msgstr "Salvar pacote de predefinições como:"
-#: src/slic3r/GUI/MainFrame.cpp:997
+#: src/slic3r/GUI/MainFrame.cpp:1038
#, c-format
msgid "%d presets successfully imported."
msgstr "%d predefinições importadas com êxito."
+#: src/slic3r/GUI/Mouse3DController.cpp:239
+msgid "3Dconnexion settings"
+msgstr "Configurações de 3Dconnexion"
+
+#: src/slic3r/GUI/Mouse3DController.cpp:254
+msgid "Device:"
+msgstr "Dispositivo:"
+
+#: src/slic3r/GUI/Mouse3DController.cpp:261
+msgid "Speed:"
+msgstr "Velocidade:"
+
+#: src/slic3r/GUI/Mouse3DController.cpp:265
+#: src/slic3r/GUI/Mouse3DController.cpp:288
+msgid "Translation"
+msgstr "Tradução"
+
+#: src/slic3r/GUI/Mouse3DController.cpp:277
+#: src/slic3r/GUI/Mouse3DController.cpp:288
+msgid "Zoom"
+msgstr "Zoom"
+
+#: src/slic3r/GUI/Mouse3DController.cpp:284
+msgid "Deadzone:"
+msgstr "Zona morta:"
+
#: src/slic3r/GUI/MsgDialog.cpp:73
#, c-format
msgid "%s error"
@@ -3115,92 +4100,110 @@ msgstr "%s erro"
msgid "%s has encountered an error"
msgstr "%s encontrou um erro"
-#: src/slic3r/GUI/OptionsGroup.cpp:249
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:56
+msgid "Instances"
+msgstr "Instâncias"
+
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:60
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:216
+#, c-format
+msgid "Instance %d"
+msgstr "Instância %d"
+
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:67 src/slic3r/GUI/Tab.cpp:3514
+#: src/slic3r/GUI/Tab.cpp:3602
+msgid "Layers"
+msgstr "Camadas"
+
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:94
+msgid "Range"
+msgstr "Intervalo"
+
+#: src/slic3r/GUI/OptionsGroup.cpp:259
msgctxt "Layers"
msgid "Top"
msgstr "Topo"
-#: src/slic3r/GUI/OptionsGroup.cpp:249
+#: src/slic3r/GUI/OptionsGroup.cpp:259
msgctxt "Layers"
msgid "Bottom"
msgstr "Base"
-#: src/slic3r/GUI/Plater.cpp:146
+#: src/slic3r/GUI/Plater.cpp:161
msgid "Volume"
msgstr "Volume"
-#: src/slic3r/GUI/Plater.cpp:147
+#: src/slic3r/GUI/Plater.cpp:162
msgid "Facets"
msgstr "Facetas"
-#: src/slic3r/GUI/Plater.cpp:148
+#: src/slic3r/GUI/Plater.cpp:163
msgid "Materials"
msgstr "Materiais"
-#: src/slic3r/GUI/Plater.cpp:151
+#: src/slic3r/GUI/Plater.cpp:166
msgid "Manifold"
msgstr "Múltiplo"
-#: src/slic3r/GUI/Plater.cpp:201
+#: src/slic3r/GUI/Plater.cpp:216
msgid "Sliced Info"
msgstr "Informações fatiadas"
-#: src/slic3r/GUI/Plater.cpp:220 src/slic3r/GUI/Plater.cpp:1150
+#: src/slic3r/GUI/Plater.cpp:235 src/slic3r/GUI/Plater.cpp:1229
msgid "Used Filament (m)"
msgstr "Filamento utilizado (m)"
-#: src/slic3r/GUI/Plater.cpp:221
+#: src/slic3r/GUI/Plater.cpp:236
msgid "Used Filament (mm³)"
msgstr "Filamento utilizado (mm³)"
-#: src/slic3r/GUI/Plater.cpp:222
+#: src/slic3r/GUI/Plater.cpp:237
msgid "Used Filament (g)"
msgstr "Filamento utilizado (g)"
-#: src/slic3r/GUI/Plater.cpp:223
+#: src/slic3r/GUI/Plater.cpp:238
msgid "Used Material (unit)"
msgstr "Material utilizado (unidade)"
-#: src/slic3r/GUI/Plater.cpp:224 src/slic3r/GUI/Plater.cpp:1165
-#: src/libslic3r/PrintConfig.cpp:742
-msgid "Cost"
-msgstr "Custo"
+#: src/slic3r/GUI/Plater.cpp:239
+msgid "Cost (money)"
+msgstr "Custo (dinheiro)"
-#: src/slic3r/GUI/Plater.cpp:225 src/slic3r/GUI/Plater.cpp:1137
-#: src/slic3r/GUI/Plater.cpp:1179
+#: src/slic3r/GUI/Plater.cpp:240 src/slic3r/GUI/Plater.cpp:1216
+#: src/slic3r/GUI/Plater.cpp:1258
msgid "Estimated printing time"
msgstr "Tempo estimado de impressão"
-#: src/slic3r/GUI/Plater.cpp:226
+#: src/slic3r/GUI/Plater.cpp:241
msgid "Number of tool changes"
msgstr "Número de mudanças de ferramenta"
-#: src/slic3r/GUI/Plater.cpp:316
+#: src/slic3r/GUI/Plater.cpp:343
msgid "Click to edit preset"
msgstr "Clique para editar a predefinição"
-#: src/slic3r/GUI/Plater.cpp:468
+#: src/slic3r/GUI/Plater.cpp:498
msgid "Select what kind of support do you need"
msgstr "Selecione o tipo de suporte que você precisa"
-#: src/slic3r/GUI/Plater.cpp:470 src/libslic3r/PrintConfig.cpp:1865
-#: src/libslic3r/PrintConfig.cpp:2561
+#: src/slic3r/GUI/Plater.cpp:500 src/libslic3r/PrintConfig.cpp:1901
+#: src/libslic3r/PrintConfig.cpp:2684
msgid "Support on build plate only"
msgstr "Suportes somente na mesa de impressão"
-#: src/slic3r/GUI/Plater.cpp:471 src/slic3r/GUI/Plater.cpp:592
+#: src/slic3r/GUI/Plater.cpp:501 src/slic3r/GUI/Plater.cpp:624
msgid "For support enforcers only"
msgstr "Para apenas reforçadores de suporte"
-#: src/slic3r/GUI/Plater.cpp:472
+#: src/slic3r/GUI/Plater.cpp:502
msgid "Everywhere"
msgstr "Em toda parte"
-#: src/slic3r/GUI/Plater.cpp:504 src/slic3r/GUI/Tab.cpp:1091
+#: src/slic3r/GUI/Plater.cpp:534 src/slic3r/GUI/Tab.cpp:1116
msgid "Brim"
msgstr "Aba"
-#: src/slic3r/GUI/Plater.cpp:506
+#: src/slic3r/GUI/Plater.cpp:536
msgid ""
"This flag enables the brim that will be printed around each object on the "
"first layer."
@@ -3208,67 +4211,75 @@ msgstr ""
"Este sinalizador permite que a aba que será impressa em torno de cada objeto "
"na primeira camada."
-#: src/slic3r/GUI/Plater.cpp:514
+#: src/slic3r/GUI/Plater.cpp:544
msgid "Purging volumes"
msgstr "Volumes de purga"
-#: src/slic3r/GUI/Plater.cpp:606
+#: src/slic3r/GUI/Plater.cpp:638
msgid "Select what kind of pad do you need"
msgstr "Selecione o tipo de bloco que você precisa"
-#: src/slic3r/GUI/Plater.cpp:608
+#: src/slic3r/GUI/Plater.cpp:640
msgid "Below object"
msgstr "Abaixo do objeto"
-#: src/slic3r/GUI/Plater.cpp:609
+#: src/slic3r/GUI/Plater.cpp:641
msgid "Around object"
msgstr "Em torno do objeto"
-#: src/slic3r/GUI/Plater.cpp:781
+#: src/slic3r/GUI/Plater.cpp:815
msgid "Print settings"
msgstr "Config. de impressão"
-#: src/slic3r/GUI/Plater.cpp:782 src/slic3r/GUI/Tab.cpp:1640
-#: src/slic3r/GUI/Tab.cpp:1641
+#: src/slic3r/GUI/Plater.cpp:816 src/slic3r/GUI/Tab.cpp:1424
+#: src/slic3r/GUI/Tab.cpp:1425
msgid "Filament"
msgstr "Filamento"
-#: src/slic3r/GUI/Plater.cpp:783
+#: src/slic3r/GUI/Plater.cpp:817
msgid "SLA print settings"
msgstr "Config. de impressão de SLA"
-#: src/slic3r/GUI/Plater.cpp:784 src/slic3r/GUI/Preset.cpp:1314
+#: src/slic3r/GUI/Plater.cpp:818 src/slic3r/GUI/Preset.cpp:1536
msgid "SLA material"
msgstr "Material de SLA"
-#: src/slic3r/GUI/Plater.cpp:785
+#: src/slic3r/GUI/Plater.cpp:819
msgid "Printer"
msgstr "Impressora"
-#: src/slic3r/GUI/Plater.cpp:835 src/slic3r/GUI/Plater.cpp:4823
+#: src/slic3r/GUI/Plater.cpp:878 src/slic3r/GUI/Plater.cpp:5523
msgid "Send to printer"
msgstr "Enviar para a impressora"
-#: src/slic3r/GUI/Plater.cpp:838 src/slic3r/GUI/Plater.cpp:2981
-#: src/slic3r/GUI/Plater.cpp:4536
+#: src/slic3r/GUI/Plater.cpp:879
+msgid "Remove device"
+msgstr "Remover dispositivo"
+
+#: src/slic3r/GUI/Plater.cpp:880
+msgid "Export to SD card / Flash drive"
+msgstr "Exportar para cartão SD / unidade Flash"
+
+#: src/slic3r/GUI/Plater.cpp:892 src/slic3r/GUI/Plater.cpp:3123
+#: src/slic3r/GUI/Plater.cpp:5112
msgid "Slice now"
msgstr "Fatiar agora"
-#: src/slic3r/GUI/Plater.cpp:978
+#: src/slic3r/GUI/Plater.cpp:1042
msgid "Hold Shift to Slice & Export G-code"
msgstr "Hold Shift to Slice & Export G-code"
-#: src/slic3r/GUI/Plater.cpp:1083
+#: src/slic3r/GUI/Plater.cpp:1152
#, c-format
msgid "%d (%d shells)"
msgstr "%d (%d paredes)"
-#: src/slic3r/GUI/Plater.cpp:1088
+#: src/slic3r/GUI/Plater.cpp:1157
#, c-format
msgid "Auto-repaired (%d errors)"
msgstr "Auto reparando (%d erros):"
-#: src/slic3r/GUI/Plater.cpp:1091
+#: src/slic3r/GUI/Plater.cpp:1160
#, c-format
msgid ""
"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
@@ -3277,107 +4288,108 @@ msgstr ""
"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
"facets reversed, %d backwards edges"
-#: src/slic3r/GUI/Plater.cpp:1101
+#: src/slic3r/GUI/Plater.cpp:1170
msgid "Yes"
msgstr "Sim"
-#: src/slic3r/GUI/Plater.cpp:1124
+#: src/slic3r/GUI/Plater.cpp:1191
msgid "Used Material (ml)"
msgstr "Material usado (ml)"
-#: src/slic3r/GUI/Plater.cpp:1127
+#: src/slic3r/GUI/Plater.cpp:1194
msgid "object(s)"
msgstr "objeto(s)"
-#: src/slic3r/GUI/Plater.cpp:1127
+#: src/slic3r/GUI/Plater.cpp:1194
msgid "supports and pad"
msgstr "suportes e bloco"
-#: src/slic3r/GUI/Plater.cpp:1152 src/slic3r/GUI/Plater.cpp:1167
+#: src/slic3r/GUI/Plater.cpp:1231 src/slic3r/GUI/Plater.cpp:1245
msgid "objects"
msgstr "objetos"
-#: src/slic3r/GUI/Plater.cpp:1152 src/slic3r/GUI/Plater.cpp:1167
+#: src/slic3r/GUI/Plater.cpp:1231 src/slic3r/GUI/Plater.cpp:1245
msgid "wipe tower"
msgstr "torre de limpeza"
-#: src/slic3r/GUI/Plater.cpp:1182
-msgid "normal mode"
-msgstr "modo normal"
+#: src/slic3r/GUI/Plater.cpp:1243 src/libslic3r/PrintConfig.cpp:760
+#: src/libslic3r/PrintConfig.cpp:2510 src/libslic3r/PrintConfig.cpp:2511
+msgid "Cost"
+msgstr "Custo"
-#: src/slic3r/GUI/Plater.cpp:1186 src/slic3r/GUI/Plater.cpp:1195
-#: src/libslic3r/PrintConfig.cpp:565
+#: src/slic3r/GUI/Plater.cpp:1260 src/libslic3r/PrintConfig.cpp:582
msgid "Color"
msgstr "Cor"
-#: src/slic3r/GUI/Plater.cpp:1191
+#: src/slic3r/GUI/Plater.cpp:1261
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/slic3r/GUI/Plater.cpp:1286
+msgid "normal mode"
+msgstr "modo normal"
+
+#: src/slic3r/GUI/Plater.cpp:1291
msgid "stealth mode"
msgstr "modo silencioso"
-#: src/slic3r/GUI/Plater.cpp:1286
+#: src/slic3r/GUI/Plater.cpp:1395
msgid "Load File"
msgstr "Carregar arquivo"
-#: src/slic3r/GUI/Plater.cpp:1290
+#: src/slic3r/GUI/Plater.cpp:1399
msgid "Load Files"
msgstr "Carregar arquivos"
-#: src/slic3r/GUI/Plater.cpp:1519
-msgid "ERROR: not enough resources to execute a new job."
-msgstr "ERRO: não há recursos suficientes para executar um novo trabalho."
-
-#: src/slic3r/GUI/Plater.cpp:2089
+#: src/slic3r/GUI/Plater.cpp:2155
msgid "New Project"
msgstr "Novo projeto"
-#: src/slic3r/GUI/Plater.cpp:2206
+#: src/slic3r/GUI/Plater.cpp:2275
msgid "Loading"
msgstr "Carregando"
-#: src/slic3r/GUI/Plater.cpp:2216
+#: src/slic3r/GUI/Plater.cpp:2285
#, c-format
-msgid "Processing input file %s\n"
-msgstr "Processando o arquivo de entrada %s\n"
+msgid "Processing input file %s"
+msgstr "Processando o arquivo de entrada %s"
-#: src/slic3r/GUI/Plater.cpp:2244
-msgid ""
-"You can't load SLA project if there is at least one multi-part object on the "
-"bed"
+#: src/slic3r/GUI/Plater.cpp:2313
+msgid "You cannot load SLA project with a multi-part object on the bed"
msgstr ""
-"Não é possível carregar o projeto de SLA se houver pelo menos um objeto de "
-"várias partes na mesa"
+"Você não pode carregar o projeto SLA com um objeto de várias partes na cama"
-#: src/slic3r/GUI/Plater.cpp:2245 src/slic3r/GUI/Tab.cpp:3146
+#: src/slic3r/GUI/Plater.cpp:2314 src/slic3r/GUI/Tab.cpp:2961
msgid "Please check your object list before preset changing."
msgstr "Verifique a lista de objetos antes de alterar a predefinição."
-#: src/slic3r/GUI/Plater.cpp:2288
+#: src/slic3r/GUI/Plater.cpp:2359
msgid ""
-"This file contains several objects positioned at multiple heights. Instead "
-"of considering them as multiple objects, should I consider\n"
-"this file as a single object having multiple parts?\n"
+"This file contains several objects positioned at multiple heights.\n"
+"Instead of considering them as multiple objects, should I consider\n"
+"this file as a single object having multiple parts?"
msgstr ""
-"Este arquivo contém vários objetos posicionados em várias alturas. Em vez de "
-"considerá-los como múltiplos objetos, devo considerar\n"
-"Este arquivo como um único objeto com várias partes?\n"
+"Este arquivo contém vários objetos posicionados em várias alturas. \n"
+"Em vez de considerá-los como múltiplos objetos, devo considerar\n"
+"Este arquivo como um único objeto com várias partes?"
-#: src/slic3r/GUI/Plater.cpp:2291 src/slic3r/GUI/Plater.cpp:2343
+#: src/slic3r/GUI/Plater.cpp:2362 src/slic3r/GUI/Plater.cpp:2415
msgid "Multi-part object detected"
msgstr "Objeto de várias partes detectado"
-#: src/slic3r/GUI/Plater.cpp:2298
+#: src/slic3r/GUI/Plater.cpp:2369
msgid ""
"This file cannot be loaded in a simple mode. Do you want to switch to an "
-"advanced mode?\n"
+"advanced mode?"
msgstr ""
"Este arquivo não pode ser carregado em um modo simples. Deseja mudar para um "
-"modo avançado?\n"
+"modo avançado?"
-#: src/slic3r/GUI/Plater.cpp:2299
+#: src/slic3r/GUI/Plater.cpp:2370
msgid "Detected advanced data"
msgstr "Dados avançados detectados"
-#: src/slic3r/GUI/Plater.cpp:2320
+#: src/slic3r/GUI/Plater.cpp:2392
#, c-format
msgid ""
"You can't to add the object(s) from %s because of one or some of them "
@@ -3386,21 +4398,21 @@ msgstr ""
"Você não pode adicionar o objeto (s) %s por causa de um ou alguns deles é "
"(são) de várias partes"
-#: src/slic3r/GUI/Plater.cpp:2340
+#: src/slic3r/GUI/Plater.cpp:2412
msgid ""
"Multiple objects were loaded for a multi-material printer.\n"
"Instead of considering them as multiple objects, should I consider\n"
-"these files to represent a single object having multiple parts?\n"
+"these files to represent a single object having multiple parts?"
msgstr ""
"Vários objetos foram carregados para uma impressora de vários materiais.\n"
"Em vez de considerá-los como múltiplos objetos, devo considerar\n"
-"esses arquivos para representar um único objeto com várias partes?\n"
+"esses arquivos para representar um único objeto com várias partes?"
-#: src/slic3r/GUI/Plater.cpp:2356
+#: src/slic3r/GUI/Plater.cpp:2428
msgid "Loaded"
msgstr "Carregado"
-#: src/slic3r/GUI/Plater.cpp:2458
+#: src/slic3r/GUI/Plater.cpp:2530
msgid ""
"Your object appears to be too large, so it was automatically scaled down to "
"fit your print bed."
@@ -3408,69 +4420,89 @@ msgstr ""
"Seu objeto parece ser muito grande, por isso foi automaticamente "
"dimensionado para baixo para caber sua mesa de impressão."
-#: src/slic3r/GUI/Plater.cpp:2459
+#: src/slic3r/GUI/Plater.cpp:2531
msgid "Object too large?"
msgstr "Objeto muito grande?"
-#: src/slic3r/GUI/Plater.cpp:2517
+#: src/slic3r/GUI/Plater.cpp:2593
msgid "Export STL file:"
msgstr "Exportar arquivo STL:"
-#: src/slic3r/GUI/Plater.cpp:2524
+#: src/slic3r/GUI/Plater.cpp:2600
msgid "Export AMF file:"
msgstr "Exportar arquivo AMF:"
-#: src/slic3r/GUI/Plater.cpp:2530
+#: src/slic3r/GUI/Plater.cpp:2606
msgid "Save file as:"
msgstr "Salvar arquivo como:"
-#: src/slic3r/GUI/Plater.cpp:2536
+#: src/slic3r/GUI/Plater.cpp:2612
msgid "Export OBJ file:"
msgstr "Exportar arquivo OBJ:"
-#: src/slic3r/GUI/Plater.cpp:2638
+#: src/slic3r/GUI/Plater.cpp:2714
msgid "Delete Object"
msgstr "Excluir objeto"
-#: src/slic3r/GUI/Plater.cpp:2649
+#: src/slic3r/GUI/Plater.cpp:2725
msgid "Reset Project"
msgstr "Redefinir projeto"
-#: src/slic3r/GUI/Plater.cpp:2688
+#: src/slic3r/GUI/Plater.cpp:2762
+msgid "Hollow"
+msgstr "Vazado"
+
+#: src/slic3r/GUI/Plater.cpp:2769
msgid "Optimize Rotation"
msgstr "Otimize a rotação"
-#: src/slic3r/GUI/Plater.cpp:2734
+#: src/slic3r/GUI/Plater.cpp:2815
msgid "Arranging"
msgstr "Organizar"
-#: src/slic3r/GUI/Plater.cpp:2757
+#: src/slic3r/GUI/Plater.cpp:2837
msgid "Could not arrange model objects! Some geometries may be invalid."
msgstr ""
"Não foi possível organizar objetos de modelo! Algumas geometrias podem ser "
"inválidas."
-#: src/slic3r/GUI/Plater.cpp:2763
+#: src/slic3r/GUI/Plater.cpp:2843
msgid "Arranging canceled."
msgstr "Arranjo cancelado."
-#: src/slic3r/GUI/Plater.cpp:2764
+#: src/slic3r/GUI/Plater.cpp:2844
msgid "Arranging done."
msgstr "Arranjo feito."
-#: src/slic3r/GUI/Plater.cpp:2780
+#: src/slic3r/GUI/Plater.cpp:2860
msgid "Searching for optimal orientation"
msgstr "Procurando orientação ideal"
-#: src/slic3r/GUI/Plater.cpp:2813
+#: src/slic3r/GUI/Plater.cpp:2893
msgid "Orientation search canceled."
msgstr "Pesquisa de orientação cancelada."
-#: src/slic3r/GUI/Plater.cpp:2814
+#: src/slic3r/GUI/Plater.cpp:2894
msgid "Orientation found."
msgstr "Orientação encontrada."
-#: src/slic3r/GUI/Plater.cpp:2830
+#: src/slic3r/GUI/Plater.cpp:2924
+msgid "Indexing hollowed object"
+msgstr "Indexando objeto oco"
+
+#: src/slic3r/GUI/Plater.cpp:2928
+msgid "Hollowing cancelled."
+msgstr "Cancelado"
+
+#: src/slic3r/GUI/Plater.cpp:2929
+msgid "Hollowing done."
+msgstr "Deixado oco pronto."
+
+#: src/slic3r/GUI/Plater.cpp:2931
+msgid "Hollowing failed."
+msgstr "Deixar oco falhou."
+
+#: src/slic3r/GUI/Plater.cpp:2972
msgid ""
"The selected object can't be split because it contains more than one volume/"
"material."
@@ -3478,145 +4510,165 @@ msgstr ""
"O objeto selecionado não pode ser dividido porque contém mais de um volume/"
"material."
-#: src/slic3r/GUI/Plater.cpp:2841
+#: src/slic3r/GUI/Plater.cpp:2983
msgid "Split to Objects"
msgstr "Dividir em objetos"
-#: src/slic3r/GUI/Plater.cpp:2966
+#: src/slic3r/GUI/Plater.cpp:3108
msgid "Invalid data"
msgstr "Dados inválidos"
-#: src/slic3r/GUI/Plater.cpp:2975
+#: src/slic3r/GUI/Plater.cpp:3117
msgid "Ready to slice"
msgstr "Pronto para fatiar"
-#: src/slic3r/GUI/Plater.cpp:3013 src/slic3r/GUI/PrintHostDialogs.cpp:232
+#: src/slic3r/GUI/Plater.cpp:3155 src/slic3r/GUI/PrintHostDialogs.cpp:232
msgid "Cancelling"
msgstr "Cancelar"
-#: src/slic3r/GUI/Plater.cpp:3030
+#: src/slic3r/GUI/Plater.cpp:3172
msgid "Another export job is currently running."
msgstr "Outro trabalho de exportação está em execução no momento."
-#: src/slic3r/GUI/Plater.cpp:3084 src/slic3r/GUI/Plater.cpp:3549
-msgid "Reload from Disk"
-msgstr "Recarregar a partir do disco"
+#: src/slic3r/GUI/Plater.cpp:3288
+msgid "Please select the file to reload"
+msgstr "Selecione o arquivo STL para recarregar"
-#: src/slic3r/GUI/Plater.cpp:3120
+#: src/slic3r/GUI/Plater.cpp:3323
+msgid "It is not allowed to change the file to reload"
+msgstr "Não é permitido alterar o arquivo para recarregar"
+
+#: src/slic3r/GUI/Plater.cpp:3323
+msgid "Do you want to retry"
+msgstr "Você quer prosseguir"
+
+#: src/slic3r/GUI/Plater.cpp:3341
+msgid "Reload from:"
+msgstr "Recarregar a partir do disco:"
+
+#: src/slic3r/GUI/Plater.cpp:3430
+msgid "Unable to reload:"
+msgstr "Não é possível recarregar:"
+
+#: src/slic3r/GUI/Plater.cpp:3435
+msgid "Error during reload"
+msgstr "Erro durante a recarga"
+
+#: src/slic3r/GUI/Plater.cpp:3454
+msgid "Reload all from disk"
+msgstr "Recarregar tudo do disco"
+
+#: src/slic3r/GUI/Plater.cpp:3475
msgid "Fix Throught NetFabb"
msgstr "Arrumar através do NetFabb"
-#: src/slic3r/GUI/Plater.cpp:3307
+#: src/slic3r/GUI/Plater.cpp:3666
msgid "Export failed"
msgstr "Falha na exportação"
-#: src/slic3r/GUI/Plater.cpp:3312 src/slic3r/GUI/PrintHostDialogs.cpp:233
+#: src/slic3r/GUI/Plater.cpp:3671 src/slic3r/GUI/PrintHostDialogs.cpp:233
msgid "Cancelled"
msgstr "Cancelado"
-#: src/slic3r/GUI/Plater.cpp:3520 src/slic3r/GUI/Plater.cpp:3539
+#: src/slic3r/GUI/Plater.cpp:3933 src/slic3r/GUI/Plater.cpp:3955
msgid "Remove the selected object"
msgstr "Remover o objeto selecionado"
-#: src/slic3r/GUI/Plater.cpp:3526
+#: src/slic3r/GUI/Plater.cpp:3942
msgid "Add one more instance of the selected object"
msgstr "Adicionar mais uma instância do objeto selecionado"
-#: src/slic3r/GUI/Plater.cpp:3528
+#: src/slic3r/GUI/Plater.cpp:3944
msgid "Remove one instance of the selected object"
msgstr "Remover uma instância do objeto selecionado"
-#: src/slic3r/GUI/Plater.cpp:3530
+#: src/slic3r/GUI/Plater.cpp:3946
msgid "Set number of instances"
msgstr "Definir o número de instâncias"
-#: src/slic3r/GUI/Plater.cpp:3530
+#: src/slic3r/GUI/Plater.cpp:3946
msgid "Change the number of instances of the selected object"
msgstr "Alterar o número de instâncias do objeto selecionado"
-#: src/slic3r/GUI/Plater.cpp:3549
-msgid "Reload the selected file from Disk"
-msgstr "Recarregar o arquivo selecionado a partir do disco"
+#: src/slic3r/GUI/Plater.cpp:3965
+msgid "Reload the selected object from disk"
+msgstr "Recarregue o objeto selecionado do disco"
-#: src/slic3r/GUI/Plater.cpp:3552
+#: src/slic3r/GUI/Plater.cpp:3968
msgid "Export the selected object as STL file"
msgstr "Exportar o objeto selecionado como arquivo STL"
-#: src/slic3r/GUI/Plater.cpp:3577
+#: src/slic3r/GUI/Plater.cpp:3997
msgid "Along X axis"
msgstr "Ao longo do eixo X"
-#: src/slic3r/GUI/Plater.cpp:3577
+#: src/slic3r/GUI/Plater.cpp:3997
msgid "Mirror the selected object along the X axis"
msgstr "Espelhar o objeto selecionado ao longo do eixo X"
-#: src/slic3r/GUI/Plater.cpp:3579
+#: src/slic3r/GUI/Plater.cpp:3999
msgid "Along Y axis"
msgstr "Ao longo do eixo Y"
-#: src/slic3r/GUI/Plater.cpp:3579
+#: src/slic3r/GUI/Plater.cpp:3999
msgid "Mirror the selected object along the Y axis"
msgstr "Espelhar o objeto selecionado ao longo do eixo Y"
-#: src/slic3r/GUI/Plater.cpp:3581
+#: src/slic3r/GUI/Plater.cpp:4001
msgid "Along Z axis"
msgstr "Ao longo do eixo Z"
-#: src/slic3r/GUI/Plater.cpp:3581
+#: src/slic3r/GUI/Plater.cpp:4001
msgid "Mirror the selected object along the Z axis"
msgstr "Espelhar o objeto selecionado ao longo do eixo Z"
-#: src/slic3r/GUI/Plater.cpp:3584
+#: src/slic3r/GUI/Plater.cpp:4004
msgid "Mirror"
msgstr "Espelhar"
-#: src/slic3r/GUI/Plater.cpp:3584
+#: src/slic3r/GUI/Plater.cpp:4004
msgid "Mirror the selected object"
msgstr "Espelhar o objeto selecionado"
-#: src/slic3r/GUI/Plater.cpp:3596
+#: src/slic3r/GUI/Plater.cpp:4016
msgid "To objects"
msgstr "Para objetos"
-#: src/slic3r/GUI/Plater.cpp:3596 src/slic3r/GUI/Plater.cpp:3616
+#: src/slic3r/GUI/Plater.cpp:4016 src/slic3r/GUI/Plater.cpp:4036
msgid "Split the selected object into individual objects"
msgstr "Dividir o objeto selecionado em objetos individuais"
-#: src/slic3r/GUI/Plater.cpp:3598
+#: src/slic3r/GUI/Plater.cpp:4018
msgid "To parts"
msgstr "Para peças"
-#: src/slic3r/GUI/Plater.cpp:3598 src/slic3r/GUI/Plater.cpp:3630
+#: src/slic3r/GUI/Plater.cpp:4018 src/slic3r/GUI/Plater.cpp:4050
msgid "Split the selected object into individual sub-parts"
msgstr "Dividir o objeto selecionado em subpartes individuais"
-#: src/slic3r/GUI/Plater.cpp:3601 src/slic3r/GUI/Plater.cpp:3616
-#: src/slic3r/GUI/Plater.cpp:3630 src/libslic3r/PrintConfig.cpp:3281
+#: src/slic3r/GUI/Plater.cpp:4021 src/slic3r/GUI/Plater.cpp:4036
+#: src/slic3r/GUI/Plater.cpp:4050 src/libslic3r/PrintConfig.cpp:3481
msgid "Split"
msgstr "Dividir"
-#: src/slic3r/GUI/Plater.cpp:3601
+#: src/slic3r/GUI/Plater.cpp:4021
msgid "Split the selected object"
msgstr "Dividir o objeto selecionado"
-#: src/slic3r/GUI/Plater.cpp:3622
+#: src/slic3r/GUI/Plater.cpp:4042
msgid "Optimize orientation"
msgstr "Otimize a orientação"
-#: src/slic3r/GUI/Plater.cpp:3622
+#: src/slic3r/GUI/Plater.cpp:4042
msgid "Optimize the rotation of the object for better print results."
msgstr ""
"Otimize a rotação do objeto para obter melhores resultados de impressão."
-#: src/slic3r/GUI/Plater.cpp:3662
+#: src/slic3r/GUI/Plater.cpp:4099
msgid "3D editor view"
msgstr "vista do editor 3D"
-#: src/slic3r/GUI/Plater.cpp:3670 src/slic3r/GUI/Tab.cpp:2590
-msgid "Preview"
-msgstr "Visualização"
-
-#: src/slic3r/GUI/Plater.cpp:3907
+#: src/slic3r/GUI/Plater.cpp:4402
msgid ""
"%1% printer was active at the time the target Undo / Redo snapshot was "
"taken. Switching to %1% printer requires reloading of %1% presets."
@@ -3625,98 +4677,111 @@ msgstr ""
"refazer de destino foi tirado. Mudar para %1% impressora requer recarga de "
"%1% predefinições."
-#: src/slic3r/GUI/Plater.cpp:4081
+#: src/slic3r/GUI/Plater.cpp:4577
msgid "Load Project"
msgstr "Carregar projeto"
-#: src/slic3r/GUI/Plater.cpp:4109
+#: src/slic3r/GUI/Plater.cpp:4605
msgid "Import Object"
msgstr "Importar objeto"
-#: src/slic3r/GUI/Plater.cpp:4113
+#: src/slic3r/GUI/Plater.cpp:4609
msgid "Import Objects"
msgstr "Importar objetos"
-#: src/slic3r/GUI/Plater.cpp:4172
-msgid "All objects will be removed, continue ?"
+#: src/slic3r/GUI/Plater.cpp:4671
+msgid "All objects will be removed, continue?"
msgstr "Todos os objetos serão removidos, continuar?"
-#: src/slic3r/GUI/Plater.cpp:4180
+#: src/slic3r/GUI/Plater.cpp:4679
msgid "Delete Selected Objects"
msgstr "Excluir objetos selecionados"
-#: src/slic3r/GUI/Plater.cpp:4188
+#: src/slic3r/GUI/Plater.cpp:4687
msgid "Increase Instances"
msgstr "Aumentar instâncias"
-#: src/slic3r/GUI/Plater.cpp:4224
+#: src/slic3r/GUI/Plater.cpp:4722
msgid "Decrease Instances"
msgstr "Diminuir instâncias"
-#: src/slic3r/GUI/Plater.cpp:4260
+#: src/slic3r/GUI/Plater.cpp:4753
+msgid "Enter the number of copies:"
+msgstr "Definir números de cópias:"
+
+#: src/slic3r/GUI/Plater.cpp:4754
+msgid "Copies of the selected object"
+msgstr "Cópias do objeto selecionado"
+
+#: src/slic3r/GUI/Plater.cpp:4758
#, c-format
msgid "Set numbers of copies to %d"
msgstr "Definir números de cópias para %d"
-#: src/slic3r/GUI/Plater.cpp:4290
+#: src/slic3r/GUI/Plater.cpp:4788
msgid "Cut by Plane"
msgstr "Cortado por plano"
-#: src/slic3r/GUI/Plater.cpp:4322
+#: src/slic3r/GUI/Plater.cpp:4841
msgid "Save G-code file as:"
msgstr "Salve o arquivo G-code como:"
-#: src/slic3r/GUI/Plater.cpp:4322
+#: src/slic3r/GUI/Plater.cpp:4841
msgid "Save SL1 file as:"
msgstr "Salvar SL1 arquivo como:"
-#: src/slic3r/GUI/Plater.cpp:4434
+#: src/slic3r/GUI/Plater.cpp:4987
#, c-format
msgid "STL file exported to %s"
msgstr "Arquivo STL exportado para %s"
-#: src/slic3r/GUI/Plater.cpp:4450
+#: src/slic3r/GUI/Plater.cpp:5004
#, c-format
msgid "AMF file exported to %s"
msgstr "Arquivo AMF exportado para %s"
-#: src/slic3r/GUI/Plater.cpp:4453
+#: src/slic3r/GUI/Plater.cpp:5007
#, c-format
msgid "Error exporting AMF file %s"
msgstr "Erro ao exportar arquivo AMF %s"
-#: src/slic3r/GUI/Plater.cpp:4479
+#: src/slic3r/GUI/Plater.cpp:5040
#, c-format
msgid "3MF file exported to %s"
msgstr "Arquivo 3MF exportado para %s"
-#: src/slic3r/GUI/Plater.cpp:4484
+#: src/slic3r/GUI/Plater.cpp:5045
#, c-format
msgid "Error exporting 3MF file %s"
msgstr "Erro ao exportar arquivo 3MF %s"
-#: src/slic3r/GUI/Plater.cpp:4822
+#: src/slic3r/GUI/Plater.cpp:5205
+#, c-format
+msgid ""
+"Unmounting successful. The device %s(%s) can now be safely removed from the "
+"computer."
+msgstr ""
+"Não montando bem sucedido. O dispositivo %s(%s) agora pode ser removido com "
+"segurança do computador."
+
+#: src/slic3r/GUI/Plater.cpp:5522
msgid "Export"
msgstr "Exportar"
-#: src/slic3r/GUI/Plater.cpp:4823
-msgid "Send G-code"
-msgstr "Enviar G-code"
-
-#: src/slic3r/GUI/Plater.cpp:4907
+#: src/slic3r/GUI/Plater.cpp:5608
msgid "Paste From Clipboard"
msgstr "Colar da área de transferência"
-#: src/slic3r/GUI/Preferences.cpp:22 src/slic3r/GUI/Tab.cpp:2001
-#: src/slic3r/GUI/Tab.cpp:2242
+#: src/slic3r/GUI/Preferences.cpp:22 src/slic3r/GUI/Tab.cpp:1798
+#: src/slic3r/GUI/Tab.cpp:2042
msgid "General"
msgstr "Geral"
-#: src/slic3r/GUI/Preferences.cpp:44
+#: src/slic3r/GUI/Preferences.cpp:39
msgid "Remember output directory"
msgstr "Lembrar diretório de saída"
-#: src/slic3r/GUI/Preferences.cpp:46
+#: src/slic3r/GUI/Preferences.cpp:41
msgid ""
"If this is enabled, Slic3r will prompt the last output directory instead of "
"the one containing the input files."
@@ -3724,11 +4789,11 @@ msgstr ""
"Se isso estiver habilitado, Slic3r solicitará o último diretório de saída em "
"vez de um contendo os arquivos de entrada."
-#: src/slic3r/GUI/Preferences.cpp:52
+#: src/slic3r/GUI/Preferences.cpp:47
msgid "Auto-center parts"
msgstr "Centrar automaticamente as partes"
-#: src/slic3r/GUI/Preferences.cpp:54
+#: src/slic3r/GUI/Preferences.cpp:49
msgid ""
"If this is enabled, Slic3r will auto-center objects around the print bed "
"center."
@@ -3736,11 +4801,11 @@ msgstr ""
"Se isso estiver habilitado, o Slic3r irá centralizar objetos automaticamente "
"ao redor do centro de mesa de impressão."
-#: src/slic3r/GUI/Preferences.cpp:60
+#: src/slic3r/GUI/Preferences.cpp:55
msgid "Background processing"
msgstr "Processamento em segundo plano"
-#: src/slic3r/GUI/Preferences.cpp:62
+#: src/slic3r/GUI/Preferences.cpp:57
msgid ""
"If this is enabled, Slic3r will pre-process objects as soon as they're "
"loaded in order to save time when exporting G-code."
@@ -3748,7 +4813,7 @@ msgstr ""
"Se isso estiver ativado, o Slic3r irá pré-processar objetos assim que eles "
"forem carregados para economizar tempo ao exportar o G-code."
-#: src/slic3r/GUI/Preferences.cpp:71
+#: src/slic3r/GUI/Preferences.cpp:66
msgid ""
"If enabled, PrusaSlicer will check for the new versions of itself online. "
"When a new version becomes available a notification is displayed at the next "
@@ -3761,7 +4826,19 @@ msgstr ""
"Este é apenas um mecanismos de notificação, nenhuma instalação automática é "
"feita."
-#: src/slic3r/GUI/Preferences.cpp:79
+#: src/slic3r/GUI/Preferences.cpp:72
+msgid "Export sources full pathnames to 3mf and amf"
+msgstr "Fontes de exportação completas para 3mf e amf"
+
+#: src/slic3r/GUI/Preferences.cpp:74
+msgid ""
+"If enabled, allows the Reload from disk command to automatically find and "
+"load the files when invoked."
+msgstr ""
+"Se ativado, permite que o comando Reload from disk encontre e carregue "
+"automaticamente os arquivos quando invocado."
+
+#: src/slic3r/GUI/Preferences.cpp:82
msgid ""
"If enabled, Slic3r downloads updates of built-in system presets in the "
"background. These updates are downloaded into a separate temporary location. "
@@ -3773,11 +4850,11 @@ msgstr ""
"temporário separado. Quando uma nova versão predefinida se torna disponível, "
"ela é oferecida na inicialização do aplicativo."
-#: src/slic3r/GUI/Preferences.cpp:84
+#: src/slic3r/GUI/Preferences.cpp:87
msgid "Suppress \" - default - \" presets"
msgstr "Suprimir predefinições \"-padrão-\""
-#: src/slic3r/GUI/Preferences.cpp:86
+#: src/slic3r/GUI/Preferences.cpp:89
msgid ""
"Suppress \" - default - \" presets in the Print / Filament / Printer "
"selections once there are any other valid presets available."
@@ -3785,11 +4862,11 @@ msgstr ""
"Suprimir predefinições \"-padrão-\" em impressão/filamento/impressora, uma "
"vez que existam outras predefinições válidas disponíveis."
-#: src/slic3r/GUI/Preferences.cpp:92
+#: src/slic3r/GUI/Preferences.cpp:95
msgid "Show incompatible print and filament presets"
msgstr "Mostrar predefinições de impressão e filamento incompatíveis"
-#: src/slic3r/GUI/Preferences.cpp:94
+#: src/slic3r/GUI/Preferences.cpp:97
msgid ""
"When checked, the print and filament presets are shown in the preset editor "
"even if they are marked as incompatible with the active printer"
@@ -3798,11 +4875,11 @@ msgstr ""
"editor de predefinições, mesmo que estejam marcadas como incompatíveis com a "
"impressora ativa"
-#: src/slic3r/GUI/Preferences.cpp:101
+#: src/slic3r/GUI/Preferences.cpp:104
msgid "Use Retina resolution for the 3D scene"
msgstr "Usar a resolução retina para a cena 3D"
-#: src/slic3r/GUI/Preferences.cpp:103
+#: src/slic3r/GUI/Preferences.cpp:106
msgid ""
"If enabled, the 3D scene will be rendered in Retina resolution. If you are "
"experiencing 3D performance problems, disabling this option may help."
@@ -3810,69 +4887,95 @@ msgstr ""
"Se ativada, a cena 3D será renderizada na resolução retina. Se você estiver "
"enfrentando problemas de desempenho 3D, desabilitar essa opção pode ajudar."
-#: src/slic3r/GUI/Preferences.cpp:110
+#: src/slic3r/GUI/Preferences.cpp:113
+msgid "Camera"
+msgstr "Câmera"
+
+#: src/slic3r/GUI/Preferences.cpp:119
msgid "Use perspective camera"
msgstr "Usar a câmera em perspectiva"
-#: src/slic3r/GUI/Preferences.cpp:112
+#: src/slic3r/GUI/Preferences.cpp:121
msgid ""
"If enabled, use perspective camera. If not enabled, use orthographic camera."
msgstr ""
"Se ativada, use a câmera em perspectiva. Se não estiver ativada, use a "
"câmera ortográfica."
-#: src/slic3r/GUI/Preferences.cpp:117
+#: src/slic3r/GUI/Preferences.cpp:126
+msgid "Use free camera"
+msgstr "Use câmera livre"
+
+#: src/slic3r/GUI/Preferences.cpp:128
+msgid "If enabled, use free camera. If not enabled, use constrained camera."
+msgstr ""
+"Se ativado, use câmera livre. Se não estiver habilitado, use a câmera "
+"restrita."
+
+#: src/slic3r/GUI/Preferences.cpp:133
+msgid "GUI"
+msgstr "GUI"
+
+#: src/slic3r/GUI/Preferences.cpp:143
msgid "Use custom size for toolbar icons"
msgstr "Usar tamanho personalizado para ícones da barra de ferramentas"
-#: src/slic3r/GUI/Preferences.cpp:119
+#: src/slic3r/GUI/Preferences.cpp:145
msgid "If enabled, you can change size of toolbar icons manually."
msgstr ""
"Se ativado, você pode alterar o tamanho dos ícones da barra de ferramentas "
"manualmente."
-#: src/slic3r/GUI/Preferences.cpp:144
+#: src/slic3r/GUI/Preferences.cpp:172
#, c-format
msgid "You need to restart %s to make the changes effective."
msgstr "Você precisa reiniciar %s para tornar as alterações efetivas."
-#: src/slic3r/GUI/Preferences.cpp:192
+#: src/slic3r/GUI/Preferences.cpp:222
msgid "Icon size in a respect to the default size"
msgstr "Tamanho do ícone em relação ao tamanho padrão"
-#: src/slic3r/GUI/Preferences.cpp:207
+#: src/slic3r/GUI/Preferences.cpp:237
msgid "Select toolbar icon size in respect to the default one."
msgstr ""
"Selecione o tamanho do ícone da barra de ferramentas em relação ao padrão."
-#: src/slic3r/GUI/Preset.cpp:212
+#: src/slic3r/GUI/Preset.cpp:247
msgid "modified"
msgstr "modificado"
-#: src/slic3r/GUI/Preset.cpp:967 src/slic3r/GUI/Preset.cpp:1007
-#: src/slic3r/GUI/Preset.cpp:1072 src/slic3r/GUI/Preset.cpp:1104
-#: src/slic3r/GUI/PresetBundle.cpp:1484 src/slic3r/GUI/PresetBundle.cpp:1559
+#: src/slic3r/GUI/Preset.cpp:1121 src/slic3r/GUI/Preset.cpp:1176
+#: src/slic3r/GUI/Preset.cpp:1254 src/slic3r/GUI/Preset.cpp:1296
+#: src/slic3r/GUI/PresetBundle.cpp:1583 src/slic3r/GUI/PresetBundle.cpp:1679
msgid "System presets"
msgstr "Predefinições do sistema"
-#: src/slic3r/GUI/Preset.cpp:1011 src/slic3r/GUI/Preset.cpp:1108
-#: src/slic3r/GUI/PresetBundle.cpp:1564
+#: src/slic3r/GUI/Preset.cpp:1180 src/slic3r/GUI/Preset.cpp:1300
+#: src/slic3r/GUI/PresetBundle.cpp:1684
msgid "User presets"
msgstr "Predefinições do usuário"
-#: src/slic3r/GUI/Preset.cpp:1040 src/slic3r/GUI/Tab.cpp:243
-msgid "Add a new printer"
-msgstr "Adicionar uma nova impressora"
+#: src/slic3r/GUI/Preset.cpp:1213
+msgid "Add/Remove materials"
+msgstr "Adicionar/Remover materiais"
-#: src/slic3r/GUI/Preset.cpp:1312
+#: src/slic3r/GUI/Preset.cpp:1215
+msgid "Add/Remove printers"
+msgstr "Adicionar/Remover impressoras"
+
+#: src/slic3r/GUI/Preset.cpp:1534
msgid "filament"
msgstr "filamento"
-#: src/slic3r/GUI/Preset.cpp:1313
+#: src/slic3r/GUI/Preset.cpp:1535
msgid "SLA print"
msgstr "Impressão de SLA"
-#: src/slic3r/GUI/PresetHints.cpp:28
+#: src/slic3r/GUI/PresetBundle.cpp:1711
+msgid "Add/Remove filaments"
+msgstr "Adicionar/Remover filamentos"
+
+#: src/slic3r/GUI/PresetHints.cpp:29
msgid ""
"If estimated layer time is below ~%1%s, fan will run at %2%%% and print "
"speed will be reduced so that no less than %3%s are spent on that layer "
@@ -3883,107 +4986,101 @@ msgstr ""
"menos de %3%s sejam gastos nessa camada (no entanto, a velocidade nunca será "
"reduzida abaixo de %4% mm/s)."
-#: src/slic3r/GUI/PresetHints.cpp:35
+#: src/slic3r/GUI/PresetHints.cpp:36
msgid ""
-"\n"
"If estimated layer time is greater, but still below ~%1%s, fan will run at a "
"proportionally decreasing speed between %2%%% and %3%%%."
msgstr ""
-"\n"
"Se o tempo estimado da camada for maior, mas ainda abaixo de ~%1%s, o "
"ventoinha será executado em uma velocidade proporcionalmente decrescente "
"entre %2%%% e %3%%%."
-#: src/slic3r/GUI/PresetHints.cpp:39
-msgid ""
-"\n"
-"During the other layers, fan"
-msgstr ""
-"\n"
-"Durante as outras camadas, o ventoinha"
+#: src/slic3r/GUI/PresetHints.cpp:40
+msgid "During the other layers, fan"
+msgstr "Durante as outras camadas, a ventoinha"
-#: src/slic3r/GUI/PresetHints.cpp:41
+#: src/slic3r/GUI/PresetHints.cpp:42
msgid "Fan"
msgstr "Ventoinha"
-#: src/slic3r/GUI/PresetHints.cpp:47
+#: src/slic3r/GUI/PresetHints.cpp:48
msgid "will always run at %1%%%"
msgstr "será sempre executado em %1%%%"
-#: src/slic3r/GUI/PresetHints.cpp:50
+#: src/slic3r/GUI/PresetHints.cpp:51
msgid "except for the first %1% layers."
msgstr "exceto para as primeiras camadas %1%."
-#: src/slic3r/GUI/PresetHints.cpp:52
+#: src/slic3r/GUI/PresetHints.cpp:53
msgid "except for the first layer."
msgstr "exceto para a primeira camada."
-#: src/slic3r/GUI/PresetHints.cpp:54
+#: src/slic3r/GUI/PresetHints.cpp:55
msgid "will be turned off."
msgstr "será desligado."
-#: src/slic3r/GUI/PresetHints.cpp:155
+#: src/slic3r/GUI/PresetHints.cpp:156
msgid "external perimeters"
msgstr "perímetros externos"
-#: src/slic3r/GUI/PresetHints.cpp:164
+#: src/slic3r/GUI/PresetHints.cpp:165
msgid "perimeters"
msgstr "perímetros"
-#: src/slic3r/GUI/PresetHints.cpp:173
+#: src/slic3r/GUI/PresetHints.cpp:174
msgid "infill"
msgstr "preenchimento"
-#: src/slic3r/GUI/PresetHints.cpp:183
+#: src/slic3r/GUI/PresetHints.cpp:184
msgid "solid infill"
msgstr "preenchimento sólido"
-#: src/slic3r/GUI/PresetHints.cpp:191
+#: src/slic3r/GUI/PresetHints.cpp:192
msgid "top solid infill"
msgstr "preenchimento sólido do topo"
-#: src/slic3r/GUI/PresetHints.cpp:202
+#: src/slic3r/GUI/PresetHints.cpp:203
msgid "support"
msgstr "suporte"
-#: src/slic3r/GUI/PresetHints.cpp:212
+#: src/slic3r/GUI/PresetHints.cpp:213
msgid "support interface"
msgstr "interface de suporte"
-#: src/slic3r/GUI/PresetHints.cpp:218
+#: src/slic3r/GUI/PresetHints.cpp:219
msgid "First layer volumetric"
msgstr "Primeira camada volumétrica"
-#: src/slic3r/GUI/PresetHints.cpp:218
+#: src/slic3r/GUI/PresetHints.cpp:219
msgid "Bridging volumetric"
msgstr "Ponteamento volumétrico"
-#: src/slic3r/GUI/PresetHints.cpp:218
+#: src/slic3r/GUI/PresetHints.cpp:219
msgid "Volumetric"
msgstr "Volumétrica"
-#: src/slic3r/GUI/PresetHints.cpp:219
+#: src/slic3r/GUI/PresetHints.cpp:220
msgid "flow rate is maximized"
msgstr "a taxa de fluxo é maximizada"
-#: src/slic3r/GUI/PresetHints.cpp:222
+#: src/slic3r/GUI/PresetHints.cpp:223
msgid "by the print profile maximum"
msgstr "pelo perfil de impressão máximo"
-#: src/slic3r/GUI/PresetHints.cpp:223
+#: src/slic3r/GUI/PresetHints.cpp:224
msgid "when printing"
msgstr "ao imprimir"
-#: src/slic3r/GUI/PresetHints.cpp:224
+#: src/slic3r/GUI/PresetHints.cpp:225
msgid "with a volumetric rate"
msgstr "com uma taxa volumétrica"
-#: src/slic3r/GUI/PresetHints.cpp:228
+#: src/slic3r/GUI/PresetHints.cpp:229
#, c-format
msgid "%3.2f mm³/s at filament speed %3.2f mm/s."
msgstr "%3.2f mm ³/s na velocidade do filamento %3.2f mm/s."
-#: src/slic3r/GUI/PresetHints.cpp:246
+#: src/slic3r/GUI/PresetHints.cpp:247
msgid ""
"Recommended object thin wall thickness: Not available due to invalid layer "
"height."
@@ -3991,17 +5088,56 @@ msgstr ""
"Espessura de parede fina do objeto recomendado: não disponível devido à "
"altura da camada inválida."
-#: src/slic3r/GUI/PresetHints.cpp:262
+#: src/slic3r/GUI/PresetHints.cpp:263
#, c-format
msgid "Recommended object thin wall thickness for layer height %.2f and"
msgstr ""
"Espessura de parede fina do objeto recomendado para a altura da camada %.2f e"
-#: src/slic3r/GUI/PresetHints.cpp:268
+#: src/slic3r/GUI/PresetHints.cpp:270
#, c-format
msgid "%d lines: %.2f mm"
msgstr "%d linhas: %.2f mm"
+#: src/slic3r/GUI/PresetHints.cpp:274
+msgid ""
+"Recommended object thin wall thickness: Not available due to excessively "
+"small extrusion width."
+msgstr ""
+"Espessura fina da parede do objeto recomendada: Não disponível devido à "
+"largura de extrusão excessivamente pequena."
+
+#: src/slic3r/GUI/PresetHints.cpp:304
+msgid ""
+"Top / bottom shell thickness hint: Not available due to invalid layer height."
+msgstr ""
+"Espessura superior/inferior da concha. Dica: Não disponível devido à altura "
+"da camada inválida."
+
+#: src/slic3r/GUI/PresetHints.cpp:317
+msgid "Top shell is %1% mm thick for layer height %2% mm."
+msgstr "A camada superior tem %1% de espessura para altura da camada %2% mm."
+
+#: src/slic3r/GUI/PresetHints.cpp:320
+msgid "Minimum top shell thickness is %1% mm."
+msgstr "A espessura mínima da camada superior é de %1% mm."
+
+#: src/slic3r/GUI/PresetHints.cpp:323
+msgid "Top is open."
+msgstr "Topo está aberto"
+
+#: src/slic3r/GUI/PresetHints.cpp:336
+msgid "Bottom shell is %1% mm thick for layer height %2% mm."
+msgstr "A camada inferior tem %1% de espessura para a altura da camada %2% mm."
+
+#: src/slic3r/GUI/PresetHints.cpp:339
+msgid "Minimum bottom shell thickness is %1% mm."
+msgstr "A espessura mínima da camada inferior é de %1% mm."
+
+#: src/slic3r/GUI/PresetHints.cpp:342
+msgid "Bottom is open."
+msgstr "Base está aberta"
+
#: src/slic3r/GUI/PrintHostDialogs.cpp:33
msgid "Send G-Code to printer host"
msgstr "Enviar G-code para o host da impressora"
@@ -4075,13 +5211,13 @@ msgstr "Não usar Ramming"
msgid "Time"
msgstr "Tempo"
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:82
-#: src/libslic3r/PrintConfig.cpp:627 src/libslic3r/PrintConfig.cpp:671
-#: src/libslic3r/PrintConfig.cpp:686 src/libslic3r/PrintConfig.cpp:2349
-#: src/libslic3r/PrintConfig.cpp:2358 src/libslic3r/PrintConfig.cpp:2418
-#: src/libslic3r/PrintConfig.cpp:2426 src/libslic3r/PrintConfig.cpp:2434
-#: src/libslic3r/PrintConfig.cpp:2441 src/libslic3r/PrintConfig.cpp:2449
-#: src/libslic3r/PrintConfig.cpp:2457
+#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:83
+#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:688
+#: src/libslic3r/PrintConfig.cpp:703 src/libslic3r/PrintConfig.cpp:2408
+#: src/libslic3r/PrintConfig.cpp:2417 src/libslic3r/PrintConfig.cpp:2527
+#: src/libslic3r/PrintConfig.cpp:2535 src/libslic3r/PrintConfig.cpp:2543
+#: src/libslic3r/PrintConfig.cpp:2550 src/libslic3r/PrintConfig.cpp:2558
+#: src/libslic3r/PrintConfig.cpp:2566
msgid "s"
msgstr "s"
@@ -4089,52 +5225,52 @@ msgstr "s"
msgid "Volumetric speed"
msgstr "Velocidade volumétrica"
-#: src/slic3r/GUI/RammingChart.cpp:81 src/libslic3r/PrintConfig.cpp:584
-#: src/libslic3r/PrintConfig.cpp:1234
+#: src/slic3r/GUI/RammingChart.cpp:81 src/libslic3r/PrintConfig.cpp:601
+#: src/libslic3r/PrintConfig.cpp:1250
msgid "mm³/s"
msgstr "mm ³/s"
-#: src/slic3r/GUI/Selection.cpp:146
+#: src/slic3r/GUI/Selection.cpp:147
msgid "Selection-Add"
msgstr "Seleção-Adicionar"
-#: src/slic3r/GUI/Selection.cpp:187
+#: src/slic3r/GUI/Selection.cpp:188
msgid "Selection-Remove"
msgstr "Seleção-remover"
-#: src/slic3r/GUI/Selection.cpp:219
+#: src/slic3r/GUI/Selection.cpp:220
msgid "Selection-Add Object"
msgstr "Seleção-Adicionar objeto"
-#: src/slic3r/GUI/Selection.cpp:238
+#: src/slic3r/GUI/Selection.cpp:239
msgid "Selection-Remove Object"
msgstr "Seleção-remover objeto"
-#: src/slic3r/GUI/Selection.cpp:256
+#: src/slic3r/GUI/Selection.cpp:257
msgid "Selection-Add Instance"
msgstr "Instância de seleção-Adicionar"
-#: src/slic3r/GUI/Selection.cpp:275
+#: src/slic3r/GUI/Selection.cpp:276
msgid "Selection-Remove Instance"
msgstr "Seleção-remover instância"
-#: src/slic3r/GUI/Selection.cpp:376
+#: src/slic3r/GUI/Selection.cpp:377
msgid "Selection-Add All"
msgstr "Seleção-adicionar todos"
-#: src/slic3r/GUI/Selection.cpp:402
+#: src/slic3r/GUI/Selection.cpp:403
msgid "Selection-Remove All"
msgstr "Seleção-remover todos"
-#: src/slic3r/GUI/Selection.cpp:939
+#: src/slic3r/GUI/Selection.cpp:940
msgid "Scale To Fit"
msgstr "Dimensionar para caber"
-#: src/slic3r/GUI/Selection.cpp:1474
+#: src/slic3r/GUI/Selection.cpp:1477
msgid "Set Printable Instance"
msgstr "Definir instância imprimível"
-#: src/slic3r/GUI/Selection.cpp:1474
+#: src/slic3r/GUI/Selection.cpp:1477
msgid "Set Unprintable Instance"
msgstr "Definir instância não imprimível"
@@ -4146,34 +5282,34 @@ msgstr "Informações do sistema"
msgid "Copy to Clipboard"
msgstr "Copiar para a Área de Transferência"
-#: src/slic3r/GUI/Tab.cpp:52 src/libslic3r/PrintConfig.cpp:239
+#: src/slic3r/GUI/Tab.cpp:50 src/libslic3r/PrintConfig.cpp:265
msgid "Compatible printers"
msgstr "Impressoras compatíveis"
-#: src/slic3r/GUI/Tab.cpp:53
+#: src/slic3r/GUI/Tab.cpp:51
msgid "Select the printers this profile is compatible with."
msgstr "Selecione as impressoras com as quais este perfil é compatível."
-#: src/slic3r/GUI/Tab.cpp:58 src/libslic3r/PrintConfig.cpp:254
+#: src/slic3r/GUI/Tab.cpp:56 src/libslic3r/PrintConfig.cpp:280
msgid "Compatible print profiles"
msgstr "Perfis de impressão compatíveis"
-#: src/slic3r/GUI/Tab.cpp:59
+#: src/slic3r/GUI/Tab.cpp:57
msgid "Select the print profiles this profile is compatible with."
msgstr ""
"Selecione os perfis de impressão com os quais este perfil é compatível."
#. TRN "Save current Settings"
-#: src/slic3r/GUI/Tab.cpp:135
+#: src/slic3r/GUI/Tab.cpp:133
#, c-format
msgid "Save current %s"
msgstr "Salvar %s atual"
-#: src/slic3r/GUI/Tab.cpp:136
+#: src/slic3r/GUI/Tab.cpp:134
msgid "Delete this preset"
msgstr "Exclua esta predefinição"
-#: src/slic3r/GUI/Tab.cpp:141
+#: src/slic3r/GUI/Tab.cpp:139
msgid ""
"Hover the cursor over buttons to find more information \n"
"or click this button."
@@ -4181,277 +5317,284 @@ msgstr ""
"Passe o cursor sobre os botões para encontrar mais informações \n"
"ou clique neste botão."
-#: src/slic3r/GUI/Tab.cpp:943
+#: src/slic3r/GUI/Tab.cpp:241
+msgid "Add a new printer"
+msgstr "Adicionar uma nova impressora"
+
+#: src/slic3r/GUI/Tab.cpp:953
msgid "This is a default preset."
msgstr "Esta é uma predefinição padrão."
-#: src/slic3r/GUI/Tab.cpp:945
+#: src/slic3r/GUI/Tab.cpp:955
msgid "This is a system preset."
msgstr "Esta é uma predefinição do sistema."
-#: src/slic3r/GUI/Tab.cpp:947
+#: src/slic3r/GUI/Tab.cpp:957
msgid "Current preset is inherited from the default preset."
msgstr "Predefinição atual é herdada da predefinição padrão."
-#: src/slic3r/GUI/Tab.cpp:950
-#, c-format
-msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
-msgstr ""
-"Predefinição atual é herdada de:\n"
-"\t%s"
+#: src/slic3r/GUI/Tab.cpp:959
+msgid "Current preset is inherited from"
+msgstr "Predefinição atual é herdada de"
-#: src/slic3r/GUI/Tab.cpp:954
+#: src/slic3r/GUI/Tab.cpp:963
msgid "It can't be deleted or modified."
msgstr "Ele não pode ser excluído ou modificado."
-#: src/slic3r/GUI/Tab.cpp:955
+#: src/slic3r/GUI/Tab.cpp:964
msgid ""
"Any modifications should be saved as a new preset inherited from this one."
msgstr ""
"Todas as modificações devem ser salvas como uma nova predefinição herdada de "
"uma presente."
-#: src/slic3r/GUI/Tab.cpp:956
+#: src/slic3r/GUI/Tab.cpp:965
msgid "To do that please specify a new name for the preset."
msgstr "Para fazer isso, especifique um novo nome para a predefinição."
-#: src/slic3r/GUI/Tab.cpp:960
+#: src/slic3r/GUI/Tab.cpp:969
msgid "Additional information:"
msgstr "Informações adicionais:"
-#: src/slic3r/GUI/Tab.cpp:966
+#: src/slic3r/GUI/Tab.cpp:975
msgid "printer model"
msgstr "modelo de impressora"
-#: src/slic3r/GUI/Tab.cpp:974
+#: src/slic3r/GUI/Tab.cpp:983
msgid "default print profile"
msgstr "perfil de impressão padrão"
-#: src/slic3r/GUI/Tab.cpp:977
+#: src/slic3r/GUI/Tab.cpp:986
msgid "default filament profile"
msgstr "perfil de filamento padrão"
-#: src/slic3r/GUI/Tab.cpp:991
+#: src/slic3r/GUI/Tab.cpp:1000
msgid "default SLA material profile"
msgstr "perfil de material SLA padrão"
-#: src/slic3r/GUI/Tab.cpp:995
+#: src/slic3r/GUI/Tab.cpp:1004
msgid "default SLA print profile"
msgstr "perfil de impressão padrão do SLA"
-#: src/slic3r/GUI/Tab.cpp:1032 src/slic3r/GUI/Tab.cpp:3731
+#: src/slic3r/GUI/Tab.cpp:1012
+msgid "full profile name"
+msgstr "Nome customizado da config."
+
+#: src/slic3r/GUI/Tab.cpp:1013
+msgid "symbolic profile name"
+msgstr "nome customizado da config.:"
+
+#: src/slic3r/GUI/Tab.cpp:1047 src/slic3r/GUI/Tab.cpp:3600
msgid "Layers and perimeters"
msgstr "Camadas e perímetros"
-#: src/slic3r/GUI/Tab.cpp:1037
+#: src/slic3r/GUI/Tab.cpp:1052
msgid "Vertical shells"
msgstr "Paredes verticais"
-#: src/slic3r/GUI/Tab.cpp:1048
+#: src/slic3r/GUI/Tab.cpp:1063
msgid "Horizontal shells"
msgstr "Paredes horizontais"
-#: src/slic3r/GUI/Tab.cpp:1049 src/libslic3r/PrintConfig.cpp:1759
+#: src/slic3r/GUI/Tab.cpp:1064 src/libslic3r/PrintConfig.cpp:1780
msgid "Solid layers"
msgstr "Camadas sólidas"
-#: src/slic3r/GUI/Tab.cpp:1054
+#: src/slic3r/GUI/Tab.cpp:1068
+msgid "Minimum shell thickness"
+msgstr "Espessura mínima da concha"
+
+#: src/slic3r/GUI/Tab.cpp:1079
msgid "Quality (slower slicing)"
msgstr "Qualidade (fatiamento mais lento)"
-#: src/slic3r/GUI/Tab.cpp:1072
+#: src/slic3r/GUI/Tab.cpp:1097
msgid "Reducing printing time"
msgstr "Reduzindo o tempo de impressão"
-#: src/slic3r/GUI/Tab.cpp:1084
+#: src/slic3r/GUI/Tab.cpp:1109
msgid "Skirt and brim"
msgstr "Saia e aba"
-#: src/slic3r/GUI/Tab.cpp:1101
+#: src/slic3r/GUI/Tab.cpp:1126
msgid "Raft"
msgstr "Estrado"
-#: src/slic3r/GUI/Tab.cpp:1105
+#: src/slic3r/GUI/Tab.cpp:1130
msgid "Options for support material and raft"
msgstr "Opções para material de suporte e estrado"
-#: src/slic3r/GUI/Tab.cpp:1120
+#: src/slic3r/GUI/Tab.cpp:1145
msgid "Speed for print moves"
msgstr "Velocidade para movimentos de impressão"
-#: src/slic3r/GUI/Tab.cpp:1132
+#: src/slic3r/GUI/Tab.cpp:1157
msgid "Speed for non-print moves"
msgstr "Velocidade para movimentos não impressos"
-#: src/slic3r/GUI/Tab.cpp:1135
+#: src/slic3r/GUI/Tab.cpp:1160
msgid "Modifiers"
msgstr "Modificadores"
-#: src/slic3r/GUI/Tab.cpp:1138
+#: src/slic3r/GUI/Tab.cpp:1163
msgid "Acceleration control (advanced)"
msgstr "Controle de aceleração (avançado)"
-#: src/slic3r/GUI/Tab.cpp:1145
+#: src/slic3r/GUI/Tab.cpp:1170
msgid "Autospeed (advanced)"
msgstr "Velocidade automática (avançado)"
-#: src/slic3r/GUI/Tab.cpp:1153
+#: src/slic3r/GUI/Tab.cpp:1178
msgid "Multiple Extruders"
msgstr "Extrusoras múltiplas"
-#: src/slic3r/GUI/Tab.cpp:1161
+#: src/slic3r/GUI/Tab.cpp:1186
msgid "Ooze prevention"
msgstr "Prevenção de vazão"
-#: src/slic3r/GUI/Tab.cpp:1178
+#: src/slic3r/GUI/Tab.cpp:1204
msgid "Extrusion width"
msgstr "Espessura da extrusão"
-#: src/slic3r/GUI/Tab.cpp:1188
+#: src/slic3r/GUI/Tab.cpp:1214
msgid "Overlap"
msgstr "Cobrir"
-#: src/slic3r/GUI/Tab.cpp:1191
+#: src/slic3r/GUI/Tab.cpp:1217
msgid "Flow"
msgstr "Fluxo"
-#: src/slic3r/GUI/Tab.cpp:1200
+#: src/slic3r/GUI/Tab.cpp:1226
msgid "Other"
msgstr "Outro"
-#: src/slic3r/GUI/Tab.cpp:1203 src/slic3r/GUI/Tab.cpp:3789
+#: src/slic3r/GUI/Tab.cpp:1229 src/slic3r/GUI/Tab.cpp:3669
msgid "Output options"
msgstr "Opções de saída"
-#: src/slic3r/GUI/Tab.cpp:1204
+#: src/slic3r/GUI/Tab.cpp:1230
msgid "Sequential printing"
msgstr "Impressão sequencial"
-#: src/slic3r/GUI/Tab.cpp:1206
+#: src/slic3r/GUI/Tab.cpp:1232
msgid "Extruder clearance (mm)"
msgstr "Folga da extrusora (milímetro)"
-#: src/slic3r/GUI/Tab.cpp:1215 src/slic3r/GUI/Tab.cpp:3790
+#: src/slic3r/GUI/Tab.cpp:1237 src/slic3r/GUI/Tab.cpp:3670
msgid "Output file"
msgstr "Arquivo de saída"
-#: src/slic3r/GUI/Tab.cpp:1222 src/libslic3r/PrintConfig.cpp:1432
+#: src/slic3r/GUI/Tab.cpp:1244 src/libslic3r/PrintConfig.cpp:1453
msgid "Post-processing scripts"
msgstr "Scripts de pós-processamento"
-#: src/slic3r/GUI/Tab.cpp:1228 src/slic3r/GUI/Tab.cpp:1229
-#: src/slic3r/GUI/Tab.cpp:1752 src/slic3r/GUI/Tab.cpp:1753
-#: src/slic3r/GUI/Tab.cpp:2214 src/slic3r/GUI/Tab.cpp:2215
-#: src/slic3r/GUI/Tab.cpp:2328 src/slic3r/GUI/Tab.cpp:2329
-#: src/slic3r/GUI/Tab.cpp:3668 src/slic3r/GUI/Tab.cpp:3669
+#: src/slic3r/GUI/Tab.cpp:1250 src/slic3r/GUI/Tab.cpp:1251
+#: src/slic3r/GUI/Tab.cpp:1539 src/slic3r/GUI/Tab.cpp:1540
+#: src/slic3r/GUI/Tab.cpp:2014 src/slic3r/GUI/Tab.cpp:2015
+#: src/slic3r/GUI/Tab.cpp:2130 src/slic3r/GUI/Tab.cpp:2131
+#: src/slic3r/GUI/Tab.cpp:3537 src/slic3r/GUI/Tab.cpp:3538
msgid "Notes"
msgstr "Notas"
-#: src/slic3r/GUI/Tab.cpp:1235 src/slic3r/GUI/Tab.cpp:1760
-#: src/slic3r/GUI/Tab.cpp:2221 src/slic3r/GUI/Tab.cpp:2335
-#: src/slic3r/GUI/Tab.cpp:3676 src/slic3r/GUI/Tab.cpp:3795
+#: src/slic3r/GUI/Tab.cpp:1257 src/slic3r/GUI/Tab.cpp:1547
+#: src/slic3r/GUI/Tab.cpp:2021 src/slic3r/GUI/Tab.cpp:2137
+#: src/slic3r/GUI/Tab.cpp:3545 src/slic3r/GUI/Tab.cpp:3675
msgid "Dependencies"
msgstr "Dependências"
-#: src/slic3r/GUI/Tab.cpp:1236 src/slic3r/GUI/Tab.cpp:1761
-#: src/slic3r/GUI/Tab.cpp:2222 src/slic3r/GUI/Tab.cpp:2336
-#: src/slic3r/GUI/Tab.cpp:3677 src/slic3r/GUI/Tab.cpp:3796
+#: src/slic3r/GUI/Tab.cpp:1258 src/slic3r/GUI/Tab.cpp:1548
+#: src/slic3r/GUI/Tab.cpp:2022 src/slic3r/GUI/Tab.cpp:2138
+#: src/slic3r/GUI/Tab.cpp:3546 src/slic3r/GUI/Tab.cpp:3676
msgid "Profile dependencies"
msgstr "Dependências de perfil"
-#: src/slic3r/GUI/Tab.cpp:1538 src/slic3r/GUI/Tab.cpp:1593
+#: src/slic3r/GUI/Tab.cpp:1322 src/slic3r/GUI/Tab.cpp:1377
msgid "Filament Overrides"
-msgstr "Sobrescrever config."
+msgstr "Sobrescrever config. de filamento"
-#: src/slic3r/GUI/Tab.cpp:1539 src/slic3r/GUI/Tab.cpp:1598
-#: src/slic3r/GUI/Tab.cpp:2570
+#: src/slic3r/GUI/Tab.cpp:1323 src/slic3r/GUI/Tab.cpp:1382
+#: src/slic3r/GUI/Tab.cpp:2372
msgid "Retraction"
msgstr "Retração"
-#: src/slic3r/GUI/Tab.cpp:1648 src/libslic3r/PrintConfig.cpp:2030
+#: src/slic3r/GUI/Tab.cpp:1432 src/libslic3r/PrintConfig.cpp:2067
msgid "Temperature"
msgstr "Temperatura"
-#: src/slic3r/GUI/Tab.cpp:1654
+#: src/slic3r/GUI/Tab.cpp:1438
msgid "Bed"
msgstr "Mesa"
-#: src/slic3r/GUI/Tab.cpp:1659
+#: src/slic3r/GUI/Tab.cpp:1443
msgid "Cooling"
msgstr "Resfriamento"
-#: src/slic3r/GUI/Tab.cpp:1660 src/libslic3r/PrintConfig.cpp:1335
-#: src/libslic3r/PrintConfig.cpp:2150
+#: src/slic3r/GUI/Tab.cpp:1444 src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:2200
msgid "Enable"
msgstr "Habilitar"
-#: src/slic3r/GUI/Tab.cpp:1671
+#: src/slic3r/GUI/Tab.cpp:1455
msgid "Fan settings"
msgstr "Config. da ventoinha"
-#: src/slic3r/GUI/Tab.cpp:1672
-msgid "Fan speed"
-msgstr "Velocidade do ventoinha"
-
-#: src/slic3r/GUI/Tab.cpp:1680
+#: src/slic3r/GUI/Tab.cpp:1464
msgid "Cooling thresholds"
msgstr "Limiares de resfriamento"
-#: src/slic3r/GUI/Tab.cpp:1686
+#: src/slic3r/GUI/Tab.cpp:1470
msgid "Filament properties"
msgstr "Propriedades de filamento"
-#: src/slic3r/GUI/Tab.cpp:1690
+#: src/slic3r/GUI/Tab.cpp:1477
msgid "Print speed override"
msgstr "Substituição da velocidade de impressão"
-#: src/slic3r/GUI/Tab.cpp:1700
+#: src/slic3r/GUI/Tab.cpp:1487
msgid "Wipe tower parameters"
msgstr "Parâmetros da torre de limpeza"
-#: src/slic3r/GUI/Tab.cpp:1703
+#: src/slic3r/GUI/Tab.cpp:1490
msgid "Toolchange parameters with single extruder MM printers"
msgstr ""
"Parâmetros de mudança de ferramenta com impressoras de multi material com "
"apenas uma extrusora"
-#: src/slic3r/GUI/Tab.cpp:1717
+#: src/slic3r/GUI/Tab.cpp:1504
msgid "Ramming settings"
-msgstr "config. de Ramming"
+msgstr "Config. de Ramming"
-#: src/slic3r/GUI/Tab.cpp:1739 src/slic3r/GUI/Tab.cpp:2177
+#: src/slic3r/GUI/Tab.cpp:1526 src/slic3r/GUI/Tab.cpp:1977
msgid "Custom G-code"
msgstr "G-code customizado"
-#: src/slic3r/GUI/Tab.cpp:1740 src/slic3r/GUI/Tab.cpp:2178
-#: src/libslic3r/PrintConfig.cpp:1785 src/libslic3r/PrintConfig.cpp:1800
+#: src/slic3r/GUI/Tab.cpp:1527 src/slic3r/GUI/Tab.cpp:1978
+#: src/libslic3r/PrintConfig.cpp:1813 src/libslic3r/PrintConfig.cpp:1828
msgid "Start G-code"
msgstr "G-code de início"
-#: src/slic3r/GUI/Tab.cpp:1746 src/slic3r/GUI/Tab.cpp:2184
-#: src/libslic3r/PrintConfig.cpp:369 src/libslic3r/PrintConfig.cpp:379
+#: src/slic3r/GUI/Tab.cpp:1533 src/slic3r/GUI/Tab.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:385 src/libslic3r/PrintConfig.cpp:395
msgid "End G-code"
msgstr "G-code de finalização"
-#: src/slic3r/GUI/Tab.cpp:1803
+#: src/slic3r/GUI/Tab.cpp:1590
msgid "Volumetric flow hints not available"
msgstr "Dicas de fluxo volumétrico não disponíveis"
-#: src/slic3r/GUI/Tab.cpp:1889 src/slic3r/GUI/Tab.cpp:2117
+#: src/slic3r/GUI/Tab.cpp:1676 src/slic3r/GUI/Tab.cpp:1917
msgid "Test"
msgstr "Teste"
-#: src/slic3r/GUI/Tab.cpp:1899
+#: src/slic3r/GUI/Tab.cpp:1685
msgid "Could not get a valid Printer Host reference"
msgstr "Não foi possível obter uma referência de host de impressora válida"
-#: src/slic3r/GUI/Tab.cpp:1905 src/slic3r/GUI/Tab.cpp:2130
+#: src/slic3r/GUI/Tab.cpp:1691 src/slic3r/GUI/Tab.cpp:1930
msgid "Success!"
msgstr "Sucesso!"
-#: src/slic3r/GUI/Tab.cpp:1920
+#: src/slic3r/GUI/Tab.cpp:1711
msgid ""
"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
"signed certificate."
@@ -4459,49 +5602,55 @@ msgstr ""
"O arquivo HTTPS CA é opcional. Só é necessário se você usar HTTPS com um "
"certificado auto-assinado."
-#: src/slic3r/GUI/Tab.cpp:1933
+#: src/slic3r/GUI/Tab.cpp:1726
msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
msgstr ""
"Arquivos de certificado (*. CRT, *. pem) | *. CRT; *. pem | Todos os "
"arquivos | *. *"
-#: src/slic3r/GUI/Tab.cpp:1934
+#: src/slic3r/GUI/Tab.cpp:1727
msgid "Open CA certificate file"
msgstr "Abra o arquivo de certificado da CA"
-#: src/slic3r/GUI/Tab.cpp:1962
+#: src/slic3r/GUI/Tab.cpp:1754 src/libslic3r/PrintConfig.cpp:111
+msgid "HTTPS CA File"
+msgstr "Arquivo de CA HTTPS"
+
+#: src/slic3r/GUI/Tab.cpp:1755
#, c-format
msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
+"On this system, %s uses HTTPS certificates from the system Certificate Store "
+"or Keychain."
msgstr ""
-"Arquivo HTTPS CA:\n"
-" \tNeste sistema, %s usa certificados HTTPS do sistema Certificate Store "
-"ou keychain.\n"
-" \tPara usar um arquivo de CA personalizado, importe seu arquivo de CA "
-"para o repositório de certificados/chaveiro."
+"Neste sistema, %s usa certificados HTTPS do sistema Certificate Store ou "
+"keychain."
-#: src/slic3r/GUI/Tab.cpp:2002 src/slic3r/GUI/Tab.cpp:2243
+#: src/slic3r/GUI/Tab.cpp:1756
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate Store / "
+"Keychain."
+msgstr ""
+"Para usar um arquivo de CA personalizado, importe seu arquivo de CA para o "
+"repositório de certificados/chaveiro."
+
+#: src/slic3r/GUI/Tab.cpp:1799 src/slic3r/GUI/Tab.cpp:2043
msgid "Size and coordinates"
msgstr "Tamanho e coordenadas"
-#: src/slic3r/GUI/Tab.cpp:2007 src/slic3r/GUI/Tab.cpp:2248
-#: src/slic3r/GUI/Tab.cpp:3338
+#: src/slic3r/GUI/Tab.cpp:1804 src/slic3r/GUI/Tab.cpp:2048
+#: src/slic3r/GUI/Tab.cpp:3178
msgid "Set"
msgstr "Definir"
-#: src/slic3r/GUI/Tab.cpp:2039
+#: src/slic3r/GUI/Tab.cpp:1836
msgid "Capabilities"
msgstr "Capacidades"
-#: src/slic3r/GUI/Tab.cpp:2044
+#: src/slic3r/GUI/Tab.cpp:1841
msgid "Number of extruders of the printer."
msgstr "Número de extrusoras da impressora."
-#: src/slic3r/GUI/Tab.cpp:2069
+#: src/slic3r/GUI/Tab.cpp:1869
msgid ""
"Single Extruder Multi Material is selected, \n"
"and all extruders must have the same diameter.\n"
@@ -4513,125 +5662,120 @@ msgstr ""
"Você quer mudar o diâmetro para todas as extrusoras ao primeiro valor do "
"diâmetro da ponteira da extrusora?"
-#: src/slic3r/GUI/Tab.cpp:2072 src/slic3r/GUI/Tab.cpp:2540
-#: src/libslic3r/PrintConfig.cpp:1310
+#: src/slic3r/GUI/Tab.cpp:1872 src/slic3r/GUI/Tab.cpp:2342
+#: src/libslic3r/PrintConfig.cpp:1326
msgid "Nozzle diameter"
msgstr "Diâmetro do bico"
-#: src/slic3r/GUI/Tab.cpp:2102
+#: src/slic3r/GUI/Tab.cpp:1902
msgid "USB/Serial connection"
msgstr "Conexão USB/serial"
-#: src/slic3r/GUI/Tab.cpp:2103 src/libslic3r/PrintConfig.cpp:1640
+#: src/slic3r/GUI/Tab.cpp:1903 src/libslic3r/PrintConfig.cpp:1661
msgid "Serial port"
msgstr "Porte Serial"
-#: src/slic3r/GUI/Tab.cpp:2108
+#: src/slic3r/GUI/Tab.cpp:1908
msgid "Rescan serial ports"
msgstr "Portas seriais de Rescan"
-#: src/slic3r/GUI/Tab.cpp:2130
+#: src/slic3r/GUI/Tab.cpp:1930
msgid "Connection to printer works correctly."
msgstr "A ligação à impressora funciona corretamente."
-#: src/slic3r/GUI/Tab.cpp:2133
+#: src/slic3r/GUI/Tab.cpp:1933
msgid "Connection failed."
msgstr "A conexão falhou."
-#: src/slic3r/GUI/Tab.cpp:2146 src/slic3r/GUI/Tab.cpp:2323
+#: src/slic3r/GUI/Tab.cpp:1946 src/slic3r/GUI/Tab.cpp:2125
msgid "Print Host upload"
msgstr "Upload do host de impressão"
-#: src/slic3r/GUI/Tab.cpp:2190 src/libslic3r/PrintConfig.cpp:138
+#: src/slic3r/GUI/Tab.cpp:1990 src/libslic3r/PrintConfig.cpp:153
msgid "Before layer change G-code"
msgstr "Antes da mudança de camada G-code"
-#: src/slic3r/GUI/Tab.cpp:2196 src/libslic3r/PrintConfig.cpp:1056
+#: src/slic3r/GUI/Tab.cpp:1996 src/libslic3r/PrintConfig.cpp:1080
msgid "After layer change G-code"
msgstr "Após a mudança da camada do G-code"
-#: src/slic3r/GUI/Tab.cpp:2202 src/libslic3r/PrintConfig.cpp:2056
+#: src/slic3r/GUI/Tab.cpp:2002 src/libslic3r/PrintConfig.cpp:2093
msgid "Tool change G-code"
msgstr "G-code de troca de ferramenta"
-#: src/slic3r/GUI/Tab.cpp:2208
+#: src/slic3r/GUI/Tab.cpp:2008
msgid "Between objects G-code (for sequential printing)"
msgstr "G-code entre objetos (para impressão sequencial)"
-#: src/slic3r/GUI/Tab.cpp:2280
+#: src/slic3r/GUI/Tab.cpp:2080
msgid "Display"
msgstr "Exibição"
-#: src/slic3r/GUI/Tab.cpp:2295
+#: src/slic3r/GUI/Tab.cpp:2095
msgid "Tilt"
msgstr "Inclinar"
-#: src/slic3r/GUI/Tab.cpp:2296
+#: src/slic3r/GUI/Tab.cpp:2096
msgid "Tilt time"
msgstr "Tempo de inclinação"
-#: src/slic3r/GUI/Tab.cpp:2302 src/slic3r/GUI/Tab.cpp:3650
+#: src/slic3r/GUI/Tab.cpp:2102 src/slic3r/GUI/Tab.cpp:3521
msgid "Corrections"
msgstr "Correções"
-#: src/slic3r/GUI/Tab.cpp:2317 src/slic3r/GUI/Tab.cpp:3646
+#: src/slic3r/GUI/Tab.cpp:2119 src/slic3r/GUI/Tab.cpp:3517
msgid "Exposure"
msgstr "Exposição"
-#: src/slic3r/GUI/Tab.cpp:2388 src/slic3r/GUI/Tab.cpp:2473
-#: src/libslic3r/PrintConfig.cpp:1106 src/libslic3r/PrintConfig.cpp:1124
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1159
-#: src/libslic3r/PrintConfig.cpp:1170 src/libslic3r/PrintConfig.cpp:1181
-#: src/libslic3r/PrintConfig.cpp:1192
+#: src/slic3r/GUI/Tab.cpp:2190 src/slic3r/GUI/Tab.cpp:2275
+#: src/libslic3r/PrintConfig.cpp:1129 src/libslic3r/PrintConfig.cpp:1146
+#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1179
+#: src/libslic3r/PrintConfig.cpp:1189 src/libslic3r/PrintConfig.cpp:1199
+#: src/libslic3r/PrintConfig.cpp:1209
msgid "Machine limits"
msgstr "Limites da máquina"
-#: src/slic3r/GUI/Tab.cpp:2402
+#: src/slic3r/GUI/Tab.cpp:2204
msgid "Values in this column are for Normal mode"
msgstr "Valores nesta coluna são para o modo normal"
-#: src/slic3r/GUI/Tab.cpp:2403
+#: src/slic3r/GUI/Tab.cpp:2205
msgid "Normal"
msgstr "Normal"
-#: src/slic3r/GUI/Tab.cpp:2408
+#: src/slic3r/GUI/Tab.cpp:2210
msgid "Values in this column are for Stealth mode"
msgstr "Valores nesta coluna são para o modo furtivo"
-#: src/slic3r/GUI/Tab.cpp:2409
+#: src/slic3r/GUI/Tab.cpp:2211
msgid "Stealth"
msgstr "Furtivo"
-#: src/slic3r/GUI/Tab.cpp:2417
+#: src/slic3r/GUI/Tab.cpp:2219
msgid "Maximum feedrates"
msgstr "Velocidade máxima de alimentação"
-#: src/slic3r/GUI/Tab.cpp:2422
+#: src/slic3r/GUI/Tab.cpp:2224
msgid "Maximum accelerations"
msgstr "Acelerações máximas"
-#: src/slic3r/GUI/Tab.cpp:2429
+#: src/slic3r/GUI/Tab.cpp:2231
msgid "Jerk limits"
msgstr "Limites de empurrão"
-#: src/slic3r/GUI/Tab.cpp:2434
+#: src/slic3r/GUI/Tab.cpp:2236
msgid "Minimum feedrates"
msgstr "Velocidades alimentação mínimos"
-#: src/slic3r/GUI/Tab.cpp:2498 src/slic3r/GUI/Tab.cpp:2506
+#: src/slic3r/GUI/Tab.cpp:2300 src/slic3r/GUI/Tab.cpp:2308
msgid "Single extruder MM setup"
-msgstr "config. de extrusora multi material"
+msgstr "Config. de extrusora multi material"
-#: src/slic3r/GUI/Tab.cpp:2507
+#: src/slic3r/GUI/Tab.cpp:2309
msgid "Single extruder multimaterial parameters"
msgstr "Parâmetros para extrusora única multimaterial"
-#: src/slic3r/GUI/Tab.cpp:2520 src/libslic3r/GCode/PreviewData.cpp:461
-#, c-format
-msgid "Extruder %d"
-msgstr "Extrusora %d"
-
-#: src/slic3r/GUI/Tab.cpp:2538
+#: src/slic3r/GUI/Tab.cpp:2340
msgid ""
"This is a single extruder multimaterial printer, diameters of all extruders "
"will be set to the new value. Do you want to proceed?"
@@ -4639,19 +5783,19 @@ msgstr ""
"Esta é uma única impressora multimaterial extrusora, diâmetros de todas as "
"extrusoras será definido para o novo valor. Você quer prosseguir?"
-#: src/slic3r/GUI/Tab.cpp:2562
+#: src/slic3r/GUI/Tab.cpp:2364
msgid "Layer height limits"
msgstr "Limites de altura da camada"
-#: src/slic3r/GUI/Tab.cpp:2567
+#: src/slic3r/GUI/Tab.cpp:2369
msgid "Position (for multi-extruder printers)"
msgstr "Posição (para impressoras multiextrusoras)"
-#: src/slic3r/GUI/Tab.cpp:2573
+#: src/slic3r/GUI/Tab.cpp:2375
msgid "Only lift Z"
msgstr "Apenas elevar Z"
-#: src/slic3r/GUI/Tab.cpp:2586
+#: src/slic3r/GUI/Tab.cpp:2388
msgid ""
"Retraction when tool is disabled (advanced settings for multi-extruder "
"setups)"
@@ -4659,11 +5803,11 @@ msgstr ""
"Retração quando a ferramenta está desativada (config. avançadas para "
"instalações multiextrusoras)"
-#: src/slic3r/GUI/Tab.cpp:2594
+#: src/slic3r/GUI/Tab.cpp:2396
msgid "Reset to Filament Color"
msgstr "Restabelecer cor do filamento"
-#: src/slic3r/GUI/Tab.cpp:2775
+#: src/slic3r/GUI/Tab.cpp:2577
msgid ""
"The Wipe option is not available when using the Firmware Retraction mode.\n"
"\n"
@@ -4673,80 +5817,89 @@ msgstr ""
"\n"
"Devo desativá-lo, a fim de permitir a retração de firmware?"
-#: src/slic3r/GUI/Tab.cpp:2777
+#: src/slic3r/GUI/Tab.cpp:2579
msgid "Firmware Retraction"
msgstr "Retração do firmware"
-#: src/slic3r/GUI/Tab.cpp:3106
+#: src/slic3r/GUI/Tab.cpp:2921
#, c-format
msgid "Default preset (%s)"
msgstr "Predefinição padrão ( %s)"
-#: src/slic3r/GUI/Tab.cpp:3107
+#: src/slic3r/GUI/Tab.cpp:2922
#, c-format
msgid "Preset (%s)"
msgstr "Predefinição ( %s)"
-#: src/slic3r/GUI/Tab.cpp:3124
+#: src/slic3r/GUI/Tab.cpp:2939
msgid "has the following unsaved changes:"
msgstr "tem as seguintes alterações não salvas:"
-#: src/slic3r/GUI/Tab.cpp:3127
+#: src/slic3r/GUI/Tab.cpp:2942
msgid "is not compatible with printer"
msgstr "não é compatível com a impressora"
-#: src/slic3r/GUI/Tab.cpp:3128
+#: src/slic3r/GUI/Tab.cpp:2943
msgid "is not compatible with print profile"
msgstr "não é compatível com o perfil de impressão"
-#: src/slic3r/GUI/Tab.cpp:3130
+#: src/slic3r/GUI/Tab.cpp:2945
msgid "and it has the following unsaved changes:"
msgstr "e tem as seguintes alterações não salvas:"
-#: src/slic3r/GUI/Tab.cpp:3134
+#: src/slic3r/GUI/Tab.cpp:2949
msgid "Unsaved Changes"
msgstr "Alterações não salvas"
-#: src/slic3r/GUI/Tab.cpp:3225
+#: src/slic3r/GUI/Tab.cpp:3047
+msgctxt "PresetName"
msgid "%1% - Copy"
msgstr "%1% - cópia"
-#: src/slic3r/GUI/Tab.cpp:3248
+#: src/slic3r/GUI/Tab.cpp:3070
msgid "The supplied name is empty. It can't be saved."
msgstr "O nome fornecido está vazio. Não pode ser salvo."
-#: src/slic3r/GUI/Tab.cpp:3253
+#: src/slic3r/GUI/Tab.cpp:3075
msgid "Cannot overwrite a system profile."
msgstr "Não é possível substituir um perfil de sistema."
-#: src/slic3r/GUI/Tab.cpp:3257
+#: src/slic3r/GUI/Tab.cpp:3079
msgid "Cannot overwrite an external profile."
msgstr "Não é possível substituir um perfil externo."
-#: src/slic3r/GUI/Tab.cpp:3283
+#: src/slic3r/GUI/Tab.cpp:3084
+msgid "Preset with name \"%1%\" already exists."
+msgstr "Predefinido com nome \"%1%\" já existe."
+
+#: src/slic3r/GUI/Tab.cpp:3085
+msgid "Replace?"
+msgstr "Substituir?"
+
+#: src/slic3r/GUI/Tab.cpp:3123
msgid "remove"
msgstr "remover"
-#: src/slic3r/GUI/Tab.cpp:3283
+#: src/slic3r/GUI/Tab.cpp:3123
msgid "delete"
msgstr "excluir"
#. TRN remove/delete
-#: src/slic3r/GUI/Tab.cpp:3285
+#: src/slic3r/GUI/Tab.cpp:3125
msgid "Are you sure you want to %1% the selected preset?"
msgstr "Tem certeza de que deseja %1% da predefinição selecionada?"
#. TRN Remove/Delete
-#: src/slic3r/GUI/Tab.cpp:3288
+#: src/slic3r/GUI/Tab.cpp:3128
msgid "%1% Preset"
msgstr "%1% Predefinição"
-#: src/slic3r/GUI/Tab.cpp:3414
+#: src/slic3r/GUI/Tab.cpp:3254
msgid "LOCKED LOCK"
msgstr "CADEADO FECHADO"
#. TRN Description for "LOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3416
+#: src/slic3r/GUI/Tab.cpp:3256
msgid ""
"indicates that the settings are the same as the system (or default) values "
"for the current option group"
@@ -4754,12 +5907,12 @@ msgstr ""
"indica que as config. são as mesmas que os valores do sistema (ou padrão) "
"para o grupo de opções atual"
-#: src/slic3r/GUI/Tab.cpp:3418
+#: src/slic3r/GUI/Tab.cpp:3258
msgid "UNLOCKED LOCK"
msgstr "CADEADO ABERTO"
#. TRN Description for "UNLOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3420
+#: src/slic3r/GUI/Tab.cpp:3260
msgid ""
"indicates that some settings were changed and are not equal to the system "
"(or default) values for the current option group.\n"
@@ -4771,26 +5924,26 @@ msgstr ""
"Clique no ícone DESBLOQUEAR para redefinir todas as config. do grupo de "
"opções atual para os valores do sistema (ou padrão)."
-#: src/slic3r/GUI/Tab.cpp:3425
+#: src/slic3r/GUI/Tab.cpp:3265
msgid "WHITE BULLET"
msgstr "PONTO BRANCO"
#. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3427
+#: src/slic3r/GUI/Tab.cpp:3267
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
-"para o botão esquerdo: \t indica uma predefinição que não é do sistema (ou "
-"não-padrão),\n"
-"para o botão direito: \t indica que as config. não foram modificadas."
+"para o botão esquerdo: indica uma predefinição que não é do sistema (ou não-"
+"padrão),\n"
+"para o botão direito: indica que as config. não foram modificadas."
-#: src/slic3r/GUI/Tab.cpp:3430
+#: src/slic3r/GUI/Tab.cpp:3270
msgid "BACK ARROW"
msgstr "REDEFINIR"
#. TRN Description for "BACK ARROW"
-#: src/slic3r/GUI/Tab.cpp:3432
+#: src/slic3r/GUI/Tab.cpp:3272
msgid ""
"indicates that the settings were changed and are not equal to the last saved "
"preset for the current option group.\n"
@@ -4802,7 +5955,7 @@ msgstr ""
"Clique no ícone REDEFINIR para redefinir todas as config. do grupo de opções "
"atual para a última predefinição salva."
-#: src/slic3r/GUI/Tab.cpp:3442
+#: src/slic3r/GUI/Tab.cpp:3282
msgid ""
"LOCKED LOCK icon indicates that the settings are the same as the system (or "
"default) values for the current option group"
@@ -4810,7 +5963,7 @@ msgstr ""
"O ícone CADEADO FECHADO indica que as config. são as mesmas que os valores "
"do sistema (ou padrão) para o grupo de opções atual"
-#: src/slic3r/GUI/Tab.cpp:3444
+#: src/slic3r/GUI/Tab.cpp:3284
msgid ""
"UNLOCKED LOCK icon indicates that some settings were changed and are not "
"equal to the system (or default) values for the current option group.\n"
@@ -4822,13 +5975,13 @@ msgstr ""
"Clique para redefinir todas as config. para o grupo de opções atual para os "
"valores do sistema (ou padrão)."
-#: src/slic3r/GUI/Tab.cpp:3447
+#: src/slic3r/GUI/Tab.cpp:3287
msgid "WHITE BULLET icon indicates a non system (or non default) preset."
msgstr ""
"O ícone PONTO BRANCO indica uma predefinição que não é do sistema (ou não "
"predefinida)."
-#: src/slic3r/GUI/Tab.cpp:3450
+#: src/slic3r/GUI/Tab.cpp:3290
msgid ""
"WHITE BULLET icon indicates that the settings are the same as in the last "
"saved preset for the current option group."
@@ -4836,7 +5989,7 @@ msgstr ""
"O ícone PONTO BRANCO indica que as config. são as mesmas da última "
"predefinição salva para o grupo de opções atual."
-#: src/slic3r/GUI/Tab.cpp:3452
+#: src/slic3r/GUI/Tab.cpp:3292
msgid ""
"BACK ARROW icon indicates that the settings were changed and are not equal "
"to the last saved preset for the current option group.\n"
@@ -4848,7 +6001,7 @@ msgstr ""
"Clique para redefinir todas as config. do grupo de opções atual para a "
"última predefinição salva."
-#: src/slic3r/GUI/Tab.cpp:3458
+#: src/slic3r/GUI/Tab.cpp:3298
msgid ""
"LOCKED LOCK icon indicates that the value is the same as the system (or "
"default) value."
@@ -4856,7 +6009,7 @@ msgstr ""
"O ícone CADEADO FECHADO indica que o valor é o mesmo que o valor do sistema "
"(ou padrão)."
-#: src/slic3r/GUI/Tab.cpp:3459
+#: src/slic3r/GUI/Tab.cpp:3299
msgid ""
"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
"the system (or default) value.\n"
@@ -4866,7 +6019,7 @@ msgstr ""
"valor do sistema (ou padrão).\n"
"Clique para redefinir o valor atual para o valor do sistema (ou padrão)."
-#: src/slic3r/GUI/Tab.cpp:3465
+#: src/slic3r/GUI/Tab.cpp:3305
msgid ""
"WHITE BULLET icon indicates that the value is the same as in the last saved "
"preset."
@@ -4874,7 +6027,7 @@ msgstr ""
"O ícone PONTO BRANCO indica que o valor é o mesmo da última predefinição "
"guardada."
-#: src/slic3r/GUI/Tab.cpp:3466
+#: src/slic3r/GUI/Tab.cpp:3306
msgid ""
"BACK ARROW icon indicates that the value was changed and is not equal to the "
"last saved preset.\n"
@@ -4885,61 +6038,56 @@ msgstr ""
"Clique para redefinir o valor atual para a última predefinição salva."
#. TRN Preset
-#: src/slic3r/GUI/Tab.cpp:3579
+#: src/slic3r/GUI/Tab.cpp:3419
#, c-format
msgid "Save %s as:"
msgstr "Salvar %s como:"
-#: src/slic3r/GUI/Tab.cpp:3623
+#: src/slic3r/GUI/Tab.cpp:3463
msgid "the following suffix is not allowed:"
msgstr "o sufixo seguinte não é permitido:"
-#: src/slic3r/GUI/Tab.cpp:3627
+#: src/slic3r/GUI/Tab.cpp:3467
msgid "The supplied name is not available."
msgstr "O nome fornecido não está disponível."
-#: src/slic3r/GUI/Tab.cpp:3640
+#: src/slic3r/GUI/Tab.cpp:3480 src/slic3r/GUI/Tab.cpp:3482
msgid "Material"
msgstr "Material"
-#: src/slic3r/GUI/Tab.cpp:3642 src/slic3r/GUI/Tab.cpp:3733
-#: src/slic3r/GUI/wxExtensions.cpp:482
-msgid "Layers"
-msgstr "Camadas"
-
-#: src/slic3r/GUI/Tab.cpp:3741
+#: src/slic3r/GUI/Tab.cpp:3610
msgid "Support head"
msgstr "Cabeça de suporte"
-#: src/slic3r/GUI/Tab.cpp:3746
+#: src/slic3r/GUI/Tab.cpp:3615
msgid "Support pillar"
msgstr "Pilar de suporte"
-#: src/slic3r/GUI/Tab.cpp:3760
+#: src/slic3r/GUI/Tab.cpp:3631
msgid "Connection of the support sticks and junctions"
msgstr "Conexão das varas de suporte e junções"
-#: src/slic3r/GUI/Tab.cpp:3765
+#: src/slic3r/GUI/Tab.cpp:3636
msgid "Automatic generation"
msgstr "Geração Automática"
-#: src/slic3r/GUI/Tab.hpp:328 src/slic3r/GUI/Tab.hpp:428
+#: src/slic3r/GUI/Tab.hpp:328 src/slic3r/GUI/Tab.hpp:431
msgid "Print Settings"
msgstr "Config. de impressão"
-#: src/slic3r/GUI/Tab.hpp:353
+#: src/slic3r/GUI/Tab.hpp:355
msgid "Filament Settings"
msgstr "Config. de filamento"
-#: src/slic3r/GUI/Tab.hpp:389
+#: src/slic3r/GUI/Tab.hpp:391
msgid "Printer Settings"
msgstr "Config. da impressora"
-#: src/slic3r/GUI/Tab.hpp:413
+#: src/slic3r/GUI/Tab.hpp:416
msgid "Material Settings"
msgstr "Config. de material"
-#: src/slic3r/GUI/Tab.hpp:440
+#: src/slic3r/GUI/Tab.hpp:443
msgid "Save preset"
msgstr "Salvar predefinição"
@@ -4952,39 +6100,40 @@ msgstr "Atualização disponível"
msgid "New version of %s is available"
msgstr "Nova versão do %s está disponível"
-#: src/slic3r/GUI/UpdateDialogs.cpp:45
+#: src/slic3r/GUI/UpdateDialogs.cpp:43
msgid "Current version:"
msgstr "Versão atual:"
-#: src/slic3r/GUI/UpdateDialogs.cpp:47
+#: src/slic3r/GUI/UpdateDialogs.cpp:45
msgid "New version:"
msgstr "Nova versão:"
-#: src/slic3r/GUI/UpdateDialogs.cpp:55
+#: src/slic3r/GUI/UpdateDialogs.cpp:53
msgid "Changelog && Download"
msgstr "Changelog && Download"
-#: src/slic3r/GUI/UpdateDialogs.cpp:62 src/slic3r/GUI/UpdateDialogs.cpp:127
+#: src/slic3r/GUI/UpdateDialogs.cpp:60 src/slic3r/GUI/UpdateDialogs.cpp:125
+#: src/slic3r/GUI/UpdateDialogs.cpp:183
msgid "Open changelog page"
msgstr "Abra a página do changelog"
-#: src/slic3r/GUI/UpdateDialogs.cpp:67
+#: src/slic3r/GUI/UpdateDialogs.cpp:65
msgid "Open download page"
msgstr "Abrir página de download"
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
+#: src/slic3r/GUI/UpdateDialogs.cpp:71
msgid "Don't notify about new releases any more"
msgstr "Não notifique mais sobre novas versões"
-#: src/slic3r/GUI/UpdateDialogs.cpp:91 src/slic3r/GUI/UpdateDialogs.cpp:207
+#: src/slic3r/GUI/UpdateDialogs.cpp:89 src/slic3r/GUI/UpdateDialogs.cpp:266
msgid "Configuration update"
msgstr "Atualização de config."
-#: src/slic3r/GUI/UpdateDialogs.cpp:91
+#: src/slic3r/GUI/UpdateDialogs.cpp:89
msgid "Configuration update is available"
msgstr "A atualização de config. está disponível"
-#: src/slic3r/GUI/UpdateDialogs.cpp:94
+#: src/slic3r/GUI/UpdateDialogs.cpp:92
msgid ""
"Would you like to install it?\n"
"\n"
@@ -5001,21 +6150,48 @@ msgstr ""
"\n"
"Pacotes de config. atualizados:"
-#: src/slic3r/GUI/UpdateDialogs.cpp:115
+#: src/slic3r/GUI/UpdateDialogs.cpp:113 src/slic3r/GUI/UpdateDialogs.cpp:173
msgid "Comment:"
msgstr "Comentário:"
-#: src/slic3r/GUI/UpdateDialogs.cpp:151
+#: src/slic3r/GUI/UpdateDialogs.cpp:148 src/slic3r/GUI/UpdateDialogs.cpp:210
#, c-format
msgid "%s incompatibility"
msgstr "%s incompatibilidade"
-#: src/slic3r/GUI/UpdateDialogs.cpp:152
+#: src/slic3r/GUI/UpdateDialogs.cpp:148
+msgid "You must install a configuration update."
+msgstr "Você deve instalar uma atualização de configuração."
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:151
+#, c-format
+msgid ""
+"%s will now start updates. Otherwise it won't be able to start.\n"
+"\n"
+"Note that a full configuration snapshot will be created first. It can then "
+"be restored at any time should there be a problem with the new version.\n"
+"\n"
+"Updated configuration bundles:"
+msgstr ""
+"%s agora iniciará atualizações. Caso contrário, não será capaz de começar.\n"
+"\n"
+"Observe que um instantâneo de configuração completo será criado primeiro. "
+"Ele pode então ser restaurado a qualquer momento caso haja um problema com a "
+"nova versão.\n"
+"\n"
+"Pacotes de configuração atualizados:"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:191 src/slic3r/GUI/UpdateDialogs.cpp:246
+#, c-format
+msgid "Exit %s"
+msgstr "Saída %s"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:211
#, c-format
msgid "%s configuration is incompatible"
msgstr "%s config. é incompatível"
-#: src/slic3r/GUI/UpdateDialogs.cpp:157
+#: src/slic3r/GUI/UpdateDialogs.cpp:216
#, c-format
msgid ""
"This version of %s is not compatible with currently installed configuration "
@@ -5025,7 +6201,7 @@ msgid ""
"\n"
"You may either exit %s and try again with a newer version, or you may re-run "
"the initial configuration. Doing so will create a backup snapshot of the "
-"existing configuration before installing files compatible with this %s.\n"
+"existing configuration before installing files compatible with this %s."
msgstr ""
"Esta versão do %s não é compatível com pacotes de config. atualmente "
"instalados.\n"
@@ -5035,27 +6211,22 @@ msgstr ""
"Você pode sair %s e tente novamente com uma versão mais recente, ou você "
"pode executar novamente a config. inicial. Isso criará um instantâneo de "
"backup da config. existente antes de instalar os arquivos compatíveis com "
-"este %s.\n"
+"este %s."
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
+#: src/slic3r/GUI/UpdateDialogs.cpp:225
#, c-format
msgid "This %s version: %s"
msgstr "Esta versão %s : %s"
-#: src/slic3r/GUI/UpdateDialogs.cpp:171
+#: src/slic3r/GUI/UpdateDialogs.cpp:230
msgid "Incompatible bundles:"
msgstr "Pacotes incompatíveis:"
-#: src/slic3r/GUI/UpdateDialogs.cpp:187
-#, c-format
-msgid "Exit %s"
-msgstr "Saída %s"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:190
+#: src/slic3r/GUI/UpdateDialogs.cpp:249
msgid "Re-configure"
msgstr "Re-config.urar"
-#: src/slic3r/GUI/UpdateDialogs.cpp:211
+#: src/slic3r/GUI/UpdateDialogs.cpp:270
#, c-format
msgid ""
"%s now uses an updated configuration structure.\n"
@@ -5084,15 +6255,28 @@ msgstr ""
"predefinições e para escolher se deseja ativar as atualizações automáticas "
"predefinidas."
-#: src/slic3r/GUI/UpdateDialogs.cpp:227
+#: src/slic3r/GUI/UpdateDialogs.cpp:287
msgid "For more information please visit our wiki page:"
msgstr "Para mais informações, visite a nossa página wiki:"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:14
+#: src/slic3r/GUI/UpdateDialogs.cpp:304
+msgid "Configuration updates"
+msgstr "Atualizações de configuração"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:304
+msgid "No updates available"
+msgstr "Nenhuma atualização disponível"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:309
+#, c-format
+msgid "%s has no configuration updates available."
+msgstr "%s não tem atualizações de configuração disponíveis."
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:15
msgid "Ramming customization"
msgstr "Personalização de Ramming"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:40
+#: src/slic3r/GUI/WipeTowerDialog.cpp:41
msgid ""
"Ramming denotes the rapid extrusion just before a tool change in a single-"
"extruder MM printer. Its purpose is to properly shape the end of the "
@@ -5115,27 +6299,27 @@ msgstr ""
"Esta é uma config. de nível especialista, ajuste incorreto provavelmente "
"levará a compotas, roda extrusora moagem em filamento etc."
-#: src/slic3r/GUI/WipeTowerDialog.cpp:82
+#: src/slic3r/GUI/WipeTowerDialog.cpp:83
msgid "Total ramming time"
msgstr "Tempo total de Ramming"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/slic3r/GUI/WipeTowerDialog.cpp:85
msgid "Total rammed volume"
msgstr "Volume total de Ramming"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:88
+#: src/slic3r/GUI/WipeTowerDialog.cpp:89
msgid "Ramming line width"
msgstr "Largura da linha de Ramming"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:90
+#: src/slic3r/GUI/WipeTowerDialog.cpp:91
msgid "Ramming line spacing"
msgstr "Espaçamento de linha de Ramming"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:141
+#: src/slic3r/GUI/WipeTowerDialog.cpp:142
msgid "Wipe tower - Purging volume adjustment"
msgstr "Torre de limpeza - Ajuste de volume de purga"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:225
+#: src/slic3r/GUI/WipeTowerDialog.cpp:254
msgid ""
"Here you can adjust required purging volume (mm³) for any given pair of "
"tools."
@@ -5143,23 +6327,23 @@ msgstr ""
"Aqui você pode ajustar o volume de purga necessário (mm ³) para qualquer par "
"dado de ferramentas."
-#: src/slic3r/GUI/WipeTowerDialog.cpp:226
+#: src/slic3r/GUI/WipeTowerDialog.cpp:255
msgid "Extruder changed to"
msgstr "Extrusora alterada para"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
+#: src/slic3r/GUI/WipeTowerDialog.cpp:263
msgid "unloaded"
msgstr "descarregado"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:235
+#: src/slic3r/GUI/WipeTowerDialog.cpp:264
msgid "loaded"
msgstr "carregado"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:240
+#: src/slic3r/GUI/WipeTowerDialog.cpp:276
msgid "Tool #"
msgstr "Ferramenta #"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:247
+#: src/slic3r/GUI/WipeTowerDialog.cpp:285
msgid ""
"Total purging volume is calculated by summing two values below, depending on "
"which tools are loaded/unloaded."
@@ -5167,15 +6351,15 @@ msgstr ""
"O volume de purga total é calculado somando-se dois valores abaixo, "
"dependendo de quais ferramentas são carregadas/descarregadas."
-#: src/slic3r/GUI/WipeTowerDialog.cpp:248
+#: src/slic3r/GUI/WipeTowerDialog.cpp:286
msgid "Volume to purge (mm³) when the filament is being"
msgstr "Volume a purgar (mm ³) quando o filamento está a ser"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:262
+#: src/slic3r/GUI/WipeTowerDialog.cpp:300
msgid "From"
msgstr "De"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:327
+#: src/slic3r/GUI/WipeTowerDialog.cpp:365
msgid ""
"Switching to simple settings will discard changes done in the advanced "
"mode!\n"
@@ -5187,108 +6371,62 @@ msgstr ""
"\n"
"Você quer prosseguir?"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:339
+#: src/slic3r/GUI/WipeTowerDialog.cpp:377
msgid "Show simplified settings"
msgstr "Mostrar config. simplificadas"
-#: src/slic3r/GUI/WipeTowerDialog.cpp:339
+#: src/slic3r/GUI/WipeTowerDialog.cpp:377
msgid "Show advanced settings"
msgstr "Mostrar opções avançadas"
-#: src/slic3r/GUI/wxExtensions.cpp:471
-msgid "Instances"
-msgstr "Instâncias"
-
-#: src/slic3r/GUI/wxExtensions.cpp:475 src/slic3r/GUI/wxExtensions.cpp:619
-#, c-format
-msgid "Instance %d"
-msgstr "Instância %d"
-
-#: src/slic3r/GUI/wxExtensions.cpp:509
-msgid "Range"
-msgstr "Intervalo"
-
-#: src/slic3r/GUI/wxExtensions.cpp:2731
-msgid "One layer mode"
-msgstr "Modo de uma camada"
-
-#: src/slic3r/GUI/wxExtensions.cpp:2732
-msgid "Add/Del color change"
-msgstr "Add/Excluir mudança de cor"
-
-#: src/slic3r/GUI/wxExtensions.cpp:2733
-msgid "Discard all color changes"
-msgstr "Descartar todas as alterações de cor"
-
-#: src/slic3r/GUI/wxExtensions.cpp:2993
+#: src/slic3r/GUI/wxExtensions.cpp:706
#, c-format
msgid "Switch to the %s mode"
msgstr "Mude para o modo %s"
-#: src/slic3r/GUI/wxExtensions.cpp:2994
+#: src/slic3r/GUI/wxExtensions.cpp:707
#, c-format
msgid "Current mode is %s"
msgstr "O modo atual é %s"
-#: src/slic3r/Utils/Duet.cpp:51
-msgid "Connection to Duet works correctly."
-msgstr "A conexão com o Duet funciona corretamente."
-
-#: src/slic3r/Utils/Duet.cpp:56
-msgid "Could not connect to Duet"
-msgstr "Não foi possível conectar-se ao Duet"
-
-#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:154
-msgid "Unknown error occured"
-msgstr "Ocorreu um erro desconhecido"
-
-#: src/slic3r/Utils/Duet.cpp:148
-msgid "Wrong password"
-msgstr "Senha incorreta"
-
-#: src/slic3r/Utils/Duet.cpp:151
-msgid "Could not get resources to create a new connection"
-msgstr "Não foi possível obter recursos para criar uma nova conexão"
-
-#: src/slic3r/Utils/OctoPrint.cpp:70
+#: src/slic3r/Utils/AstroBox.cpp:69 src/slic3r/Utils/OctoPrint.cpp:69
#, c-format
msgid "Mismatched type of print host: %s"
msgstr "Tipo incompatível de host de impressão: %s"
-#: src/slic3r/Utils/OctoPrint.cpp:85
-msgid "Connection to OctoPrint works correctly."
-msgstr "A ligação ao OctoPrint funciona correctamente."
+#: src/slic3r/Utils/AstroBox.cpp:84
+msgid "Connection to AstroBox works correctly."
+msgstr "A conexão com o AstroBox funciona corretamente."
-#: src/slic3r/Utils/OctoPrint.cpp:91
-msgid "Could not connect to OctoPrint"
-msgstr "Não foi possível conectar-se ao OctoPrint"
+#: src/slic3r/Utils/AstroBox.cpp:90
+msgid "Could not connect to AstroBox"
+msgstr "Não foi possível conectar-se ao AstroBox"
-#: src/slic3r/Utils/OctoPrint.cpp:91
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Nota: OctoPrint versão pelo menos 1.1.0 é necessária."
+#: src/slic3r/Utils/AstroBox.cpp:92
+msgid "Note: AstroBox version at least 1.1.0 is required."
+msgstr "Nota: A versão astrobox é necessária pelo menos 1.1.0."
-#: src/slic3r/Utils/OctoPrint.cpp:196
-msgid "Connection to Prusa SL1 works correctly."
-msgstr "A conexão com o Prusa SL1 funciona corretamente."
+#: src/slic3r/Utils/Duet.cpp:49
+msgid "Connection to Duet works correctly."
+msgstr "A conexão com o Duet funciona corretamente."
-#: src/slic3r/Utils/OctoPrint.cpp:201
-msgid "Could not connect to Prusa SLA"
-msgstr "Não foi possível conectar-se a Prusa SLA"
+#: src/slic3r/Utils/Duet.cpp:55
+msgid "Could not connect to Duet"
+msgstr "Não foi possível conectar-se ao Duet"
-#: src/slic3r/Utils/PresetUpdater.cpp:614
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "requer min . %s e máx. %s"
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:139
+#: src/slic3r/Utils/FlashAir.cpp:122 src/slic3r/Utils/FlashAir.cpp:143
+#: src/slic3r/Utils/FlashAir.cpp:159
+msgid "Unknown error occured"
+msgstr "Ocorreu um erro desconhecido"
-#: src/slic3r/Utils/PresetUpdater.cpp:619
-#, c-format
-msgid "requires min. %s"
-msgstr "requer min . %s"
+#: src/slic3r/Utils/Duet.cpp:133
+msgid "Wrong password"
+msgstr "Senha incorreta"
-#: src/slic3r/Utils/PresetUpdater.cpp:621
-#, c-format
-msgid "requires max. %s"
-msgstr "requer Max. %s"
+#: src/slic3r/Utils/Duet.cpp:136
+msgid "Could not get resources to create a new connection"
+msgstr "Não foi possível obter recursos para criar uma nova conexão"
#: src/slic3r/Utils/FixModelByWin10.cpp:219
#: src/slic3r/Utils/FixModelByWin10.cpp:359
@@ -5368,8 +6506,68 @@ msgid "Model Repair by the Netfabb service"
msgstr "Reparação de modelos pelo serviço Netfabb"
#: src/slic3r/Utils/FixModelByWin10.cpp:426
-msgid "Model repair failed: \n"
-msgstr "Falha no reparo do modelo:\n"
+msgid "Model repair failed:"
+msgstr "Falha no reparo do modelo:"
+
+#: src/slic3r/Utils/FlashAir.cpp:58
+msgid "Upload not enabled on FlashAir card."
+msgstr "Upload não ativado no cartão FlashAir."
+
+#: src/slic3r/Utils/FlashAir.cpp:68
+msgid "Connection to FlashAir works correctly and upload is enabled."
+msgstr ""
+"A conexão com o FlashAir funciona corretamente e o upload está ativado."
+
+#: src/slic3r/Utils/FlashAir.cpp:74
+msgid "Could not connect to FlashAir"
+msgstr "Não foi possível conectar-se ao FlashAir"
+
+#: src/slic3r/Utils/FlashAir.cpp:76
+msgid ""
+"Note: FlashAir with firmware 2.00.02 or newer and activated upload function "
+"is required."
+msgstr ""
+"Nota: O FlashAir com firmware 2.00.02 ou função de upload mais nova e "
+"ativada é necessário."
+
+#: src/slic3r/Utils/OctoPrint.cpp:84
+msgid "Connection to OctoPrint works correctly."
+msgstr "A ligação ao OctoPrint funciona correctamente."
+
+#: src/slic3r/Utils/OctoPrint.cpp:90
+msgid "Could not connect to OctoPrint"
+msgstr "Não foi possível conectar-se ao OctoPrint"
+
+#: src/slic3r/Utils/OctoPrint.cpp:92
+msgid "Note: OctoPrint version at least 1.1.0 is required."
+msgstr "Nota: OctoPrint versão pelo menos 1.1.0 é necessária."
+
+#: src/slic3r/Utils/OctoPrint.cpp:179
+msgid "Connection to Prusa SL1 works correctly."
+msgstr "A conexão com o Prusa SL1 funciona corretamente."
+
+#: src/slic3r/Utils/OctoPrint.cpp:185
+msgid "Could not connect to Prusa SLA"
+msgstr "Não foi possível conectar-se a Prusa SLA"
+
+#: src/slic3r/Utils/PresetUpdater.cpp:705
+#, c-format
+msgid "requires min. %s and max. %s"
+msgstr "requer min . %s e máx. %s"
+
+#: src/slic3r/Utils/PresetUpdater.cpp:710
+#, c-format
+msgid "requires min. %s"
+msgstr "requer min . %s"
+
+#: src/slic3r/Utils/PresetUpdater.cpp:713
+#, c-format
+msgid "requires max. %s"
+msgstr "requer Max. %s"
+
+#: src/libslic3r/SLA/Pad.cpp:691
+msgid "Pad brim size is too small for the current configuration."
+msgstr "O tamanho da borda do bloco é muito pequeno para a configuração atual."
#: src/libslic3r/Zipper.cpp:32
msgid "undefined error"
@@ -5499,33 +6697,80 @@ msgstr "write calledback falhou"
msgid "Error with zip archive"
msgstr "Erro com arquivo zip"
-#: src/libslic3r/Print.cpp:1112
+#: src/libslic3r/GCode.cpp:637
+msgid "Empty layers detected, the output would not be printable."
+msgstr "Camadas vazias detectadas, a saída não seria imprimível."
+
+#: src/libslic3r/GCode.cpp:638
+msgid "Print z"
+msgstr "Imprimir Z"
+
+#: src/libslic3r/GCode.cpp:639
+msgid ""
+"This is usually caused by negligibly small extrusions or by a faulty model. "
+"Try to repair the model or change its orientation on the bed."
+msgstr ""
+"Isso geralmente é causado por extrusões insignificantes ou por um modelo "
+"defeituoso. Tente reparar o modelo ou mudar sua orientação na cama."
+
+#: src/libslic3r/ExtrusionEntity.cpp:323
+msgid "Mixed"
+msgstr "Misto"
+
+#: src/libslic3r/Flow.cpp:61
+msgid ""
+"Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
+msgstr ""
+"Não é possível calcular a largura de extrusão para %1%: Variável \"%2%\" não "
+"acessível."
+
+#: src/libslic3r/Format/3mf.cpp:1630
+msgid ""
+"The selected 3mf file has been saved with a newer version of %1% and is not "
+"compatible."
+msgstr ""
+"O arquivo 3mf selecionado foi salvo com uma versão mais recente de %1% e não "
+"é compatível."
+
+#: src/libslic3r/Format/AMF.cpp:934
+msgid ""
+"The selected amf file has been saved with a newer version of %1% and is not "
+"compatible."
+msgstr ""
+"O arquivo amf selecionado foi salvo com uma versão mais recente de %1% e não "
+"é compatível."
+
+#: src/libslic3r/Print.cpp:1219
msgid "All objects are outside of the print volume."
msgstr "Todos os objetos estão fora do volume de impressão."
-#: src/libslic3r/Print.cpp:1139
+#: src/libslic3r/Print.cpp:1222
+msgid "The supplied settings will cause an empty print."
+msgstr "As config. fornecidas causarão uma impressão vazia."
+
+#: src/libslic3r/Print.cpp:1226
msgid "Some objects are too close; your extruder will collide with them."
msgstr "Alguns objetos são muito próximos; sua extrusora irá colidir com eles."
-#: src/libslic3r/Print.cpp:1154
+#: src/libslic3r/Print.cpp:1228
msgid ""
"Some objects are too tall and cannot be printed without extruder collisions."
msgstr ""
"Alguns objetos são muito altos e não podem ser impressos sem colisões de "
"extrusoras."
-#: src/libslic3r/Print.cpp:1164
+#: src/libslic3r/Print.cpp:1237
msgid "The Spiral Vase option can only be used when printing a single object."
msgstr "A opção vaso espiral só pode ser usada ao imprimir um único objeto."
-#: src/libslic3r/Print.cpp:1171
+#: src/libslic3r/Print.cpp:1244
msgid ""
"The Spiral Vase option can only be used when printing single material "
"objects."
msgstr ""
"A opção vaso espiral só pode ser usada ao imprimir objetos de material único."
-#: src/libslic3r/Print.cpp:1184
+#: src/libslic3r/Print.cpp:1257
msgid ""
"The wipe tower is only supported if all extruders have the same nozzle "
"diameter and use filaments of the same diameter."
@@ -5533,7 +6778,7 @@ msgstr ""
"A torre de limpeza só é suportada se todas as extrusoras tiverem o mesmo "
"diâmetro da ponteira e usarem filamentos do mesmo diâmetro."
-#: src/libslic3r/Print.cpp:1189
+#: src/libslic3r/Print.cpp:1262
msgid ""
"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
"and Repetier G-code flavors."
@@ -5541,7 +6786,7 @@ msgstr ""
"A Wipe Tower é atualmente suportada apenas para os firmwares Marlin, RepRap/"
"Sprinter e Repetier G-code."
-#: src/libslic3r/Print.cpp:1191
+#: src/libslic3r/Print.cpp:1264
msgid ""
"The Wipe Tower is currently only supported with the relative extruder "
"addressing (use_relative_e_distances=1)."
@@ -5549,13 +6794,27 @@ msgstr ""
"A torre da limpeza é suportada atualmente somente com o endereçamento "
"relativo da extrusora (use_relative_e_distances = 1)."
-#: src/libslic3r/Print.cpp:1193
+#: src/libslic3r/Print.cpp:1266
msgid "Ooze prevention is currently not supported with the wipe tower enabled."
msgstr ""
"A prevenção de escorrimento não é suportada atualmente com a torre da "
"limpeza permitida."
-#: src/libslic3r/Print.cpp:1214
+#: src/libslic3r/Print.cpp:1268
+msgid ""
+"The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)."
+msgstr ""
+"Atualmente, a Torre limpa não suporta E volumétrica (use_volumetric_e=0)."
+
+#: src/libslic3r/Print.cpp:1270
+msgid ""
+"The Wipe Tower is currently not supported for multimaterial sequential "
+"prints."
+msgstr ""
+"A torre de limpeza só é suportada para vários objetos se eles tiverem "
+"alturas de camada iguais."
+
+#: src/libslic3r/Print.cpp:1291
msgid ""
"The Wipe Tower is only supported for multiple objects if they have equal "
"layer heights"
@@ -5563,7 +6822,7 @@ msgstr ""
"A torre de limpeza só é suportada para vários objetos se eles tiverem "
"alturas de camada iguais"
-#: src/libslic3r/Print.cpp:1216
+#: src/libslic3r/Print.cpp:1293
msgid ""
"The Wipe Tower is only supported for multiple objects if they are printed "
"over an equal number of raft layers"
@@ -5571,7 +6830,7 @@ msgstr ""
"A torre de limpeza só é suportada para vários objetos se elas forem "
"impressas em um número igual de camadas de estrado"
-#: src/libslic3r/Print.cpp:1218
+#: src/libslic3r/Print.cpp:1295
msgid ""
"The Wipe Tower is only supported for multiple objects if they are printed "
"with the same support_material_contact_distance"
@@ -5579,7 +6838,7 @@ msgstr ""
"A torre de limpeza só é suportado para vários objetos se eles são impressos "
"com a mesma distância de contato do suporte"
-#: src/libslic3r/Print.cpp:1220
+#: src/libslic3r/Print.cpp:1297
msgid ""
"The Wipe Tower is only supported for multiple objects if they are sliced "
"equally."
@@ -5587,36 +6846,32 @@ msgstr ""
"A torre de limpeza só é suportada para vários objetos se eles são fatiados "
"igualmente."
-#: src/libslic3r/Print.cpp:1248
+#: src/libslic3r/Print.cpp:1339
msgid ""
-"The Wipe tower is only supported if all objects have the same layer height "
-"profile"
+"The Wipe tower is only supported if all objects have the same variable layer "
+"height"
msgstr ""
-"A torre de limpeza só é suportada se todos os objetos tiverem o mesmo perfil "
-"de altura da camada"
+"A torre de limpeza só é suportada se todos os objetos tiverem a mesma altura "
+"de camada variável"
-#: src/libslic3r/Print.cpp:1258
-msgid "The supplied settings will cause an empty print."
-msgstr "As config. fornecidas causarão uma impressão vazia."
-
-#: src/libslic3r/Print.cpp:1275
+#: src/libslic3r/Print.cpp:1365
msgid ""
"One or more object were assigned an extruder that the printer does not have."
msgstr ""
"Um ou mais objetos foram atribuídos a uma extrusora que a impressora não tem."
-#: src/libslic3r/Print.cpp:1284
+#: src/libslic3r/Print.cpp:1374
msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
msgstr ""
"%1% = %2% mm é muito baixo para ser impresso a uma altura de camada %3% mm"
-#: src/libslic3r/Print.cpp:1287
+#: src/libslic3r/Print.cpp:1377
msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm"
msgstr ""
"Excesso %1%=%2% milímetro a ser imprimível com um diâmetro da ponteira %3% "
"milímetro"
-#: src/libslic3r/Print.cpp:1298
+#: src/libslic3r/Print.cpp:1388
msgid ""
"Printing with multiple extruders of differing nozzle diameters. If support "
"is to be printed with the current extruder (support_material_extruder == 0 "
@@ -5628,7 +6883,7 @@ msgstr ""
"(support_material_extruder = = 0 ou support_material_interface_extruder = = "
"0), todos as ponteiras têm que ser do mesmo diâmetro."
-#: src/libslic3r/Print.cpp:1306
+#: src/libslic3r/Print.cpp:1396
msgid ""
"For the Wipe Tower to work with the soluble supports, the support layers "
"need to be synchronized with the object layers."
@@ -5636,7 +6891,7 @@ msgstr ""
"Para que a torre de limpeza funcione com os suportes solúveis, as camadas de "
"suporte precisam ser sincronizadas com as camadas de objeto."
-#: src/libslic3r/Print.cpp:1310
+#: src/libslic3r/Print.cpp:1400
msgid ""
"The Wipe Tower currently supports the non-soluble supports only if they are "
"printed with the current extruder without triggering a tool change. (both "
@@ -5648,64 +6903,36 @@ msgstr ""
"(ambos support_material_extruder e support_material_interface_extruder "
"precisam ser definidos como 0)."
-#: src/libslic3r/Print.cpp:1332
+#: src/libslic3r/Print.cpp:1422
msgid "First layer height can't be greater than nozzle diameter"
msgstr ""
"A primeira altura da camada não pode ser maior do que o diâmetro da ponteira"
-#: src/libslic3r/Print.cpp:1337
+#: src/libslic3r/Print.cpp:1427
msgid "Layer height can't be greater than nozzle diameter"
msgstr "A altura da camada não pode ser maior do que o diâmetro da ponteira"
-#: src/libslic3r/Print.cpp:1492
+#: src/libslic3r/Print.cpp:1584
msgid "Infilling layers"
msgstr "Camadas de preenchimento"
-#: src/libslic3r/Print.cpp:1500
+#: src/libslic3r/Print.cpp:1606
msgid "Generating skirt"
msgstr "Gerando saia"
-#: src/libslic3r/Print.cpp:1508
+#: src/libslic3r/Print.cpp:1614
msgid "Generating brim"
msgstr "Gerando a aba"
-#: src/libslic3r/Print.cpp:1536
+#: src/libslic3r/Print.cpp:1638
msgid "Exporting G-code"
msgstr "Exportando o G-code"
-#: src/libslic3r/Print.cpp:1540
+#: src/libslic3r/Print.cpp:1642
msgid "Generating G-code"
msgstr "Gerando G-code"
-#: src/libslic3r/SLAPrint.cpp:64
-msgid "Slicing model"
-msgstr "Modelo de fatiamento"
-
-#: src/libslic3r/SLAPrint.cpp:65 src/libslic3r/SLAPrint.cpp:899
-msgid "Generating support points"
-msgstr "Gerando pontos de suporte"
-
-#: src/libslic3r/SLAPrint.cpp:66
-msgid "Generating support tree"
-msgstr "Gerando suporte em árvore"
-
-#: src/libslic3r/SLAPrint.cpp:67
-msgid "Generating pad"
-msgstr "Gerando pad"
-
-#: src/libslic3r/SLAPrint.cpp:68
-msgid "Slicing supports"
-msgstr "Fatiando suportes"
-
-#: src/libslic3r/SLAPrint.cpp:85
-msgid "Merging slices and calculating statistics"
-msgstr "Mesclando camadas e calculando estatísticas"
-
-#: src/libslic3r/SLAPrint.cpp:86
-msgid "Rasterizing layers"
-msgstr "Rasterizando camadas"
-
-#: src/libslic3r/SLAPrint.cpp:661
+#: src/libslic3r/SLAPrint.cpp:615
msgid ""
"Cannot proceed without support points! Add support points or disable support "
"generation."
@@ -5713,7 +6940,7 @@ msgstr ""
"Não pode prosseguir sem pontos de suporte! Adicione pontos de suporte ou "
"desative a geração de suporte."
-#: src/libslic3r/SLAPrint.cpp:678
+#: src/libslic3r/SLAPrint.cpp:627
msgid ""
"Elevation is too low for object. Use the \"Pad around object\" feature to "
"print the object without elevation."
@@ -5721,7 +6948,7 @@ msgstr ""
"A elevação é muito baixa para o objeto. Use o recurso \"pad ao redor do "
"objeto\" para imprimir o objeto sem elevação."
-#: src/libslic3r/SLAPrint.cpp:684
+#: src/libslic3r/SLAPrint.cpp:633
msgid ""
"The endings of the support pillars will be deployed on the gap between the "
"object and the pad. 'Support base safety distance' has to be greater than "
@@ -5731,30 +6958,90 @@ msgstr ""
"objeto e o pad. ' Distância de segurança de base de suporte ' tem de ser "
"maior do que o parâmetro ' pad objecto Gap ' para evitar este."
-#: src/libslic3r/SLAPrint.cpp:696
+#: src/libslic3r/SLAPrint.cpp:648
msgid "Exposition time is out of printer profile bounds."
msgstr "O tempo de exposição está fora dos limites do perfil da impressora."
-#: src/libslic3r/SLAPrint.cpp:703
+#: src/libslic3r/SLAPrint.cpp:655
msgid "Initial exposition time is out of printer profile bounds."
msgstr ""
"O tempo de exposição inicial está fora dos limites do perfil da impressora."
-#: src/libslic3r/SLAPrint.cpp:787
+#: src/libslic3r/SLAPrint.cpp:762
+msgid "Slicing done"
+msgstr "Fatiamento pronto"
+
+#: src/libslic3r/SLAPrintSteps.cpp:43
+msgid "Hollowing model"
+msgstr "Deixar oco o modelo"
+
+#: src/libslic3r/SLAPrintSteps.cpp:44
+msgid "Drilling holes into model."
+msgstr "Furando o modelo"
+
+#: src/libslic3r/SLAPrintSteps.cpp:45
+msgid "Slicing model"
+msgstr "Modelo de fatiamento"
+
+#: src/libslic3r/SLAPrintSteps.cpp:46 src/libslic3r/SLAPrintSteps.cpp:356
+msgid "Generating support points"
+msgstr "Gerando pontos de suporte"
+
+#: src/libslic3r/SLAPrintSteps.cpp:47
+msgid "Generating support tree"
+msgstr "Gerando suporte em árvore"
+
+#: src/libslic3r/SLAPrintSteps.cpp:48
+msgid "Generating pad"
+msgstr "Gerando pad"
+
+#: src/libslic3r/SLAPrintSteps.cpp:49
+msgid "Slicing supports"
+msgstr "Fatiando suportes"
+
+#: src/libslic3r/SLAPrintSteps.cpp:64
+msgid "Merging slices and calculating statistics"
+msgstr "Mesclando camadas e calculando estatísticas"
+
+#: src/libslic3r/SLAPrintSteps.cpp:65
+msgid "Rasterizing layers"
+msgstr "Rasterizando camadas"
+
+#: src/libslic3r/SLAPrintSteps.cpp:190
+msgid "Too much overlapping holes."
+msgstr "Muitos buracos sobrepostos."
+
+#: src/libslic3r/SLAPrintSteps.cpp:199
+msgid ""
+"Drilling holes into the mesh failed. This is usually caused by broken model. "
+"Try to fix it first."
+msgstr ""
+"Os furos de perfuração na malha falharam. Isso geralmente é causado por "
+"modelo quebrado. Tente consertá-lo primeiro."
+
+#: src/libslic3r/SLAPrintSteps.cpp:245
msgid ""
"Slicing had to be stopped due to an internal error: Inconsistent slice index."
msgstr ""
"O fatiamento teve que ser parado devido a um erro interno: índice de "
"fatiamento inconsistente."
-#: src/libslic3r/SLAPrint.cpp:982 src/libslic3r/SLAPrint.cpp:992
-#: src/libslic3r/SLAPrint.cpp:1033
+#: src/libslic3r/SLAPrintSteps.cpp:413 src/libslic3r/SLAPrintSteps.cpp:422
+#: src/libslic3r/SLAPrintSteps.cpp:461
msgid "Visualizing supports"
msgstr "Visualizando suportes"
-#: src/libslic3r/SLAPrint.cpp:1566
-msgid "Slicing done"
-msgstr "Fatiamento pronto"
+#: src/libslic3r/SLAPrintSteps.cpp:453
+msgid "No pad can be generated for this model with the current configuration"
+msgstr "Nenhum pad pode ser gerado para este modelo com a configuração atual"
+
+#: src/libslic3r/SLAPrintSteps.cpp:621
+msgid ""
+"There are unprintable objects. Try to adjust support settings to make the "
+"objects printable."
+msgstr ""
+"Há objetos imprimíveis. Tente ajustar as configurações de suporte para "
+"tornar os objetos imprimíveis."
#: src/libslic3r/PrintBase.cpp:71
msgid "Failed processing of the output_filename_format template."
@@ -5776,7 +7063,11 @@ msgstr "Textura customizada da mesa"
msgid "Bed custom model"
msgstr "Modelo customizado da mesa"
-#: src/libslic3r/PrintConfig.cpp:68
+#: src/libslic3r/PrintConfig.cpp:66
+msgid "Picture sizes to be stored into a .gcode and .sl1 files"
+msgstr "Tamanhos de imagem a serem armazenados em arquivos .gcode e .sl1"
+
+#: src/libslic3r/PrintConfig.cpp:73
msgid ""
"This setting controls the height (and thus the total number) of the slices/"
"layers. Thinner layers give better accuracy but take more time to print."
@@ -5785,11 +7076,11 @@ msgstr ""
"camadas. Camadas mais finas dão melhor precisão, mas levam mais tempo para "
"imprimir."
-#: src/libslic3r/PrintConfig.cpp:75
+#: src/libslic3r/PrintConfig.cpp:80
msgid "Max print height"
msgstr "Altura máxima de impressão"
-#: src/libslic3r/PrintConfig.cpp:76
+#: src/libslic3r/PrintConfig.cpp:81
msgid ""
"Set this to the maximum height that can be reached by your extruder while "
"printing."
@@ -5797,11 +7088,11 @@ msgstr ""
"Defina isto para a altura máxima que pode ser alcançada pela sua extrusora "
"durante a impressão."
-#: src/libslic3r/PrintConfig.cpp:82
+#: src/libslic3r/PrintConfig.cpp:87
msgid "Slice gap closing radius"
msgstr "Raio de fechamento da abertura da fatia"
-#: src/libslic3r/PrintConfig.cpp:84
+#: src/libslic3r/PrintConfig.cpp:89
msgid ""
"Cracks smaller than 2x gap closing radius are being filled during the "
"triangle mesh slicing. The gap closing operation may reduce the final print "
@@ -5812,11 +7103,11 @@ msgstr ""
"fechamento de vão pode reduzir a resolução final de impressão, portanto, é "
"aconselhável manter o valor razoavelmente baixo."
-#: src/libslic3r/PrintConfig.cpp:92
+#: src/libslic3r/PrintConfig.cpp:97
msgid "Hostname, IP or URL"
msgstr "Hostname, IP ou URL"
-#: src/libslic3r/PrintConfig.cpp:93
+#: src/libslic3r/PrintConfig.cpp:98
msgid ""
"Slic3r can upload G-code files to a printer host. This field should contain "
"the hostname, IP address or URL of the printer host instance."
@@ -5825,11 +7116,11 @@ msgstr ""
"campo deve conter o nome de host, o endereço IP ou a URL da instância de "
"host da impressora."
-#: src/libslic3r/PrintConfig.cpp:99
+#: src/libslic3r/PrintConfig.cpp:104
msgid "API Key / Password"
msgstr "Chave de API/senha"
-#: src/libslic3r/PrintConfig.cpp:100
+#: src/libslic3r/PrintConfig.cpp:105
msgid ""
"Slic3r can upload G-code files to a printer host. This field should contain "
"the API Key or the password required for authentication."
@@ -5837,11 +7128,7 @@ msgstr ""
"Slic3r pode carregar arquivos de G-code para um host de impressora. Este "
"campo deve conter a chave de API ou a senha exigida para a autenticação."
-#: src/libslic3r/PrintConfig.cpp:106
-msgid "HTTPS CA File"
-msgstr "Arquivo de CA HTTPS"
-
-#: src/libslic3r/PrintConfig.cpp:107
+#: src/libslic3r/PrintConfig.cpp:112
msgid ""
"Custom CA certificate file can be specified for HTTPS OctoPrint connections, "
"in crt/pem format. If left blank, the default OS CA certificate repository "
@@ -5851,11 +7138,23 @@ msgstr ""
"conexões HTTPS OctoPrint, no formato CRT/PEM. Se deixado em branco, o "
"repositório de certificados do OS CA padrão é usado."
-#: src/libslic3r/PrintConfig.cpp:121
+#: src/libslic3r/PrintConfig.cpp:118
+msgid "Elephant foot compensation"
+msgstr "Compensação do pé do elefante"
+
+#: src/libslic3r/PrintConfig.cpp:120
+msgid ""
+"The first layer will be shrunk in the XY plane by the configured value to "
+"compensate for the 1st layer squish aka an Elephant Foot effect."
+msgstr ""
+"A primeira camada será encolhido no plano XY pelo valor config.urado para "
+"compensar a 1ª camada esmagada, também conhecida como pé de elefante."
+
+#: src/libslic3r/PrintConfig.cpp:136
msgid "Avoid crossing perimeters"
msgstr "Evitar cruzamento de perímetros"
-#: src/libslic3r/PrintConfig.cpp:122
+#: src/libslic3r/PrintConfig.cpp:137
msgid ""
"Optimize travel moves in order to minimize the crossing of perimeters. This "
"is mostly useful with Bowden extruders which suffer from oozing. This "
@@ -5865,11 +7164,11 @@ msgstr ""
"Isto é principalmente útil com extrusoras Bowden que sofrem de escorrimento. "
"Este recurso retarda a impressão e a geração de G-code."
-#: src/libslic3r/PrintConfig.cpp:129 src/libslic3r/PrintConfig.cpp:2027
+#: src/libslic3r/PrintConfig.cpp:144 src/libslic3r/PrintConfig.cpp:2064
msgid "Other layers"
msgstr "Outras camadas"
-#: src/libslic3r/PrintConfig.cpp:130
+#: src/libslic3r/PrintConfig.cpp:145
msgid ""
"Bed temperature for layers after the first one. Set this to zero to disable "
"bed temperature control commands in the output."
@@ -5877,11 +7176,11 @@ msgstr ""
"Temperatura da mesa para camadas após o primeiro. Defina isso como zero para "
"desabilitar os comandos de controle de temperatura da mesa na saída."
-#: src/libslic3r/PrintConfig.cpp:132
+#: src/libslic3r/PrintConfig.cpp:147
msgid "Bed temperature"
msgstr "Temperatura da mesa"
-#: src/libslic3r/PrintConfig.cpp:139
+#: src/libslic3r/PrintConfig.cpp:154
msgid ""
"This custom code is inserted at every layer change, right before the Z move. "
"Note that you can use placeholder variables for all Slic3r settings as well "
@@ -5891,11 +7190,11 @@ msgstr ""
"da movimentação Z. Observe que você pode usar variáveis de espaço reservado "
"para todas as config. Slic3r, bem como [layer_num] e [layer_z]."
-#: src/libslic3r/PrintConfig.cpp:149
+#: src/libslic3r/PrintConfig.cpp:164
msgid "Between objects G-code"
msgstr "G-code entre objetos"
-#: src/libslic3r/PrintConfig.cpp:150
+#: src/libslic3r/PrintConfig.cpp:165
msgid ""
"This code is inserted between objects when using sequential printing. By "
"default extruder and bed temperature are reset using non-wait command; "
@@ -5912,19 +7211,32 @@ msgstr ""
"Slic3r, para que você possa colocar um comando \"M109 S "
"[temperatura_primeira_camada]\" onde quiser."
-#: src/libslic3r/PrintConfig.cpp:161
+#: src/libslic3r/PrintConfig.cpp:176
msgid "Number of solid layers to generate on bottom surfaces."
msgstr "Número de camadas sólidas para gerar em superfícies inferiores."
-#: src/libslic3r/PrintConfig.cpp:162
+#: src/libslic3r/PrintConfig.cpp:177
msgid "Bottom solid layers"
msgstr "Camadas sólidas inferiores"
-#: src/libslic3r/PrintConfig.cpp:167
+#: src/libslic3r/PrintConfig.cpp:185
+msgid ""
+"The number of bottom solid layers is increased above bottom_solid_layers if "
+"necessary to satisfy minimum thickness of bottom shell."
+msgstr ""
+"O número de camadas sólidas inferiores é aumentado acima de "
+"bottom_solid_layers se necessário para satisfazer a espessura mínima da "
+"camada inferior."
+
+#: src/libslic3r/PrintConfig.cpp:187
+msgid "Minimum bottom shell thickness"
+msgstr "Espessura mínima da casca inferior"
+
+#: src/libslic3r/PrintConfig.cpp:193
msgid "Bridge"
msgstr "Ponte"
-#: src/libslic3r/PrintConfig.cpp:168
+#: src/libslic3r/PrintConfig.cpp:194
msgid ""
"This is the acceleration your printer will use for bridges. Set zero to "
"disable acceleration control for bridges."
@@ -5932,18 +7244,18 @@ msgstr ""
"Esta é a aceleração que sua impressora usará para pontes. Defina zero para "
"desabilitar o controle de aceleração para pontes."
-#: src/libslic3r/PrintConfig.cpp:170 src/libslic3r/PrintConfig.cpp:313
-#: src/libslic3r/PrintConfig.cpp:840 src/libslic3r/PrintConfig.cpp:961
-#: src/libslic3r/PrintConfig.cpp:1130 src/libslic3r/PrintConfig.cpp:1183
-#: src/libslic3r/PrintConfig.cpp:1194 src/libslic3r/PrintConfig.cpp:1383
+#: src/libslic3r/PrintConfig.cpp:196 src/libslic3r/PrintConfig.cpp:339
+#: src/libslic3r/PrintConfig.cpp:862 src/libslic3r/PrintConfig.cpp:984
+#: src/libslic3r/PrintConfig.cpp:1152 src/libslic3r/PrintConfig.cpp:1201
+#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1403
msgid "mm/s²"
msgstr "mm/s²"
-#: src/libslic3r/PrintConfig.cpp:176
+#: src/libslic3r/PrintConfig.cpp:202
msgid "Bridging angle"
msgstr "Ângulo de ponte"
-#: src/libslic3r/PrintConfig.cpp:178
+#: src/libslic3r/PrintConfig.cpp:204
msgid ""
"Bridging angle override. If left to zero, the bridging angle will be "
"calculated automatically. Otherwise the provided angle will be used for all "
@@ -5953,35 +7265,35 @@ msgstr ""
"calculado automaticamente. Caso contrário, o ângulo fornecido será usado "
"para todas as pontes. Use 180 ° para o ângulo zero."
-#: src/libslic3r/PrintConfig.cpp:181 src/libslic3r/PrintConfig.cpp:758
-#: src/libslic3r/PrintConfig.cpp:1619 src/libslic3r/PrintConfig.cpp:1629
-#: src/libslic3r/PrintConfig.cpp:1858 src/libslic3r/PrintConfig.cpp:2012
-#: src/libslic3r/PrintConfig.cpp:2197 src/libslic3r/PrintConfig.cpp:2614
-#: src/libslic3r/PrintConfig.cpp:2724
+#: src/libslic3r/PrintConfig.cpp:207 src/libslic3r/PrintConfig.cpp:780
+#: src/libslic3r/PrintConfig.cpp:1640 src/libslic3r/PrintConfig.cpp:1650
+#: src/libslic3r/PrintConfig.cpp:1894 src/libslic3r/PrintConfig.cpp:2049
+#: src/libslic3r/PrintConfig.cpp:2247 src/libslic3r/PrintConfig.cpp:2737
+#: src/libslic3r/PrintConfig.cpp:2858
msgid "°"
msgstr "°"
-#: src/libslic3r/PrintConfig.cpp:187
+#: src/libslic3r/PrintConfig.cpp:213
msgid "Bridges fan speed"
msgstr "Velocidade da ventoinha nas pontes"
-#: src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:214
msgid "This fan speed is enforced during all bridges and overhangs."
msgstr ""
"Esta velocidade da ventoinha é imposta durante todas as pontes e angulações."
-#: src/libslic3r/PrintConfig.cpp:189 src/libslic3r/PrintConfig.cpp:770
-#: src/libslic3r/PrintConfig.cpp:1203 src/libslic3r/PrintConfig.cpp:1266
-#: src/libslic3r/PrintConfig.cpp:1511 src/libslic3r/PrintConfig.cpp:2366
-#: src/libslic3r/PrintConfig.cpp:2654
+#: src/libslic3r/PrintConfig.cpp:215 src/libslic3r/PrintConfig.cpp:792
+#: src/libslic3r/PrintConfig.cpp:1219 src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1532 src/libslic3r/PrintConfig.cpp:2425
+#: src/libslic3r/PrintConfig.cpp:2777
msgid "%"
msgstr "%"
-#: src/libslic3r/PrintConfig.cpp:196
+#: src/libslic3r/PrintConfig.cpp:222
msgid "Bridge flow ratio"
msgstr "Relação de fluxo da ponte"
-#: src/libslic3r/PrintConfig.cpp:198
+#: src/libslic3r/PrintConfig.cpp:224
msgid ""
"This factor affects the amount of plastic for bridging. You can decrease it "
"slightly to pull the extrudates and prevent sagging, although default "
@@ -5993,32 +7305,32 @@ msgstr ""
"padrão são geralmente boas e você deve experimentar com refrigeração (use "
"uma ventoinha) antes de ajustes isso."
-#: src/libslic3r/PrintConfig.cpp:208
+#: src/libslic3r/PrintConfig.cpp:234
msgid "Bridges"
msgstr "Pontes"
-#: src/libslic3r/PrintConfig.cpp:210
+#: src/libslic3r/PrintConfig.cpp:236
msgid "Speed for printing bridges."
msgstr "Velocidade para a impressão de pontes."
-#: src/libslic3r/PrintConfig.cpp:211 src/libslic3r/PrintConfig.cpp:592
-#: src/libslic3r/PrintConfig.cpp:600 src/libslic3r/PrintConfig.cpp:609
-#: src/libslic3r/PrintConfig.cpp:617 src/libslic3r/PrintConfig.cpp:644
-#: src/libslic3r/PrintConfig.cpp:663 src/libslic3r/PrintConfig.cpp:899
-#: src/libslic3r/PrintConfig.cpp:1026 src/libslic3r/PrintConfig.cpp:1112
-#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1161
-#: src/libslic3r/PrintConfig.cpp:1172 src/libslic3r/PrintConfig.cpp:1225
-#: src/libslic3r/PrintConfig.cpp:1284 src/libslic3r/PrintConfig.cpp:1412
-#: src/libslic3r/PrintConfig.cpp:1586 src/libslic3r/PrintConfig.cpp:1595
-#: src/libslic3r/PrintConfig.cpp:1991 src/libslic3r/PrintConfig.cpp:2104
+#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:609
+#: src/libslic3r/PrintConfig.cpp:617 src/libslic3r/PrintConfig.cpp:626
+#: src/libslic3r/PrintConfig.cpp:634 src/libslic3r/PrintConfig.cpp:661
+#: src/libslic3r/PrintConfig.cpp:680 src/libslic3r/PrintConfig.cpp:922
+#: src/libslic3r/PrintConfig.cpp:1050 src/libslic3r/PrintConfig.cpp:1135
+#: src/libslic3r/PrintConfig.cpp:1169 src/libslic3r/PrintConfig.cpp:1181
+#: src/libslic3r/PrintConfig.cpp:1191 src/libslic3r/PrintConfig.cpp:1241
+#: src/libslic3r/PrintConfig.cpp:1300 src/libslic3r/PrintConfig.cpp:1433
+#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1616
+#: src/libslic3r/PrintConfig.cpp:2028 src/libslic3r/PrintConfig.cpp:2154
msgid "mm/s"
msgstr "mm/s"
-#: src/libslic3r/PrintConfig.cpp:218
+#: src/libslic3r/PrintConfig.cpp:244
msgid "Brim width"
msgstr "Largura da aba"
-#: src/libslic3r/PrintConfig.cpp:219
+#: src/libslic3r/PrintConfig.cpp:245
msgid ""
"Horizontal width of the brim that will be printed around each object on the "
"first layer."
@@ -6026,11 +7338,11 @@ msgstr ""
"Largura horizontal da aba que será impressa em torno de cada objeto na "
"primeira camada."
-#: src/libslic3r/PrintConfig.cpp:226
+#: src/libslic3r/PrintConfig.cpp:252
msgid "Clip multi-part objects"
msgstr "Clip objetos de várias partes"
-#: src/libslic3r/PrintConfig.cpp:227
+#: src/libslic3r/PrintConfig.cpp:253
msgid ""
"When printing multi-material objects, this settings will make Slic3r to clip "
"the overlapping object parts one by the other (2nd part will be clipped by "
@@ -6040,19 +7352,19 @@ msgstr ""
"Slic3r recorte as partes do objeto sobrepostas uma pela outra (2ª parte será "
"cortada pela 1ª, 3ª parte será cortada pela 1ª e 2ª, etc.)."
-#: src/libslic3r/PrintConfig.cpp:234
+#: src/libslic3r/PrintConfig.cpp:260
msgid "Colorprint height"
msgstr "Altura da impressão colorida"
-#: src/libslic3r/PrintConfig.cpp:235
+#: src/libslic3r/PrintConfig.cpp:261
msgid "Heights at which a filament change is to occur."
msgstr "Alturas em que uma mudança do filamento ocorre."
-#: src/libslic3r/PrintConfig.cpp:245
+#: src/libslic3r/PrintConfig.cpp:271
msgid "Compatible printers condition"
msgstr "Condição de impressoras compatíveis"
-#: src/libslic3r/PrintConfig.cpp:246
+#: src/libslic3r/PrintConfig.cpp:272
msgid ""
"A boolean expression using the configuration values of an active printer "
"profile. If this expression evaluates to true, this profile is considered "
@@ -6062,11 +7374,11 @@ msgstr ""
"impressora ativo. Se essa expressão for avaliada como verdadeira, esse "
"perfil será considerado compatível com o perfil de impressora ativo."
-#: src/libslic3r/PrintConfig.cpp:260
+#: src/libslic3r/PrintConfig.cpp:286
msgid "Compatible print profiles condition"
msgstr "Condição de perfis de impressão compatíveis"
-#: src/libslic3r/PrintConfig.cpp:261
+#: src/libslic3r/PrintConfig.cpp:287
msgid ""
"A boolean expression using the configuration values of an active print "
"profile. If this expression evaluates to true, this profile is considered "
@@ -6076,11 +7388,11 @@ msgstr ""
"impressão ativo. Se essa expressão for avaliada como verdadeira, esse perfil "
"será considerado compatível com o perfil de impressão ativo."
-#: src/libslic3r/PrintConfig.cpp:278
+#: src/libslic3r/PrintConfig.cpp:304
msgid "Complete individual objects"
msgstr "Complete objetos individuais"
-#: src/libslic3r/PrintConfig.cpp:279
+#: src/libslic3r/PrintConfig.cpp:305
msgid ""
"When printing multiple objects or copies, this feature will complete each "
"object before moving onto next one (and starting it from its bottom layer). "
@@ -6092,11 +7404,11 @@ msgstr ""
"recurso é útil para evitar o risco de impressões arruinadas. Slic3r deve "
"avisar e impedi-lo de colisões de extrusoras, mas cuidado."
-#: src/libslic3r/PrintConfig.cpp:287
+#: src/libslic3r/PrintConfig.cpp:313
msgid "Enable auto cooling"
msgstr "Ativar o resfriamento automático"
-#: src/libslic3r/PrintConfig.cpp:288
+#: src/libslic3r/PrintConfig.cpp:314
msgid ""
"This flag enables the automatic cooling logic that adjusts print speed and "
"fan speed according to layer printing time."
@@ -6105,26 +7417,26 @@ msgstr ""
"velocidade de impressão e a velocidade do ventoinha de acordo com o tempo de "
"impressão da camada."
-#: src/libslic3r/PrintConfig.cpp:293
+#: src/libslic3r/PrintConfig.cpp:319
msgid "Cooling tube position"
msgstr "Posição do tubo de resfriamento"
-#: src/libslic3r/PrintConfig.cpp:294
+#: src/libslic3r/PrintConfig.cpp:320
msgid "Distance of the center-point of the cooling tube from the extruder tip."
msgstr ""
"Distância do ponto central do tubo de resfriamento da ponta da extrusora."
-#: src/libslic3r/PrintConfig.cpp:301
+#: src/libslic3r/PrintConfig.cpp:327
msgid "Cooling tube length"
msgstr "Comprimento do tubo de resfriamento"
-#: src/libslic3r/PrintConfig.cpp:302
+#: src/libslic3r/PrintConfig.cpp:328
msgid "Length of the cooling tube to limit space for cooling moves inside it."
msgstr ""
"Comprimento do tubo de resfriamento para limitar o espaço para movimentos de "
"resfriamento dentro dele."
-#: src/libslic3r/PrintConfig.cpp:310
+#: src/libslic3r/PrintConfig.cpp:336
msgid ""
"This is the acceleration your printer will be reset to after the role-"
"specific acceleration values are used (perimeter/infill). Set zero to "
@@ -6134,11 +7446,11 @@ msgstr ""
"valores de aceleração específicos da função forem usados (perímetro/"
"preenchimento). Defina zero para evitar redefinir a aceleração em tudo."
-#: src/libslic3r/PrintConfig.cpp:319
+#: src/libslic3r/PrintConfig.cpp:345
msgid "Default filament profile"
msgstr "Perfil de filamento padrão"
-#: src/libslic3r/PrintConfig.cpp:320
+#: src/libslic3r/PrintConfig.cpp:346
msgid ""
"Default filament profile associated with the current printer profile. On "
"selection of the current printer profile, this filament profile will be "
@@ -6147,12 +7459,12 @@ msgstr ""
"Perfil de filamento padrão associado ao perfil de impressora atual. Na "
"seleção do perfil da impressora atual, este perfil de filamento será ativado."
-#: src/libslic3r/PrintConfig.cpp:326
+#: src/libslic3r/PrintConfig.cpp:352
msgid "Default print profile"
msgstr "Perfil de impressão padrão"
-#: src/libslic3r/PrintConfig.cpp:327 src/libslic3r/PrintConfig.cpp:2479
-#: src/libslic3r/PrintConfig.cpp:2490
+#: src/libslic3r/PrintConfig.cpp:353 src/libslic3r/PrintConfig.cpp:2592
+#: src/libslic3r/PrintConfig.cpp:2603
msgid ""
"Default print profile associated with the current printer profile. On "
"selection of the current printer profile, this print profile will be "
@@ -6161,11 +7473,11 @@ msgstr ""
"Perfil de impressão padrão associado ao perfil de impressora atual. Na "
"seleção do perfil de impressora atual, este perfil de impressão será ativado."
-#: src/libslic3r/PrintConfig.cpp:333
+#: src/libslic3r/PrintConfig.cpp:359
msgid "Disable fan for the first"
msgstr "Desabilite o ventoinha para a(s) primeira(s)"
-#: src/libslic3r/PrintConfig.cpp:334
+#: src/libslic3r/PrintConfig.cpp:360
msgid ""
"You can set this to a positive value to disable fan at all during the first "
"layers, so that it does not make adhesion worse."
@@ -6173,18 +7485,11 @@ msgstr ""
"Você pode ajustar isto a um valor positivo para desabilitar a ventoinha "
"durante as primeiras camadas, de modo que melhore a adesão."
-#: src/libslic3r/PrintConfig.cpp:336 src/libslic3r/PrintConfig.cpp:971
-#: src/libslic3r/PrintConfig.cpp:1484 src/libslic3r/PrintConfig.cpp:1669
-#: src/libslic3r/PrintConfig.cpp:1730 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1939
-msgid "layers"
-msgstr "camadas"
-
-#: src/libslic3r/PrintConfig.cpp:343
+#: src/libslic3r/PrintConfig.cpp:369
msgid "Don't support bridges"
msgstr "Não suporte pontes"
-#: src/libslic3r/PrintConfig.cpp:345
+#: src/libslic3r/PrintConfig.cpp:371
msgid ""
"Experimental option for preventing support material from being generated "
"under bridged areas."
@@ -6192,27 +7497,15 @@ msgstr ""
"Opção experimental para impedir que o material de suporte seja gerado em "
"áreas com ponte."
-#: src/libslic3r/PrintConfig.cpp:351
+#: src/libslic3r/PrintConfig.cpp:377
msgid "Distance between copies"
msgstr "Distância entre cópias"
-#: src/libslic3r/PrintConfig.cpp:352
+#: src/libslic3r/PrintConfig.cpp:378
msgid "Distance used for the auto-arrange feature of the plater."
msgstr "Distância usada para o recurso de organizar automaticamente a bandeja."
-#: src/libslic3r/PrintConfig.cpp:359
-msgid "Elephant foot compensation"
-msgstr "Compensação do pé do elefante"
-
-#: src/libslic3r/PrintConfig.cpp:361
-msgid ""
-"The first layer will be shrunk in the XY plane by the configured value to "
-"compensate for the 1st layer squish aka an Elephant Foot effect."
-msgstr ""
-"A primeira camada será encolhido no plano XY pelo valor config.urado para "
-"compensar a 1ª camada esmagada, também conhecida como pé de elefante."
-
-#: src/libslic3r/PrintConfig.cpp:370
+#: src/libslic3r/PrintConfig.cpp:386
msgid ""
"This end procedure is inserted at the end of the output file. Note that you "
"can use placeholder variables for all PrusaSlicer settings."
@@ -6221,7 +7514,7 @@ msgstr ""
"você pode usar variáveis de espaço reservado para todas as config. de "
"PrusaSlicer."
-#: src/libslic3r/PrintConfig.cpp:380
+#: src/libslic3r/PrintConfig.cpp:396
msgid ""
"This end procedure is inserted at the end of the output file, before the "
"printer end gcode (and before any toolchange from this filament in case of "
@@ -6235,11 +7528,11 @@ msgstr ""
"usar variáveis de espaço reservado para todas as config. de PrusaSlicer. Se "
"você tiver várias extrusoras, o Gcode é processado em ordem de extrusora."
-#: src/libslic3r/PrintConfig.cpp:391
+#: src/libslic3r/PrintConfig.cpp:407
msgid "Ensure vertical shell thickness"
msgstr "Assegure a espessura vertical da parede"
-#: src/libslic3r/PrintConfig.cpp:393
+#: src/libslic3r/PrintConfig.cpp:409
msgid ""
"Add solid infill near sloping surfaces to guarantee the vertical shell "
"thickness (top+bottom solid layers)."
@@ -6247,11 +7540,11 @@ msgstr ""
"Adicionar preenchimento sólido perto de superfícies inclinadas para garantir "
"a espessura do escudo vertical (camadas sólidas no topo + base )."
-#: src/libslic3r/PrintConfig.cpp:399
+#: src/libslic3r/PrintConfig.cpp:415
msgid "Top fill pattern"
msgstr "Padrão de preenchimento do topo"
-#: src/libslic3r/PrintConfig.cpp:401
+#: src/libslic3r/PrintConfig.cpp:417
msgid ""
"Fill pattern for top infill. This only affects the top visible layer, and "
"not its adjacent solid shells."
@@ -6259,32 +7552,32 @@ msgstr ""
"Padrão de preenchimento para preenchimento do topo. Isto afeta somente a "
"camada visível superior, e não suas paredes adjacentes."
-#: src/libslic3r/PrintConfig.cpp:409 src/libslic3r/PrintConfig.cpp:821
-#: src/libslic3r/PrintConfig.cpp:1972
+#: src/libslic3r/PrintConfig.cpp:425 src/libslic3r/PrintConfig.cpp:843
+#: src/libslic3r/PrintConfig.cpp:2009
msgid "Rectilinear"
msgstr "Rectilíneo"
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:827
+#: src/libslic3r/PrintConfig.cpp:426 src/libslic3r/PrintConfig.cpp:849
msgid "Concentric"
msgstr "Concêntrico"
-#: src/libslic3r/PrintConfig.cpp:411 src/libslic3r/PrintConfig.cpp:831
+#: src/libslic3r/PrintConfig.cpp:427 src/libslic3r/PrintConfig.cpp:853
msgid "Hilbert Curve"
msgstr "Curva de Hilbert"
-#: src/libslic3r/PrintConfig.cpp:412 src/libslic3r/PrintConfig.cpp:832
+#: src/libslic3r/PrintConfig.cpp:428 src/libslic3r/PrintConfig.cpp:854
msgid "Archimedean Chords"
msgstr "Cordas Archimedean"
-#: src/libslic3r/PrintConfig.cpp:413 src/libslic3r/PrintConfig.cpp:833
+#: src/libslic3r/PrintConfig.cpp:429 src/libslic3r/PrintConfig.cpp:855
msgid "Octagram Spiral"
msgstr "Espiral estrelado"
-#: src/libslic3r/PrintConfig.cpp:419
+#: src/libslic3r/PrintConfig.cpp:435
msgid "Bottom fill pattern"
msgstr "Padrão de preenchimento da base"
-#: src/libslic3r/PrintConfig.cpp:421
+#: src/libslic3r/PrintConfig.cpp:437
msgid ""
"Fill pattern for bottom infill. This only affects the bottom external "
"visible layer, and not its adjacent solid shells."
@@ -6292,11 +7585,11 @@ msgstr ""
"Padrão de preenchimento para preenchimento da base. Isto afeta somente a "
"camada visível externa inferior, e não suas paredes adjacentes."
-#: src/libslic3r/PrintConfig.cpp:430 src/libslic3r/PrintConfig.cpp:440
+#: src/libslic3r/PrintConfig.cpp:446 src/libslic3r/PrintConfig.cpp:457
msgid "External perimeters"
msgstr "Perímetros externos"
-#: src/libslic3r/PrintConfig.cpp:432
+#: src/libslic3r/PrintConfig.cpp:448
msgid ""
"Set this to a non-zero value to set a manual extrusion width for external "
"perimeters. If left zero, default extrusion width will be used if set, "
@@ -6309,16 +7602,16 @@ msgstr ""
"ponteira será usado. Se expresso em porcentagem(por exemplo 200%), será "
"calculado sobre a altura da camada."
-#: src/libslic3r/PrintConfig.cpp:435 src/libslic3r/PrintConfig.cpp:543
-#: src/libslic3r/PrintConfig.cpp:860 src/libslic3r/PrintConfig.cpp:872
-#: src/libslic3r/PrintConfig.cpp:992 src/libslic3r/PrintConfig.cpp:1017
-#: src/libslic3r/PrintConfig.cpp:1403 src/libslic3r/PrintConfig.cpp:1741
-#: src/libslic3r/PrintConfig.cpp:1847 src/libslic3r/PrintConfig.cpp:1915
-#: src/libslic3r/PrintConfig.cpp:2074
+#: src/libslic3r/PrintConfig.cpp:451 src/libslic3r/PrintConfig.cpp:560
+#: src/libslic3r/PrintConfig.cpp:882 src/libslic3r/PrintConfig.cpp:895
+#: src/libslic3r/PrintConfig.cpp:1015 src/libslic3r/PrintConfig.cpp:1041
+#: src/libslic3r/PrintConfig.cpp:1423 src/libslic3r/PrintConfig.cpp:1761
+#: src/libslic3r/PrintConfig.cpp:1883 src/libslic3r/PrintConfig.cpp:1951
+#: src/libslic3r/PrintConfig.cpp:2111
msgid "mm or %"
msgstr "mm ou %"
-#: src/libslic3r/PrintConfig.cpp:442
+#: src/libslic3r/PrintConfig.cpp:459
msgid ""
"This separate setting will affect the speed of external perimeters (the "
"visible ones). If expressed as percentage (for example: 80%) it will be "
@@ -6328,17 +7621,17 @@ msgstr ""
"visíveis). Se expresso em porcentagem(por exemplo: 80%) Ele será calculado "
"sobre a velocidade de perímetros config. acima. Defina como zero para auto."
-#: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1700 src/libslic3r/PrintConfig.cpp:1751
-#: src/libslic3r/PrintConfig.cpp:1958 src/libslic3r/PrintConfig.cpp:2086
+#: src/libslic3r/PrintConfig.cpp:462 src/libslic3r/PrintConfig.cpp:904
+#: src/libslic3r/PrintConfig.cpp:1720 src/libslic3r/PrintConfig.cpp:1772
+#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2124
msgid "mm/s or %"
msgstr "mm/s ou %"
-#: src/libslic3r/PrintConfig.cpp:452
+#: src/libslic3r/PrintConfig.cpp:469
msgid "External perimeters first"
msgstr "Perímetros externos primeiro"
-#: src/libslic3r/PrintConfig.cpp:454
+#: src/libslic3r/PrintConfig.cpp:471
msgid ""
"Print contour perimeters from the outermost one to the innermost one instead "
"of the default inverse order."
@@ -6346,12 +7639,12 @@ msgstr ""
"Imprima perímetros de contorno do mais externo para o mais interno em vez da "
"ordem inversa padrão."
-#: src/libslic3r/PrintConfig.cpp:460
+#: src/libslic3r/PrintConfig.cpp:477
msgid "Extra perimeters if needed"
msgstr "Perímetros extras se necessário"
-#: src/libslic3r/PrintConfig.cpp:462
-#, c-format
+#: src/libslic3r/PrintConfig.cpp:479
+#, no-c-format
msgid ""
"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
"keeps adding perimeters, until more than 70% of the loop immediately above "
@@ -6361,7 +7654,7 @@ msgstr ""
"inclinados. Slic3r continua adicionando perímetros, até que mais de 70% o do "
"loop imediatamente acima é suportado."
-#: src/libslic3r/PrintConfig.cpp:472
+#: src/libslic3r/PrintConfig.cpp:489
msgid ""
"The extruder to use (unless more specific extruder settings are specified). "
"This value overrides perimeter and infill extruders, but not the support "
@@ -6371,7 +7664,7 @@ msgstr ""
"sejam especificadas). Esse valor substitui as extrusoras de perímetro e "
"preenchimento, mas não as extrusoras de suporte."
-#: src/libslic3r/PrintConfig.cpp:484
+#: src/libslic3r/PrintConfig.cpp:501
msgid ""
"Set this to the vertical distance between your nozzle tip and (usually) the "
"X carriage rods. In other words, this is the height of the clearance "
@@ -6383,11 +7676,7 @@ msgstr ""
"torno de sua extrusora, e representa a profundidade máxima que a extrusora "
"pode espreitar antes de colidir com outros objetos impressos."
-#: src/libslic3r/PrintConfig.cpp:494
-msgid "Radius"
-msgstr "Raio"
-
-#: src/libslic3r/PrintConfig.cpp:495
+#: src/libslic3r/PrintConfig.cpp:512
msgid ""
"Set this to the clearance radius around your extruder. If the extruder is "
"not centered, choose the largest value for safety. This setting is used to "
@@ -6398,19 +7687,19 @@ msgstr ""
"config. é usada para verificar colisões e exibir a visualização gráfica na "
"bandeja."
-#: src/libslic3r/PrintConfig.cpp:505
+#: src/libslic3r/PrintConfig.cpp:522
msgid "Extruder Color"
msgstr "Cor da extrusora"
-#: src/libslic3r/PrintConfig.cpp:506 src/libslic3r/PrintConfig.cpp:566
+#: src/libslic3r/PrintConfig.cpp:523 src/libslic3r/PrintConfig.cpp:583
msgid "This is only used in the Slic3r interface as a visual help."
msgstr "Isso é usado apenas na interface Slic3r como uma ajuda visual."
-#: src/libslic3r/PrintConfig.cpp:512
+#: src/libslic3r/PrintConfig.cpp:529
msgid "Extruder offset"
msgstr "Compensamento da extrusora"
-#: src/libslic3r/PrintConfig.cpp:513
+#: src/libslic3r/PrintConfig.cpp:530
msgid ""
"If your firmware doesn't handle the extruder displacement you need the G-"
"code to take it into account. This option lets you specify the displacement "
@@ -6422,11 +7711,11 @@ msgstr ""
"de cada extrusora em relação à primeira. Ele espera coordenadas positivas "
"(eles serão subtraída da coordenada XY)."
-#: src/libslic3r/PrintConfig.cpp:522
+#: src/libslic3r/PrintConfig.cpp:539
msgid "Extrusion axis"
msgstr "Eixo de extrusão"
-#: src/libslic3r/PrintConfig.cpp:523
+#: src/libslic3r/PrintConfig.cpp:540
msgid ""
"Use this option to set the axis letter associated to your printer's extruder "
"(usually E but some printers use A)."
@@ -6434,11 +7723,11 @@ msgstr ""
"Use esta opção para definir a letra do eixo associada à extrusora da sua "
"impressora (geralmente E, mas algumas impressoras usam A)."
-#: src/libslic3r/PrintConfig.cpp:528
+#: src/libslic3r/PrintConfig.cpp:545
msgid "Extrusion multiplier"
msgstr "Multiplicador de extrusão"
-#: src/libslic3r/PrintConfig.cpp:529
+#: src/libslic3r/PrintConfig.cpp:546
msgid ""
"This factor changes the amount of flow proportionally. You may need to tweak "
"this setting to get nice surface finish and correct single wall widths. "
@@ -6451,11 +7740,11 @@ msgstr ""
"0,9 e 1,1. Se você acha que precisa mudar isso mais, verifique o diâmetro do "
"filamento e os passos configurados no firmware da extrusora."
-#: src/libslic3r/PrintConfig.cpp:537
+#: src/libslic3r/PrintConfig.cpp:554
msgid "Default extrusion width"
msgstr "Largura de extrusão padrão"
-#: src/libslic3r/PrintConfig.cpp:539
+#: src/libslic3r/PrintConfig.cpp:556
msgid ""
"Set this to a non-zero value to allow a manual extrusion width. If left to "
"zero, Slic3r derives extrusion widths from the nozzle diameter (see the "
@@ -6469,11 +7758,11 @@ msgstr ""
"do perímetro, a largura de extrusão do preenchimento etc.). Se expresso como "
"porcentagem (por exemplo: 230%), ele será calculado sobre a altura da camada."
-#: src/libslic3r/PrintConfig.cpp:548
+#: src/libslic3r/PrintConfig.cpp:566
msgid "Keep fan always on"
msgstr "Mantenha a ventoinha sempre ligada"
-#: src/libslic3r/PrintConfig.cpp:549
+#: src/libslic3r/PrintConfig.cpp:567
msgid ""
"If this is enabled, fan will never be disabled and will be kept running at "
"least at its minimum speed. Useful for PLA, harmful for ABS."
@@ -6482,11 +7771,11 @@ msgstr ""
"funcionando pelo menos em sua velocidade mínima. Útil para o PLA, "
"prejudicial para o ABS."
-#: src/libslic3r/PrintConfig.cpp:554
+#: src/libslic3r/PrintConfig.cpp:572
msgid "Enable fan if layer print time is below"
msgstr "Ative o ventoinha se o tempo de impressão da camada estiver abaixo"
-#: src/libslic3r/PrintConfig.cpp:555
+#: src/libslic3r/PrintConfig.cpp:573
msgid ""
"If layer print time is estimated below this number of seconds, fan will be "
"enabled and its speed will be calculated by interpolating the minimum and "
@@ -6496,23 +7785,23 @@ msgstr ""
"segundos, a ventoinha será ativada e sua velocidade será calculada "
"interpolando as velocidades mínima e máxima."
-#: src/libslic3r/PrintConfig.cpp:557 src/libslic3r/PrintConfig.cpp:1687
+#: src/libslic3r/PrintConfig.cpp:575 src/libslic3r/PrintConfig.cpp:1708
msgid "approximate seconds"
msgstr "segundos aproximados"
-#: src/libslic3r/PrintConfig.cpp:571
+#: src/libslic3r/PrintConfig.cpp:588
msgid "Filament notes"
msgstr "Notas de filamento"
-#: src/libslic3r/PrintConfig.cpp:572
+#: src/libslic3r/PrintConfig.cpp:589
msgid "You can put your notes regarding the filament here."
msgstr "Você pode colocar suas anotações sobre o filamento aqui."
-#: src/libslic3r/PrintConfig.cpp:580 src/libslic3r/PrintConfig.cpp:1231
+#: src/libslic3r/PrintConfig.cpp:597 src/libslic3r/PrintConfig.cpp:1247
msgid "Max volumetric speed"
msgstr "Máxima velocidade volumétrica"
-#: src/libslic3r/PrintConfig.cpp:581
+#: src/libslic3r/PrintConfig.cpp:598
msgid ""
"Maximum volumetric speed allowed for this filament. Limits the maximum "
"volumetric speed of a print to the minimum of print and filament volumetric "
@@ -6522,27 +7811,27 @@ msgstr ""
"velocidade volumétrica máxima de uma impressão ao mínimo de velocidade "
"volumétrica de impressão e de filamento. Defina como zero para nenhum limite."
-#: src/libslic3r/PrintConfig.cpp:590
+#: src/libslic3r/PrintConfig.cpp:607
msgid "Loading speed"
msgstr "Velocidade de carregamento"
-#: src/libslic3r/PrintConfig.cpp:591
+#: src/libslic3r/PrintConfig.cpp:608
msgid "Speed used for loading the filament on the wipe tower."
msgstr "Velocidade utilizada para carregar o filamento na torre de limpeza."
-#: src/libslic3r/PrintConfig.cpp:598
+#: src/libslic3r/PrintConfig.cpp:615
msgid "Loading speed at the start"
msgstr "Velocidade de carregamento no início"
-#: src/libslic3r/PrintConfig.cpp:599
+#: src/libslic3r/PrintConfig.cpp:616
msgid "Speed used at the very beginning of loading phase."
msgstr "Velocidade utilizada no início da fase de carregamento."
-#: src/libslic3r/PrintConfig.cpp:606
+#: src/libslic3r/PrintConfig.cpp:623
msgid "Unloading speed"
msgstr "Velocidade de descarregamento"
-#: src/libslic3r/PrintConfig.cpp:607
+#: src/libslic3r/PrintConfig.cpp:624
msgid ""
"Speed used for unloading the filament on the wipe tower (does not affect "
"initial part of unloading just after ramming)."
@@ -6550,22 +7839,22 @@ msgstr ""
"Velocidade utilizada para descarregar o filamento na torre de limpeza (não "
"afeta a parte inicial do descarregamento logo após o Ramming)."
-#: src/libslic3r/PrintConfig.cpp:615
+#: src/libslic3r/PrintConfig.cpp:632
msgid "Unloading speed at the start"
msgstr "Velocidade de descarregamento no início"
-#: src/libslic3r/PrintConfig.cpp:616
+#: src/libslic3r/PrintConfig.cpp:633
msgid ""
"Speed used for unloading the tip of the filament immediately after ramming."
msgstr ""
"Velocidade usada para descarregar a ponta do filamento imediatamente após o "
"Ramming."
-#: src/libslic3r/PrintConfig.cpp:623
+#: src/libslic3r/PrintConfig.cpp:640
msgid "Delay after unloading"
msgstr "Atraso após o descarregamento"
-#: src/libslic3r/PrintConfig.cpp:624
+#: src/libslic3r/PrintConfig.cpp:641
msgid ""
"Time to wait after the filament is unloaded. May help to get reliable "
"toolchanges with flexible materials that may need more time to shrink to "
@@ -6575,11 +7864,11 @@ msgstr ""
"trocas de ferramenta confiáveis com materiais flexíveis que podem precisar "
"de mais tempo para reduzir as dimensões originais."
-#: src/libslic3r/PrintConfig.cpp:633
+#: src/libslic3r/PrintConfig.cpp:650
msgid "Number of cooling moves"
msgstr "Número de movimentos de resfriamento"
-#: src/libslic3r/PrintConfig.cpp:634
+#: src/libslic3r/PrintConfig.cpp:651
msgid ""
"Filament is cooled by being moved back and forth in the cooling tubes. "
"Specify desired number of these moves."
@@ -6587,21 +7876,21 @@ msgstr ""
"O filamento é resfriado por ser movido para frente e para trás nos tubos de "
"resfriamento. Especifique o número desejado desses movimentos."
-#: src/libslic3r/PrintConfig.cpp:642
+#: src/libslic3r/PrintConfig.cpp:659
msgid "Speed of the first cooling move"
msgstr "Velocidade do primeiro movimento de resfriamento"
-#: src/libslic3r/PrintConfig.cpp:643
+#: src/libslic3r/PrintConfig.cpp:660
msgid "Cooling moves are gradually accelerating beginning at this speed."
msgstr ""
"Movimentos de resfriamento estão gradualmente acelerando a partir desta "
"velocidade."
-#: src/libslic3r/PrintConfig.cpp:650
+#: src/libslic3r/PrintConfig.cpp:667
msgid "Minimal purge on wipe tower"
msgstr "Remoção mínima na torre da limpeza"
-#: src/libslic3r/PrintConfig.cpp:651
+#: src/libslic3r/PrintConfig.cpp:668
msgid ""
"After a tool change, the exact position of the newly loaded filament inside "
"the nozzle may not be known, and the filament pressure is likely not yet "
@@ -6616,25 +7905,25 @@ msgstr ""
"Prime esta quantidade de material para a torre de limpeza para produzir "
"sucessivas preenchimento ou sacrificial objeto extrusões de forma confiável."
-#: src/libslic3r/PrintConfig.cpp:655
+#: src/libslic3r/PrintConfig.cpp:672
msgid "mm³"
msgstr "mm³"
-#: src/libslic3r/PrintConfig.cpp:661
+#: src/libslic3r/PrintConfig.cpp:678
msgid "Speed of the last cooling move"
msgstr "Velocidade do último movimento de resfriamento"
-#: src/libslic3r/PrintConfig.cpp:662
+#: src/libslic3r/PrintConfig.cpp:679
msgid "Cooling moves are gradually accelerating towards this speed."
msgstr ""
"Movimentos de resfriamento estão gradualmente acelerando para esta "
"velocidade."
-#: src/libslic3r/PrintConfig.cpp:669
+#: src/libslic3r/PrintConfig.cpp:686
msgid "Filament load time"
msgstr "Tempo de carga do filamento"
-#: src/libslic3r/PrintConfig.cpp:670
+#: src/libslic3r/PrintConfig.cpp:687
msgid ""
"Time for the printer firmware (or the Multi Material Unit 2.0) to load a new "
"filament during a tool change (when executing the T code). This time is "
@@ -6645,11 +7934,11 @@ msgstr ""
"código T). Esse tempo é adicionado ao tempo total de impressão pelo "
"estimador de tempo do G-code."
-#: src/libslic3r/PrintConfig.cpp:677
+#: src/libslic3r/PrintConfig.cpp:694
msgid "Ramming parameters"
msgstr "Parâmetros de Ramming"
-#: src/libslic3r/PrintConfig.cpp:678
+#: src/libslic3r/PrintConfig.cpp:695
msgid ""
"This string is edited by RammingDialog and contains ramming specific "
"parameters."
@@ -6657,11 +7946,11 @@ msgstr ""
"Essa cadeia de caracteres é editada por rammingdialog e contém parâmetros "
"específicos de Ramming."
-#: src/libslic3r/PrintConfig.cpp:684
+#: src/libslic3r/PrintConfig.cpp:701
msgid "Filament unload time"
msgstr "Tempo de descarregamento do filamento"
-#: src/libslic3r/PrintConfig.cpp:685
+#: src/libslic3r/PrintConfig.cpp:702
msgid ""
"Time for the printer firmware (or the Multi Material Unit 2.0) to unload a "
"filament during a tool change (when executing the T code). This time is "
@@ -6672,7 +7961,7 @@ msgstr ""
"o código T). Esse tempo é adicionado ao tempo total de impressão pelo "
"estimador de tempo do G-code."
-#: src/libslic3r/PrintConfig.cpp:693
+#: src/libslic3r/PrintConfig.cpp:710
msgid ""
"Enter your filament diameter here. Good precision is required, so use a "
"caliper and do multiple measurements along the filament, then compute the "
@@ -6682,11 +7971,12 @@ msgstr ""
"paquímetro e fazer várias medições ao longo do filamento, em seguida, "
"calcular a média."
-#: src/libslic3r/PrintConfig.cpp:700
+#: src/libslic3r/PrintConfig.cpp:717 src/libslic3r/PrintConfig.cpp:2503
+#: src/libslic3r/PrintConfig.cpp:2504
msgid "Density"
msgstr "Densidade"
-#: src/libslic3r/PrintConfig.cpp:701
+#: src/libslic3r/PrintConfig.cpp:718
msgid ""
"Enter your filament density here. This is only for statistical information. "
"A decent way is to weigh a known length of filament and compute the ratio of "
@@ -6698,27 +7988,27 @@ msgstr ""
"filamento e computar a relação do comprimento ao volume. Melhor é calcular o "
"volume diretamente através do deslocamento."
-#: src/libslic3r/PrintConfig.cpp:704
+#: src/libslic3r/PrintConfig.cpp:721
msgid "g/cm³"
msgstr "g/cm³"
-#: src/libslic3r/PrintConfig.cpp:709
+#: src/libslic3r/PrintConfig.cpp:726
msgid "Filament type"
msgstr "Tipo de filamento"
-#: src/libslic3r/PrintConfig.cpp:710
+#: src/libslic3r/PrintConfig.cpp:727
msgid "The filament material type for use in custom G-codes."
msgstr "O tipo de material de filamento para uso em G-code customizados."
-#: src/libslic3r/PrintConfig.cpp:736
+#: src/libslic3r/PrintConfig.cpp:754
msgid "Soluble material"
msgstr "Material solúvel"
-#: src/libslic3r/PrintConfig.cpp:737
+#: src/libslic3r/PrintConfig.cpp:755
msgid "Soluble material is most likely used for a soluble support."
msgstr "O material solúvel é mais provável usado para um suporte solúvel."
-#: src/libslic3r/PrintConfig.cpp:743
+#: src/libslic3r/PrintConfig.cpp:761
msgid ""
"Enter your filament cost per kg here. This is only for statistical "
"information."
@@ -6726,15 +8016,19 @@ msgstr ""
"Insira o seu custo de filamento por kg aqui. Isto é apenas para informação "
"estatística."
-#: src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:762
msgid "money/kg"
msgstr "dinheiro/kg"
-#: src/libslic3r/PrintConfig.cpp:753
+#: src/libslic3r/PrintConfig.cpp:771 src/libslic3r/PrintConfig.cpp:2587
+msgid "(Unknown)"
+msgstr "(Desconhecido)"
+
+#: src/libslic3r/PrintConfig.cpp:775
msgid "Fill angle"
msgstr "Ângulo de preenchimento"
-#: src/libslic3r/PrintConfig.cpp:755
+#: src/libslic3r/PrintConfig.cpp:777
msgid ""
"Default base angle for infill orientation. Cross-hatching will be applied to "
"this. Bridges will be infilled using the best direction Slic3r can detect, "
@@ -6744,60 +8038,60 @@ msgstr ""
"aplicada a isso. Pontes serão preenchidas usando a melhor direção Slic3r "
"pode detectar, portanto, essa config. não vai afeta-los."
-#: src/libslic3r/PrintConfig.cpp:767
+#: src/libslic3r/PrintConfig.cpp:789
msgid "Fill density"
msgstr "Densidade de preenchimento"
-#: src/libslic3r/PrintConfig.cpp:769
+#: src/libslic3r/PrintConfig.cpp:791
msgid "Density of internal infill, expressed in the range 0% - 100%."
msgstr "Densidade de preenchimento interno, expresso na faixa de 0%-100%."
-#: src/libslic3r/PrintConfig.cpp:804
+#: src/libslic3r/PrintConfig.cpp:826
msgid "Fill pattern"
msgstr "Padrão de preenchimento"
-#: src/libslic3r/PrintConfig.cpp:806
+#: src/libslic3r/PrintConfig.cpp:828
msgid "Fill pattern for general low-density infill."
msgstr "Padrão de preenchimento para preenchimento de baixa densidade."
-#: src/libslic3r/PrintConfig.cpp:822
+#: src/libslic3r/PrintConfig.cpp:844
msgid "Grid"
msgstr "Grade"
-#: src/libslic3r/PrintConfig.cpp:823
+#: src/libslic3r/PrintConfig.cpp:845
msgid "Triangles"
msgstr "Triângulos"
-#: src/libslic3r/PrintConfig.cpp:824
+#: src/libslic3r/PrintConfig.cpp:846
msgid "Stars"
msgstr "Estrelas"
-#: src/libslic3r/PrintConfig.cpp:825
+#: src/libslic3r/PrintConfig.cpp:847
msgid "Cubic"
msgstr "Cúbico"
-#: src/libslic3r/PrintConfig.cpp:826
+#: src/libslic3r/PrintConfig.cpp:848
msgid "Line"
msgstr "Linha"
-#: src/libslic3r/PrintConfig.cpp:828 src/libslic3r/PrintConfig.cpp:1974
+#: src/libslic3r/PrintConfig.cpp:850 src/libslic3r/PrintConfig.cpp:2011
msgid "Honeycomb"
msgstr "Hexágono"
-#: src/libslic3r/PrintConfig.cpp:829
+#: src/libslic3r/PrintConfig.cpp:851
msgid "3D Honeycomb"
msgstr "Hexágono 3D"
-#: src/libslic3r/PrintConfig.cpp:830
+#: src/libslic3r/PrintConfig.cpp:852
msgid "Gyroid"
msgstr "Giróide"
-#: src/libslic3r/PrintConfig.cpp:837 src/libslic3r/PrintConfig.cpp:846
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:887
+#: src/libslic3r/PrintConfig.cpp:859 src/libslic3r/PrintConfig.cpp:868
+#: src/libslic3r/PrintConfig.cpp:876 src/libslic3r/PrintConfig.cpp:910
msgid "First layer"
msgstr "Primeira camada"
-#: src/libslic3r/PrintConfig.cpp:838
+#: src/libslic3r/PrintConfig.cpp:860
msgid ""
"This is the acceleration your printer will use for first layer. Set zero to "
"disable acceleration control for first layer."
@@ -6805,7 +8099,7 @@ msgstr ""
"Esta é a aceleração que sua impressora usará para a primeira camada. Defina "
"zero para desabilitar o controle de aceleração para a primeira camada."
-#: src/libslic3r/PrintConfig.cpp:847
+#: src/libslic3r/PrintConfig.cpp:869
msgid ""
"Heated build plate temperature for the first layer. Set this to zero to "
"disable bed temperature control commands in the output."
@@ -6813,7 +8107,7 @@ msgstr ""
"Temperatura da mesa aquecida para a primeira camada. Defina isso como zero "
"para desabilitar os comandos de controle de temperatura da mesa na saída."
-#: src/libslic3r/PrintConfig.cpp:856
+#: src/libslic3r/PrintConfig.cpp:878
msgid ""
"Set this to a non-zero value to set a manual extrusion width for first "
"layer. You can use this to force fatter extrudates for better adhesion. If "
@@ -6826,11 +8120,7 @@ msgstr ""
"exemplo, 120%) será computado sobre a primeira altura da camada. Se definido "
"como zero, ele usará a largura de extrusão padrão."
-#: src/libslic3r/PrintConfig.cpp:866
-msgid "First layer height"
-msgstr "Altura da primeira camada"
-
-#: src/libslic3r/PrintConfig.cpp:868
+#: src/libslic3r/PrintConfig.cpp:891
msgid ""
"When printing with very low layer heights, you might still want to print a "
"thicker bottom layer to improve adhesion and tolerance for non perfect build "
@@ -6843,11 +8133,11 @@ msgstr ""
"absoluto ou como uma porcentagem (por exemplo: 150%) sobre a altura da "
"camada padrão."
-#: src/libslic3r/PrintConfig.cpp:877
+#: src/libslic3r/PrintConfig.cpp:900
msgid "First layer speed"
msgstr "Velocidade da primeira camada"
-#: src/libslic3r/PrintConfig.cpp:878
+#: src/libslic3r/PrintConfig.cpp:901
msgid ""
"If expressed as absolute value in mm/s, this speed will be applied to all "
"the print moves of the first layer, regardless of their type. If expressed "
@@ -6858,7 +8148,7 @@ msgstr ""
"seu tipo. Se expresso em porcentagem(por exemplo: 40%) Ele dimensionará as "
"velocidades padrão."
-#: src/libslic3r/PrintConfig.cpp:888
+#: src/libslic3r/PrintConfig.cpp:911
msgid ""
"Extruder temperature for first layer. If you want to control temperature "
"manually during print, set this to zero to disable temperature control "
@@ -6868,7 +8158,7 @@ msgstr ""
"temperatura manualmente durante a impressão, defina isso como zero para "
"desabilitar os comandos de controle de temperatura no arquivo de saída."
-#: src/libslic3r/PrintConfig.cpp:897
+#: src/libslic3r/PrintConfig.cpp:920
msgid ""
"Speed for filling small gaps using short zigzag moves. Keep this reasonably "
"low to avoid too much shaking and resonance issues. Set zero to disable gaps "
@@ -6879,11 +8169,11 @@ msgstr ""
"problemas de ressonância. Defina zero para desabilitar o preenchimento de "
"lacunas."
-#: src/libslic3r/PrintConfig.cpp:905
+#: src/libslic3r/PrintConfig.cpp:928
msgid "Verbose G-code"
msgstr "Gcode detalhado"
-#: src/libslic3r/PrintConfig.cpp:906
+#: src/libslic3r/PrintConfig.cpp:929
msgid ""
"Enable this to get a commented G-code file, with each line explained by a "
"descriptive text. If you print from SD card, the additional weight of the "
@@ -6893,11 +8183,11 @@ msgstr ""
"explicada por um texto descritivo. Se você imprimir a partir do cartão SD, o "
"peso adicional do arquivo pode fazer o seu firmware ficar mais lento."
-#: src/libslic3r/PrintConfig.cpp:913
+#: src/libslic3r/PrintConfig.cpp:936
msgid "G-code flavor"
msgstr "Tipo de G-code"
-#: src/libslic3r/PrintConfig.cpp:914
+#: src/libslic3r/PrintConfig.cpp:937
msgid ""
"Some G/M-code commands, including temperature control and others, are not "
"universal. Set this option to your printer's firmware to get a compatible "
@@ -6909,15 +8199,15 @@ msgstr ""
"uma saída compatível. O \"sem extrusão\" tipo impede PrusaSlicer de exportar "
"qualquer valor de extrusão em tudo."
-#: src/libslic3r/PrintConfig.cpp:937
+#: src/libslic3r/PrintConfig.cpp:960
msgid "No extrusion"
msgstr "Sem extrusão"
-#: src/libslic3r/PrintConfig.cpp:942
+#: src/libslic3r/PrintConfig.cpp:965
msgid "Label objects"
msgstr "Rotular objetos"
-#: src/libslic3r/PrintConfig.cpp:943
+#: src/libslic3r/PrintConfig.cpp:966
msgid ""
"Enable this to add comments into the G-Code labeling print moves with what "
"object they belong to, which is useful for the Octoprint CancelObject "
@@ -6930,11 +8220,11 @@ msgstr ""
"config. de multi material de extrusora única e limpe em objeto/limpar em "
"preenchimento."
-#: src/libslic3r/PrintConfig.cpp:950
+#: src/libslic3r/PrintConfig.cpp:973
msgid "High extruder current on filament swap"
msgstr "Corrente elevada da extrusora na troca do filamento"
-#: src/libslic3r/PrintConfig.cpp:951
+#: src/libslic3r/PrintConfig.cpp:974
msgid ""
"It may be beneficial to increase the extruder motor current during the "
"filament exchange sequence to allow for rapid ramming feed rates and to "
@@ -6945,7 +8235,7 @@ msgstr ""
"Ramming rápidas e para superar a resistência ao carregar um filamento com "
"uma ponta feia."
-#: src/libslic3r/PrintConfig.cpp:959
+#: src/libslic3r/PrintConfig.cpp:982
msgid ""
"This is the acceleration your printer will use for infill. Set zero to "
"disable acceleration control for infill."
@@ -6953,11 +8243,11 @@ msgstr ""
"Esta é a aceleração que sua impressora usará para preenchimento. Defina zero "
"para desabilitar o controle de aceleração para preenchimento."
-#: src/libslic3r/PrintConfig.cpp:967
+#: src/libslic3r/PrintConfig.cpp:990
msgid "Combine infill every"
msgstr "Combine preenchimento a cada"
-#: src/libslic3r/PrintConfig.cpp:969
+#: src/libslic3r/PrintConfig.cpp:992
msgid ""
"This feature allows to combine infill and speed up your print by extruding "
"thicker infill layers while preserving thin perimeters, thus accuracy."
@@ -6966,20 +8256,20 @@ msgstr ""
"extrusão camadas de preenchimento mais espessa, preservando perímetros "
"finos, assim, a precisão."
-#: src/libslic3r/PrintConfig.cpp:972
+#: src/libslic3r/PrintConfig.cpp:995
msgid "Combine infill every n layers"
msgstr "Combine preenchimento cada n camadas"
-#: src/libslic3r/PrintConfig.cpp:978
+#: src/libslic3r/PrintConfig.cpp:1001
msgid "Infill extruder"
msgstr "Extrusora de preenchimento"
-#: src/libslic3r/PrintConfig.cpp:980
+#: src/libslic3r/PrintConfig.cpp:1003
msgid "The extruder to use when printing infill."
msgstr ""
"A extrusora a ser utilizada quando estiver imprimindo preenchimento sólido."
-#: src/libslic3r/PrintConfig.cpp:988
+#: src/libslic3r/PrintConfig.cpp:1011
msgid ""
"Set this to a non-zero value to set a manual extrusion width for infill. If "
"left zero, default extrusion width will be used if set, otherwise 1.125 x "
@@ -6994,11 +8284,11 @@ msgstr ""
"acelerar o preenchimento e tornar suas peças mais fortes. Se expresso em "
"porcentagem(por exemplo, 90%) Ele será calculado sobre a altura da camada."
-#: src/libslic3r/PrintConfig.cpp:997
+#: src/libslic3r/PrintConfig.cpp:1021
msgid "Infill before perimeters"
msgstr "Preenchimento antes dos perímetros"
-#: src/libslic3r/PrintConfig.cpp:998
+#: src/libslic3r/PrintConfig.cpp:1022
msgid ""
"This option will switch the print order of perimeters and infill, making the "
"latter first."
@@ -7006,11 +8296,11 @@ msgstr ""
"Esta opção irá mudar a ordem de impressão de perímetros e preenchimento, "
"tornando o último primeiro."
-#: src/libslic3r/PrintConfig.cpp:1003
+#: src/libslic3r/PrintConfig.cpp:1027
msgid "Only infill where needed"
msgstr "Somente preenchimento onde necessário"
-#: src/libslic3r/PrintConfig.cpp:1005
+#: src/libslic3r/PrintConfig.cpp:1029
msgid ""
"This option will limit infill to the areas actually needed for supporting "
"ceilings (it will act as internal support material). If enabled, slows down "
@@ -7021,11 +8311,11 @@ msgstr ""
"habilitada, retarda a geração de G-code devido às várias verificações "
"envolvidas."
-#: src/libslic3r/PrintConfig.cpp:1012
+#: src/libslic3r/PrintConfig.cpp:1036
msgid "Infill/perimeters overlap"
msgstr "Sobreposição de preenchimento/perímetros"
-#: src/libslic3r/PrintConfig.cpp:1014
+#: src/libslic3r/PrintConfig.cpp:1038
msgid ""
"This setting applies an additional overlap between infill and perimeters for "
"better bonding. Theoretically this shouldn't be needed, but backlash might "
@@ -7038,24 +8328,24 @@ msgstr ""
"porcentagem(exemplo: 15%) é calculado sobre a largura da extrusão do "
"perímetro."
-#: src/libslic3r/PrintConfig.cpp:1025
+#: src/libslic3r/PrintConfig.cpp:1049
msgid "Speed for printing the internal fill. Set to zero for auto."
msgstr ""
"Velocidade para imprimir o preenchimento interno. Defina como zero para auto."
-#: src/libslic3r/PrintConfig.cpp:1033
+#: src/libslic3r/PrintConfig.cpp:1057
msgid "Inherits profile"
msgstr "Herda o perfil"
-#: src/libslic3r/PrintConfig.cpp:1034
+#: src/libslic3r/PrintConfig.cpp:1058
msgid "Name of the profile, from which this profile inherits."
msgstr "Nome do perfil, a partir do qual este perfil herda."
-#: src/libslic3r/PrintConfig.cpp:1047
+#: src/libslic3r/PrintConfig.cpp:1071
msgid "Interface shells"
msgstr "Interface dos perímetros externos."
-#: src/libslic3r/PrintConfig.cpp:1048
+#: src/libslic3r/PrintConfig.cpp:1072
msgid ""
"Force the generation of solid shells between adjacent materials/volumes. "
"Useful for multi-extruder prints with translucent materials or manual "
@@ -7065,7 +8355,7 @@ msgstr ""
"adjacentes. Útil para cópias da multi-extrusora com materiais translúcidos "
"ou material de sustentação solúvel manual."
-#: src/libslic3r/PrintConfig.cpp:1057
+#: src/libslic3r/PrintConfig.cpp:1081
msgid ""
"This custom code is inserted at every layer change, right after the Z move "
"and before the extruder moves to the first layer point. Note that you can "
@@ -7077,11 +8367,11 @@ msgstr ""
"Observe que você pode usar variáveis de espaço reservado para todas as "
"config. Slic3r, bem como [layer_num] e [layer_z]."
-#: src/libslic3r/PrintConfig.cpp:1068
+#: src/libslic3r/PrintConfig.cpp:1092
msgid "Supports remaining times"
msgstr "Tempo de impressão restante"
-#: src/libslic3r/PrintConfig.cpp:1069
+#: src/libslic3r/PrintConfig.cpp:1093
msgid ""
"Emit M73 P[percent printed] R[remaining time in minutes] at 1 minute "
"intervals into the G-code to let the firmware show accurate remaining time. "
@@ -7094,152 +8384,152 @@ msgstr ""
"M73. Além disso, o firmware i3 MK3 suporta M73 QXX Sxx para o modo "
"silencioso."
-#: src/libslic3r/PrintConfig.cpp:1077
+#: src/libslic3r/PrintConfig.cpp:1101
msgid "Supports stealth mode"
msgstr "Suporta o modo silencioso"
-#: src/libslic3r/PrintConfig.cpp:1078
+#: src/libslic3r/PrintConfig.cpp:1102
msgid "The firmware supports stealth mode"
msgstr "O firmware suporta o modo silencioso"
-#: src/libslic3r/PrintConfig.cpp:1102
+#: src/libslic3r/PrintConfig.cpp:1125
msgid "Maximum feedrate X"
msgstr "Máxima taxa de alimentação do X"
-#: src/libslic3r/PrintConfig.cpp:1103
+#: src/libslic3r/PrintConfig.cpp:1126
msgid "Maximum feedrate Y"
msgstr "Máxima taxa de alimentação do Y"
-#: src/libslic3r/PrintConfig.cpp:1104
+#: src/libslic3r/PrintConfig.cpp:1127
msgid "Maximum feedrate Z"
msgstr "Máxima taxa de alimentação do Z"
-#: src/libslic3r/PrintConfig.cpp:1105
+#: src/libslic3r/PrintConfig.cpp:1128
msgid "Maximum feedrate E"
msgstr "Máxima taxa de alimentação do E"
-#: src/libslic3r/PrintConfig.cpp:1108
+#: src/libslic3r/PrintConfig.cpp:1131
msgid "Maximum feedrate of the X axis"
msgstr "Máxima taxa de alimentação do eixo X"
-#: src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1132
msgid "Maximum feedrate of the Y axis"
msgstr "Máxima taxa de alimentação do eixo Y"
-#: src/libslic3r/PrintConfig.cpp:1110
+#: src/libslic3r/PrintConfig.cpp:1133
msgid "Maximum feedrate of the Z axis"
msgstr "Máxima taxa de alimentação do eixo Z"
-#: src/libslic3r/PrintConfig.cpp:1111
+#: src/libslic3r/PrintConfig.cpp:1134
msgid "Maximum feedrate of the E axis"
msgstr "Máxima taxa de alimentação do eixo E"
-#: src/libslic3r/PrintConfig.cpp:1120
+#: src/libslic3r/PrintConfig.cpp:1142
msgid "Maximum acceleration X"
msgstr "Aceleração máxima do X"
-#: src/libslic3r/PrintConfig.cpp:1121
+#: src/libslic3r/PrintConfig.cpp:1143
msgid "Maximum acceleration Y"
msgstr "Aceleração máxima do Y"
-#: src/libslic3r/PrintConfig.cpp:1122
+#: src/libslic3r/PrintConfig.cpp:1144
msgid "Maximum acceleration Z"
msgstr "Aceleração máxima do Z"
-#: src/libslic3r/PrintConfig.cpp:1123
+#: src/libslic3r/PrintConfig.cpp:1145
msgid "Maximum acceleration E"
msgstr "Aceleração máxima do E"
-#: src/libslic3r/PrintConfig.cpp:1126
+#: src/libslic3r/PrintConfig.cpp:1148
msgid "Maximum acceleration of the X axis"
msgstr "Aceleração máxima do eixo X"
-#: src/libslic3r/PrintConfig.cpp:1127
+#: src/libslic3r/PrintConfig.cpp:1149
msgid "Maximum acceleration of the Y axis"
msgstr "Aceleração máxima do eixo Y"
-#: src/libslic3r/PrintConfig.cpp:1128
+#: src/libslic3r/PrintConfig.cpp:1150
msgid "Maximum acceleration of the Z axis"
msgstr "Aceleração máxima do eixo Z"
-#: src/libslic3r/PrintConfig.cpp:1129
+#: src/libslic3r/PrintConfig.cpp:1151
msgid "Maximum acceleration of the E axis"
msgstr "Aceleração máxima do eixo E"
-#: src/libslic3r/PrintConfig.cpp:1138
+#: src/libslic3r/PrintConfig.cpp:1159
msgid "Maximum jerk X"
msgstr "Máximo empurrão X"
-#: src/libslic3r/PrintConfig.cpp:1139
+#: src/libslic3r/PrintConfig.cpp:1160
msgid "Maximum jerk Y"
msgstr "Máximo empurrão Y"
-#: src/libslic3r/PrintConfig.cpp:1140
+#: src/libslic3r/PrintConfig.cpp:1161
msgid "Maximum jerk Z"
msgstr "Máximo empurrão Z"
-#: src/libslic3r/PrintConfig.cpp:1141
+#: src/libslic3r/PrintConfig.cpp:1162
msgid "Maximum jerk E"
msgstr "Máximo empurrão E"
-#: src/libslic3r/PrintConfig.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:1165
msgid "Maximum jerk of the X axis"
msgstr "Máximo empurrão do eixo X"
-#: src/libslic3r/PrintConfig.cpp:1145
+#: src/libslic3r/PrintConfig.cpp:1166
msgid "Maximum jerk of the Y axis"
msgstr "Máximo empurrão do eixo Y"
-#: src/libslic3r/PrintConfig.cpp:1146
+#: src/libslic3r/PrintConfig.cpp:1167
msgid "Maximum jerk of the Z axis"
msgstr "Máximo empurrão do eixo Z"
-#: src/libslic3r/PrintConfig.cpp:1147
+#: src/libslic3r/PrintConfig.cpp:1168
msgid "Maximum jerk of the E axis"
msgstr "Máximo empurrão do eixo E"
-#: src/libslic3r/PrintConfig.cpp:1158
+#: src/libslic3r/PrintConfig.cpp:1178
msgid "Minimum feedrate when extruding"
msgstr "Taxa de alimentação mínima ao extrudar"
-#: src/libslic3r/PrintConfig.cpp:1160
+#: src/libslic3r/PrintConfig.cpp:1180
msgid "Minimum feedrate when extruding (M205 S)"
msgstr "Taxa de alimentação mínima ao extrudar (M205 S)"
-#: src/libslic3r/PrintConfig.cpp:1169
+#: src/libslic3r/PrintConfig.cpp:1188
msgid "Minimum travel feedrate"
msgstr "Taxa de alimentação mínima ao viajar"
-#: src/libslic3r/PrintConfig.cpp:1171
+#: src/libslic3r/PrintConfig.cpp:1190
msgid "Minimum travel feedrate (M205 T)"
msgstr "Taxa de alimentação mínima ao viajar (M205 T)"
-#: src/libslic3r/PrintConfig.cpp:1180
+#: src/libslic3r/PrintConfig.cpp:1198
msgid "Maximum acceleration when extruding"
msgstr "Aceleração máxima quando expurgando"
-#: src/libslic3r/PrintConfig.cpp:1182
+#: src/libslic3r/PrintConfig.cpp:1200
msgid "Maximum acceleration when extruding (M204 S)"
msgstr "Aceleração máxima quando extrudando (M204 S)"
-#: src/libslic3r/PrintConfig.cpp:1191
+#: src/libslic3r/PrintConfig.cpp:1208
msgid "Maximum acceleration when retracting"
msgstr "Aceleração máxima durante a retração"
-#: src/libslic3r/PrintConfig.cpp:1193
+#: src/libslic3r/PrintConfig.cpp:1210
msgid "Maximum acceleration when retracting (M204 T)"
msgstr "Aceleração máxima quando retração (M204 T)"
-#: src/libslic3r/PrintConfig.cpp:1201 src/libslic3r/PrintConfig.cpp:1210
+#: src/libslic3r/PrintConfig.cpp:1217 src/libslic3r/PrintConfig.cpp:1226
msgid "Max"
msgstr "Máx"
-#: src/libslic3r/PrintConfig.cpp:1202
+#: src/libslic3r/PrintConfig.cpp:1218
msgid "This setting represents the maximum speed of your fan."
msgstr "Esta config. representa a velocidade máxima da sua ventoinha."
-#: src/libslic3r/PrintConfig.cpp:1211
-#, c-format
+#: src/libslic3r/PrintConfig.cpp:1227
+#, no-c-format
msgid ""
"This is the highest printable layer height for this extruder, used to cap "
"the variable layer height and support layer height. Maximum recommended "
@@ -7252,11 +8542,11 @@ msgstr ""
"adesão razoável entre camadas. Se definido como 0, a altura da camada é "
"limitada a 75% o do diâmetro da ponteira."
-#: src/libslic3r/PrintConfig.cpp:1221
+#: src/libslic3r/PrintConfig.cpp:1237
msgid "Max print speed"
msgstr "Velocidade máxima de impressão"
-#: src/libslic3r/PrintConfig.cpp:1222
+#: src/libslic3r/PrintConfig.cpp:1238
msgid ""
"When setting other speed settings to 0 Slic3r will autocalculate the optimal "
"speed in order to keep constant extruder pressure. This experimental setting "
@@ -7267,7 +8557,7 @@ msgstr ""
"extrusora. Esta config. experimental é usada para definir a velocidade de "
"impressão mais alta que você deseja permitir."
-#: src/libslic3r/PrintConfig.cpp:1232
+#: src/libslic3r/PrintConfig.cpp:1248
msgid ""
"This experimental setting is used to set the maximum volumetric speed your "
"extruder supports."
@@ -7275,11 +8565,11 @@ msgstr ""
"Esta config. experimental é usada para definir a velocidade máxima "
"volumétrica que sua extrusora suporta."
-#: src/libslic3r/PrintConfig.cpp:1241
+#: src/libslic3r/PrintConfig.cpp:1257
msgid "Max volumetric slope positive"
msgstr "Inclinação volumétrica máx positiva"
-#: src/libslic3r/PrintConfig.cpp:1242 src/libslic3r/PrintConfig.cpp:1253
+#: src/libslic3r/PrintConfig.cpp:1258 src/libslic3r/PrintConfig.cpp:1269
msgid ""
"This experimental setting is used to limit the speed of change in extrusion "
"rate. A value of 1.8 mm³/s² ensures, that a change from the extrusion rate "
@@ -7292,25 +8582,25 @@ msgstr ""
"extrusão de 0,2 mm, avanço de 20 mm/s) para 5,4 mm ³/s (avanço 60 mm/s) "
"levará pelo menos 2 segundos."
-#: src/libslic3r/PrintConfig.cpp:1246 src/libslic3r/PrintConfig.cpp:1257
+#: src/libslic3r/PrintConfig.cpp:1262 src/libslic3r/PrintConfig.cpp:1273
msgid "mm³/s²"
msgstr "mm ³/s ²"
-#: src/libslic3r/PrintConfig.cpp:1252
+#: src/libslic3r/PrintConfig.cpp:1268
msgid "Max volumetric slope negative"
msgstr "Inclinação volumétrica máx negativa"
-#: src/libslic3r/PrintConfig.cpp:1264 src/libslic3r/PrintConfig.cpp:1273
+#: src/libslic3r/PrintConfig.cpp:1280 src/libslic3r/PrintConfig.cpp:1289
msgid "Min"
msgstr "Min"
-#: src/libslic3r/PrintConfig.cpp:1265
+#: src/libslic3r/PrintConfig.cpp:1281
msgid "This setting represents the minimum PWM your fan needs to work."
msgstr ""
"Esta config. representa o PWM mínimo que seu ventoinha precisa para "
"trabalhar."
-#: src/libslic3r/PrintConfig.cpp:1274
+#: src/libslic3r/PrintConfig.cpp:1290
msgid ""
"This is the lowest printable layer height for this extruder and limits the "
"resolution for variable layer height. Typical values are between 0.05 mm and "
@@ -7320,19 +8610,19 @@ msgstr ""
"definição para a altura variável da camada. Os valores típicos são entre 0, "
"5 mm e 0,1 mm."
-#: src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1298
msgid "Min print speed"
msgstr "Velocidade mínima de impressão"
-#: src/libslic3r/PrintConfig.cpp:1283
+#: src/libslic3r/PrintConfig.cpp:1299
msgid "Slic3r will not scale speed down below this speed."
msgstr "Slic3r não vai escalar a velocidade abaixo desta velocidade."
-#: src/libslic3r/PrintConfig.cpp:1290
+#: src/libslic3r/PrintConfig.cpp:1306
msgid "Minimal filament extrusion length"
msgstr "Comprimento mínimo da extrusão do filamento"
-#: src/libslic3r/PrintConfig.cpp:1291
+#: src/libslic3r/PrintConfig.cpp:1307
msgid ""
"Generate no less than the number of skirt loops required to consume the "
"specified amount of filament on the bottom layer. For multi-extruder "
@@ -7342,11 +8632,11 @@ msgstr ""
"a quantidade especificada de filamento na camada inferior. Para máquinas "
"multiextrusoras, este mínimo aplica-se a cada extrusora."
-#: src/libslic3r/PrintConfig.cpp:1300
+#: src/libslic3r/PrintConfig.cpp:1316
msgid "Configuration notes"
msgstr "Notas de config."
-#: src/libslic3r/PrintConfig.cpp:1301
+#: src/libslic3r/PrintConfig.cpp:1317
msgid ""
"You can put here your personal notes. This text will be added to the G-code "
"header comments."
@@ -7354,17 +8644,17 @@ msgstr ""
"Você pode colocar aqui suas anotações pessoais. Este texto será adicionado "
"aos comentários do cabeçalho do G-code."
-#: src/libslic3r/PrintConfig.cpp:1311
+#: src/libslic3r/PrintConfig.cpp:1327
msgid ""
"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
msgstr ""
"Este é o diâmetro da ponteira da extrusora (por exemplo: 0.5, 0.35 etc.)"
-#: src/libslic3r/PrintConfig.cpp:1316
+#: src/libslic3r/PrintConfig.cpp:1332
msgid "Host Type"
msgstr "Tipo de host"
-#: src/libslic3r/PrintConfig.cpp:1317
+#: src/libslic3r/PrintConfig.cpp:1333
msgid ""
"Slic3r can upload G-code files to a printer host. This field must contain "
"the kind of the host."
@@ -7372,11 +8662,11 @@ msgstr ""
"Slic3r pode carregar arquivos de G-code para um host de impressora. Este "
"campo deve conter o tipo do host."
-#: src/libslic3r/PrintConfig.cpp:1328
+#: src/libslic3r/PrintConfig.cpp:1348
msgid "Only retract when crossing perimeters"
msgstr "Apenas retrair quando cruzar perímetros"
-#: src/libslic3r/PrintConfig.cpp:1329
+#: src/libslic3r/PrintConfig.cpp:1349
msgid ""
"Disables retraction when the travel path does not exceed the upper layer's "
"perimeters (and thus any ooze will be probably invisible)."
@@ -7385,7 +8675,7 @@ msgstr ""
"camada superior (e, portanto, qualquer escorrimento será provavelmente "
"invisível)."
-#: src/libslic3r/PrintConfig.cpp:1336
+#: src/libslic3r/PrintConfig.cpp:1356
msgid ""
"This option will drop the temperature of the inactive extruders to prevent "
"oozing. It will enable a tall skirt automatically and move extruders outside "
@@ -7395,11 +8685,11 @@ msgstr ""
"escorrimento. Ele vai permitir uma saia alta automaticamente e mover "
"extrusoras fora de tal saia quando a mudança de temperatura."
-#: src/libslic3r/PrintConfig.cpp:1343
+#: src/libslic3r/PrintConfig.cpp:1363
msgid "Output filename format"
msgstr "Formato de nome de arquivo de saída"
-#: src/libslic3r/PrintConfig.cpp:1344
+#: src/libslic3r/PrintConfig.cpp:1364
msgid ""
"You can use all configuration options as variables inside this template. For "
"example: [layer_height], [fill_density] etc. You can also use [timestamp], "
@@ -7411,11 +8701,11 @@ msgstr ""
"também pode usar [tempo], [ano], [mês], [dia], [hora], [minuto], [segundo], "
"[versão], [nome_entrada], [nome_entrada_base]."
-#: src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1373
msgid "Detect bridging perimeters"
msgstr "Detectar perímetros de ponte"
-#: src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:1375
msgid ""
"Experimental option to adjust flow for overhangs (bridge flow will be used), "
"to apply bridge speed to them and enable fan."
@@ -7424,11 +8714,11 @@ msgstr ""
"será usado), para aplicar a velocidade da ponte a eles e para habilitar a "
"ventoinha."
-#: src/libslic3r/PrintConfig.cpp:1361
+#: src/libslic3r/PrintConfig.cpp:1381
msgid "Filament parking position"
msgstr "Posição de estacionamento do filamento"
-#: src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1382
msgid ""
"Distance of the extruder tip from the position where the filament is parked "
"when unloaded. This should match the value in printer firmware."
@@ -7437,11 +8727,11 @@ msgstr ""
"quando descarregado. Isso deve corresponder ao valor no firmware da "
"impressora."
-#: src/libslic3r/PrintConfig.cpp:1370
+#: src/libslic3r/PrintConfig.cpp:1390
msgid "Extra loading distance"
msgstr "Distância de carregamento extra"
-#: src/libslic3r/PrintConfig.cpp:1371
+#: src/libslic3r/PrintConfig.cpp:1391
msgid ""
"When set to zero, the distance the filament is moved from parking position "
"during load is exactly the same as it was moved back during unload. When "
@@ -7453,12 +8743,12 @@ msgstr ""
"durante o descarregamento. Quando positivo, ele é carregado ainda mais, se "
"negativo, o movimento de carga é menor do que o descarregamento."
-#: src/libslic3r/PrintConfig.cpp:1379 src/libslic3r/PrintConfig.cpp:1397
-#: src/libslic3r/PrintConfig.cpp:1409 src/libslic3r/PrintConfig.cpp:1419
+#: src/libslic3r/PrintConfig.cpp:1399 src/libslic3r/PrintConfig.cpp:1417
+#: src/libslic3r/PrintConfig.cpp:1430 src/libslic3r/PrintConfig.cpp:1440
msgid "Perimeters"
msgstr "Perímetros"
-#: src/libslic3r/PrintConfig.cpp:1380
+#: src/libslic3r/PrintConfig.cpp:1400
msgid ""
"This is the acceleration your printer will use for perimeters. A high value "
"like 9000 usually gives good results if your hardware is up to the job. Set "
@@ -7468,17 +8758,17 @@ msgstr ""
"como 9000 geralmente dá bons resultados se o seu hardware suporta. Defina "
"zero para desabilitar o controle de aceleração para perímetros."
-#: src/libslic3r/PrintConfig.cpp:1388
+#: src/libslic3r/PrintConfig.cpp:1408
msgid "Perimeter extruder"
msgstr "Extrusora de perímetro"
-#: src/libslic3r/PrintConfig.cpp:1390
+#: src/libslic3r/PrintConfig.cpp:1410
msgid ""
"The extruder to use when printing perimeters and brim. First extruder is 1."
msgstr ""
"A extrusora para usar ao imprimir perímetros e aba. A primeira extrusora é 1."
-#: src/libslic3r/PrintConfig.cpp:1399
+#: src/libslic3r/PrintConfig.cpp:1419
msgid ""
"Set this to a non-zero value to set a manual extrusion width for perimeters. "
"You may want to use thinner extrudates to get more accurate surfaces. If "
@@ -7493,14 +8783,14 @@ msgstr ""
"ponteira será usado. Se expresso em porcentagem(por exemplo, 200%) Ele será "
"calculado sobre a altura da camada."
-#: src/libslic3r/PrintConfig.cpp:1411
+#: src/libslic3r/PrintConfig.cpp:1432
msgid ""
"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
msgstr ""
"Velocidade para perímetros (contornos, também chamadas de perímetros "
"externos verticais). Defina como zero para auto."
-#: src/libslic3r/PrintConfig.cpp:1421
+#: src/libslic3r/PrintConfig.cpp:1442
msgid ""
"This option sets the number of perimeters to generate for each layer. Note "
"that Slic3r may increase this number automatically when it detects sloping "
@@ -7512,11 +8802,11 @@ msgstr ""
"superfícies inclinadas que se beneficiam de um número maior de perímetros se "
"a opção extra perímetros estiver habilitada."
-#: src/libslic3r/PrintConfig.cpp:1425
+#: src/libslic3r/PrintConfig.cpp:1446
msgid "(minimum)"
msgstr "(mínimo)"
-#: src/libslic3r/PrintConfig.cpp:1433
+#: src/libslic3r/PrintConfig.cpp:1454
msgid ""
"If you want to process the output G-code through custom scripts, just list "
"their absolute paths here. Separate multiple scripts with a semicolon. "
@@ -7530,35 +8820,35 @@ msgstr ""
"para o arquivo de G-code como o primeiro argumento, e eles poderão acessar "
"as config. de config. do Slic3r lendo variáveis de ambiente."
-#: src/libslic3r/PrintConfig.cpp:1445
+#: src/libslic3r/PrintConfig.cpp:1466
msgid "Printer type"
msgstr "Tipo de impressora"
-#: src/libslic3r/PrintConfig.cpp:1446
+#: src/libslic3r/PrintConfig.cpp:1467
msgid "Type of the printer."
msgstr "Tipo da impressora."
-#: src/libslic3r/PrintConfig.cpp:1451
+#: src/libslic3r/PrintConfig.cpp:1472
msgid "Printer notes"
msgstr "Notas da impressora"
-#: src/libslic3r/PrintConfig.cpp:1452
+#: src/libslic3r/PrintConfig.cpp:1473
msgid "You can put your notes regarding the printer here."
msgstr "Você pode colocar suas anotações sobre a impressora aqui."
-#: src/libslic3r/PrintConfig.cpp:1460
+#: src/libslic3r/PrintConfig.cpp:1481
msgid "Printer vendor"
msgstr "Fornecedor da impressora"
-#: src/libslic3r/PrintConfig.cpp:1461
+#: src/libslic3r/PrintConfig.cpp:1482
msgid "Name of the printer vendor."
msgstr "Nome do fornecedor da impressora."
-#: src/libslic3r/PrintConfig.cpp:1466
+#: src/libslic3r/PrintConfig.cpp:1487
msgid "Printer variant"
msgstr "Variante da impressora"
-#: src/libslic3r/PrintConfig.cpp:1467
+#: src/libslic3r/PrintConfig.cpp:1488
msgid ""
"Name of the printer variant. For example, the printer variants may be "
"differentiated by a nozzle diameter."
@@ -7566,11 +8856,11 @@ msgstr ""
"Nome da variante da impressora. Por exemplo, as variantes da impressora "
"podem ser diferenciadas por um diâmetro da ponteira."
-#: src/libslic3r/PrintConfig.cpp:1480
+#: src/libslic3r/PrintConfig.cpp:1501
msgid "Raft layers"
msgstr "Camadas da estrado"
-#: src/libslic3r/PrintConfig.cpp:1482
+#: src/libslic3r/PrintConfig.cpp:1503
msgid ""
"The object will be raised by this number of layers, and support material "
"will be generated under it."
@@ -7578,11 +8868,11 @@ msgstr ""
"O objeto será elevado por este número de camadas, e o material de suporte "
"será gerado em baixo dele."
-#: src/libslic3r/PrintConfig.cpp:1490
+#: src/libslic3r/PrintConfig.cpp:1511
msgid "Resolution"
msgstr "Resolução"
-#: src/libslic3r/PrintConfig.cpp:1491
+#: src/libslic3r/PrintConfig.cpp:1512
msgid ""
"Minimum detail resolution, used to simplify the input file for speeding up "
"the slicing job and reducing memory usage. High-resolution models often "
@@ -7595,22 +8885,22 @@ msgstr ""
"podem renderizar. Defina como zero para desabilitar qualquer simplificação e "
"usar a resolução completa da entrada."
-#: src/libslic3r/PrintConfig.cpp:1501
+#: src/libslic3r/PrintConfig.cpp:1522
msgid "Minimum travel after retraction"
msgstr "Retração em viagens acima de"
-#: src/libslic3r/PrintConfig.cpp:1502
+#: src/libslic3r/PrintConfig.cpp:1523
msgid ""
"Retraction is not triggered when travel moves are shorter than this length."
msgstr ""
"A retração não é acionada quando os movimentos de viagem são mais curtos que "
"esse comprimento."
-#: src/libslic3r/PrintConfig.cpp:1508
+#: src/libslic3r/PrintConfig.cpp:1529
msgid "Retract amount before wipe"
msgstr "Quantidade de retração antes da limpeza"
-#: src/libslic3r/PrintConfig.cpp:1509
+#: src/libslic3r/PrintConfig.cpp:1530
msgid ""
"With bowden extruders, it may be wise to do some amount of quick retract "
"before doing the wipe movement."
@@ -7618,23 +8908,23 @@ msgstr ""
"Com extrusoras Bowden, pode ser sábio fazer alguma quantidade de retração "
"rápida antes de fazer o movimento da limpeza."
-#: src/libslic3r/PrintConfig.cpp:1516
+#: src/libslic3r/PrintConfig.cpp:1537
msgid "Retract on layer change"
msgstr "Retrair na mudança de camada"
-#: src/libslic3r/PrintConfig.cpp:1517
+#: src/libslic3r/PrintConfig.cpp:1538
msgid "This flag enforces a retraction whenever a Z move is done."
msgstr "Este sinalizador impõe uma retração sempre que um movimento Z é feito."
-#: src/libslic3r/PrintConfig.cpp:1522 src/libslic3r/PrintConfig.cpp:1530
+#: src/libslic3r/PrintConfig.cpp:1543 src/libslic3r/PrintConfig.cpp:1551
msgid "Length"
msgstr "Comprimento"
-#: src/libslic3r/PrintConfig.cpp:1523
+#: src/libslic3r/PrintConfig.cpp:1544
msgid "Retraction Length"
msgstr "Comprimento de retração"
-#: src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1545
msgid ""
"When retraction is triggered, filament is pulled back by the specified "
"amount (the length is measured on raw filament, before it enters the "
@@ -7644,15 +8934,15 @@ msgstr ""
"especificada (o comprimento é medido em filamento cru, antes de entrar na "
"extrusora)."
-#: src/libslic3r/PrintConfig.cpp:1526 src/libslic3r/PrintConfig.cpp:1535
+#: src/libslic3r/PrintConfig.cpp:1547 src/libslic3r/PrintConfig.cpp:1556
msgid "mm (zero to disable)"
msgstr "mm (zero para desativar)"
-#: src/libslic3r/PrintConfig.cpp:1531
+#: src/libslic3r/PrintConfig.cpp:1552
msgid "Retraction Length (Toolchange)"
msgstr "Comprimento de retração (mudança de ferramenta)"
-#: src/libslic3r/PrintConfig.cpp:1532
+#: src/libslic3r/PrintConfig.cpp:1553
msgid ""
"When retraction is triggered before changing tool, filament is pulled back "
"by the specified amount (the length is measured on raw filament, before it "
@@ -7662,11 +8952,11 @@ msgstr ""
"puxado para trás pela quantidade especificada (o comprimento é medido em "
"filamento cru, antes de entrar na extrusora)."
-#: src/libslic3r/PrintConfig.cpp:1540
+#: src/libslic3r/PrintConfig.cpp:1561
msgid "Lift Z"
msgstr "Elevar Z"
-#: src/libslic3r/PrintConfig.cpp:1541
+#: src/libslic3r/PrintConfig.cpp:1562
msgid ""
"If you set this to a positive value, Z is quickly raised every time a "
"retraction is triggered. When using multiple extruders, only the setting for "
@@ -7676,15 +8966,15 @@ msgstr ""
"que uma retração é acionada. Ao usar várias extrusoras, somente a config. "
"para a primeira extrusora será considerada."
-#: src/libslic3r/PrintConfig.cpp:1548
+#: src/libslic3r/PrintConfig.cpp:1569
msgid "Above Z"
msgstr "Acima de Z"
-#: src/libslic3r/PrintConfig.cpp:1549
+#: src/libslic3r/PrintConfig.cpp:1570
msgid "Only lift Z above"
msgstr "Apenas elevar Z acima"
-#: src/libslic3r/PrintConfig.cpp:1550
+#: src/libslic3r/PrintConfig.cpp:1571
msgid ""
"If you set this to a positive value, Z lift will only take place above the "
"specified absolute Z. You can tune this setting for skipping lift on the "
@@ -7694,15 +8984,15 @@ msgstr ""
"acima do Z absoluto especificado. Você pode ajustar essa config. para pular "
"o elevador nas primeiras camadas."
-#: src/libslic3r/PrintConfig.cpp:1557
+#: src/libslic3r/PrintConfig.cpp:1578
msgid "Below Z"
msgstr "Abaixo de Z"
-#: src/libslic3r/PrintConfig.cpp:1558
+#: src/libslic3r/PrintConfig.cpp:1579
msgid "Only lift Z below"
msgstr "Apenas elevar Z abaixo"
-#: src/libslic3r/PrintConfig.cpp:1559
+#: src/libslic3r/PrintConfig.cpp:1580
msgid ""
"If you set this to a positive value, Z lift will only take place below the "
"specified absolute Z. You can tune this setting for limiting lift to the "
@@ -7712,11 +9002,11 @@ msgstr ""
"abaixo do Z absoluto especificado. Você pode ajustar essa config. para "
"limitar a elevação às primeiras camadas."
-#: src/libslic3r/PrintConfig.cpp:1567 src/libslic3r/PrintConfig.cpp:1575
+#: src/libslic3r/PrintConfig.cpp:1588 src/libslic3r/PrintConfig.cpp:1596
msgid "Extra length on restart"
msgstr "Comprimento extra no reinício"
-#: src/libslic3r/PrintConfig.cpp:1568
+#: src/libslic3r/PrintConfig.cpp:1589
msgid ""
"When the retraction is compensated after the travel move, the extruder will "
"push this additional amount of filament. This setting is rarely needed."
@@ -7725,7 +9015,7 @@ msgstr ""
"empurrar esta quantidade adicional de filamento. Essa config. raramente é "
"necessária."
-#: src/libslic3r/PrintConfig.cpp:1576
+#: src/libslic3r/PrintConfig.cpp:1597
msgid ""
"When the retraction is compensated after changing tool, the extruder will "
"push this additional amount of filament."
@@ -7733,19 +9023,19 @@ msgstr ""
"Quando a retração é compensada após a ferramenta de mudança, a extrusora "
"empurrará esta quantidade adicional de filamento."
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1584
+#: src/libslic3r/PrintConfig.cpp:1604 src/libslic3r/PrintConfig.cpp:1605
msgid "Retraction Speed"
msgstr "Velocidade da retração"
-#: src/libslic3r/PrintConfig.cpp:1585
+#: src/libslic3r/PrintConfig.cpp:1606
msgid "The speed for retractions (it only applies to the extruder motor)."
msgstr "A velocidade para retrações (aplica-se somente ao motor da extrusora)."
-#: src/libslic3r/PrintConfig.cpp:1591 src/libslic3r/PrintConfig.cpp:1592
+#: src/libslic3r/PrintConfig.cpp:1612 src/libslic3r/PrintConfig.cpp:1613
msgid "Deretraction Speed"
msgstr "Velocidade de retorno de retração"
-#: src/libslic3r/PrintConfig.cpp:1593
+#: src/libslic3r/PrintConfig.cpp:1614
msgid ""
"The speed for loading of a filament into extruder after retraction (it only "
"applies to the extruder motor). If left to zero, the retraction speed is "
@@ -7755,67 +9045,67 @@ msgstr ""
"retração (aplica-se somente ao motor da extrusora). Se deixada como zero, a "
"velocidade de retração é usada."
-#: src/libslic3r/PrintConfig.cpp:1600
+#: src/libslic3r/PrintConfig.cpp:1621
msgid "Seam position"
msgstr "Posição da costura"
-#: src/libslic3r/PrintConfig.cpp:1602
+#: src/libslic3r/PrintConfig.cpp:1623
msgid "Position of perimeters starting points."
msgstr "Posição inicial dos pontos do perímetro."
-#: src/libslic3r/PrintConfig.cpp:1608
+#: src/libslic3r/PrintConfig.cpp:1629
msgid "Random"
msgstr "Aleatório"
-#: src/libslic3r/PrintConfig.cpp:1609
+#: src/libslic3r/PrintConfig.cpp:1630
msgid "Nearest"
msgstr "Próximo"
-#: src/libslic3r/PrintConfig.cpp:1610
+#: src/libslic3r/PrintConfig.cpp:1631
msgid "Aligned"
msgstr "Alinhado(a)"
-#: src/libslic3r/PrintConfig.cpp:1618
+#: src/libslic3r/PrintConfig.cpp:1639
msgid "Direction"
msgstr "Direção"
-#: src/libslic3r/PrintConfig.cpp:1620
+#: src/libslic3r/PrintConfig.cpp:1641
msgid "Preferred direction of the seam"
msgstr "Direção preferida da costura"
-#: src/libslic3r/PrintConfig.cpp:1621
+#: src/libslic3r/PrintConfig.cpp:1642
msgid "Seam preferred direction"
msgstr "Direção de preferência da costura"
-#: src/libslic3r/PrintConfig.cpp:1628
+#: src/libslic3r/PrintConfig.cpp:1649
msgid "Jitter"
msgstr "Jitter"
-#: src/libslic3r/PrintConfig.cpp:1630
+#: src/libslic3r/PrintConfig.cpp:1651
msgid "Seam preferred direction jitter"
msgstr "Direção da costura preferencial para Jitter"
-#: src/libslic3r/PrintConfig.cpp:1631
+#: src/libslic3r/PrintConfig.cpp:1652
msgid "Preferred direction of the seam - jitter"
msgstr "Direção preferida da costura-jitter"
-#: src/libslic3r/PrintConfig.cpp:1641
+#: src/libslic3r/PrintConfig.cpp:1662
msgid "USB/serial port for printer connection."
msgstr "USB/porta serial para conexão da impressora."
-#: src/libslic3r/PrintConfig.cpp:1648
+#: src/libslic3r/PrintConfig.cpp:1669
msgid "Serial port speed"
msgstr "Velocidade da porta serial"
-#: src/libslic3r/PrintConfig.cpp:1649
+#: src/libslic3r/PrintConfig.cpp:1670
msgid "Speed (baud) of USB/serial port for printer connection."
msgstr "Velocidade (baud) do USB/porta serial para conexão da impressora."
-#: src/libslic3r/PrintConfig.cpp:1658
+#: src/libslic3r/PrintConfig.cpp:1679
msgid "Distance from object"
msgstr "Distância do objeto"
-#: src/libslic3r/PrintConfig.cpp:1659
+#: src/libslic3r/PrintConfig.cpp:1680
msgid ""
"Distance between skirt and object(s). Set this to zero to attach the skirt "
"to the object(s) and get a brim for better adhesion."
@@ -7823,11 +9113,11 @@ msgstr ""
"Distância entre a saia e o objeto (s). Defina isso como zero para anexar a "
"saia para o objeto (s) e obter uma aba para uma melhor aderência."
-#: src/libslic3r/PrintConfig.cpp:1666
+#: src/libslic3r/PrintConfig.cpp:1687
msgid "Skirt height"
msgstr "Altura da saia"
-#: src/libslic3r/PrintConfig.cpp:1667
+#: src/libslic3r/PrintConfig.cpp:1688
msgid ""
"Height of skirt expressed in layers. Set this to a tall value to use skirt "
"as a shield against drafts."
@@ -7835,15 +9125,15 @@ msgstr ""
"Altura da saia expressa em camadas. Defina isso como um valor alto para usar "
"a saia como um escudo contra rascunhos."
-#: src/libslic3r/PrintConfig.cpp:1674
+#: src/libslic3r/PrintConfig.cpp:1695
msgid "Loops (minimum)"
msgstr "Voltas (mínimo)"
-#: src/libslic3r/PrintConfig.cpp:1675
+#: src/libslic3r/PrintConfig.cpp:1696
msgid "Skirt Loops"
msgstr "Voltas de saia"
-#: src/libslic3r/PrintConfig.cpp:1676
+#: src/libslic3r/PrintConfig.cpp:1697
msgid ""
"Number of loops for the skirt. If the Minimum Extrusion Length option is "
"set, the number of loops might be greater than the one configured here. Set "
@@ -7854,11 +9144,11 @@ msgstr ""
"configurado aqui. Defina isso como zero para desabilitar a saia "
"completamente."
-#: src/libslic3r/PrintConfig.cpp:1684
+#: src/libslic3r/PrintConfig.cpp:1705
msgid "Slow down if layer print time is below"
msgstr "Diminuir a velocidade quando o tempo de impressão for menor que"
-#: src/libslic3r/PrintConfig.cpp:1685
+#: src/libslic3r/PrintConfig.cpp:1706
msgid ""
"If layer print time is estimated below this number of seconds, print moves "
"speed will be scaled down to extend duration to this value."
@@ -7867,11 +9157,11 @@ msgstr ""
"segundos, a velocidade de impressão será reduzida para estender a duração a "
"esse valor."
-#: src/libslic3r/PrintConfig.cpp:1695
+#: src/libslic3r/PrintConfig.cpp:1715
msgid "Small perimeters"
msgstr "Perímetro pequeno"
-#: src/libslic3r/PrintConfig.cpp:1697
+#: src/libslic3r/PrintConfig.cpp:1717
msgid ""
"This separate setting will affect the speed of perimeters having radius <= "
"6.5mm (usually holes). If expressed as percentage (for example: 80%) it will "
@@ -7882,11 +9172,11 @@ msgstr ""
"será calculado sobre a velocidade de perímetros configurados acima. Defina "
"como zero para auto."
-#: src/libslic3r/PrintConfig.cpp:1707
+#: src/libslic3r/PrintConfig.cpp:1727
msgid "Solid infill threshold area"
msgstr "Área de limiar de preenchimento sólido"
-#: src/libslic3r/PrintConfig.cpp:1709
+#: src/libslic3r/PrintConfig.cpp:1729
msgid ""
"Force solid infill for regions having a smaller area than the specified "
"threshold."
@@ -7894,24 +9184,24 @@ msgstr ""
"Forçar preenchimento sólido para regiões com uma área menor do que o limite "
"especificado."
-#: src/libslic3r/PrintConfig.cpp:1710
+#: src/libslic3r/PrintConfig.cpp:1730
msgid "mm²"
msgstr "mm²"
-#: src/libslic3r/PrintConfig.cpp:1716
+#: src/libslic3r/PrintConfig.cpp:1736
msgid "Solid infill extruder"
msgstr "Extrusora de preenchimento sólido"
-#: src/libslic3r/PrintConfig.cpp:1718
+#: src/libslic3r/PrintConfig.cpp:1738
msgid "The extruder to use when printing solid infill."
msgstr ""
"A extrusora a ser utilizada quando estiver imprimindo preenchimento sólido."
-#: src/libslic3r/PrintConfig.cpp:1724
+#: src/libslic3r/PrintConfig.cpp:1744
msgid "Solid infill every"
msgstr "Preenchimento sólido a cada"
-#: src/libslic3r/PrintConfig.cpp:1726
+#: src/libslic3r/PrintConfig.cpp:1746
msgid ""
"This feature allows to force a solid layer every given number of layers. "
"Zero to disable. You can set this to any value (for example 9999); Slic3r "
@@ -7924,7 +9214,7 @@ msgstr ""
"possível de camadas para combinar de acordo com o diâmetro da ponteira e a "
"altura da camada."
-#: src/libslic3r/PrintConfig.cpp:1738
+#: src/libslic3r/PrintConfig.cpp:1758
msgid ""
"Set this to a non-zero value to set a manual extrusion width for infill for "
"solid surfaces. If left zero, default extrusion width will be used if set, "
@@ -7937,7 +9227,7 @@ msgstr ""
"1,125 x diâmetro da ponteira será usado. Se expresso em porcentagem(por "
"exemplo, 90%) Ele será calculado sobre a altura da camada."
-#: src/libslic3r/PrintConfig.cpp:1748
+#: src/libslic3r/PrintConfig.cpp:1769
msgid ""
"Speed for printing solid regions (top/bottom/internal horizontal shells). "
"This can be expressed as a percentage (for example: 80%) over the default "
@@ -7948,16 +9238,20 @@ msgstr ""
"80%) sobre a velocidade de preenchimento padrão acima. Defina como zero para "
"auto."
-#: src/libslic3r/PrintConfig.cpp:1760
+#: src/libslic3r/PrintConfig.cpp:1781
msgid "Number of solid layers to generate on top and bottom surfaces."
msgstr ""
"Número de camadas sólidas a serem geradas nas interfaces do topo e base."
-#: src/libslic3r/PrintConfig.cpp:1766
+#: src/libslic3r/PrintConfig.cpp:1787 src/libslic3r/PrintConfig.cpp:1788
+msgid "Minimum thickness of a top / bottom shell"
+msgstr "Espessura mínima de uma parede superior/inferior"
+
+#: src/libslic3r/PrintConfig.cpp:1794
msgid "Spiral vase"
msgstr "Vaso espiral"
-#: src/libslic3r/PrintConfig.cpp:1767
+#: src/libslic3r/PrintConfig.cpp:1795
msgid ""
"This feature will raise Z gradually while printing a single-walled object in "
"order to remove any visible seam. This option requires a single perimeter, "
@@ -7972,11 +9266,11 @@ msgstr ""
"camadas sólidas de fundo, bem como saia/aba voltas. Ele não funcionará ao "
"imprimir mais de um objeto."
-#: src/libslic3r/PrintConfig.cpp:1775
+#: src/libslic3r/PrintConfig.cpp:1803
msgid "Temperature variation"
msgstr "Variação de temperatura"
-#: src/libslic3r/PrintConfig.cpp:1776
+#: src/libslic3r/PrintConfig.cpp:1804
msgid ""
"Temperature difference to be applied when an extruder is not active. Enables "
"a full-height \"sacrificial\" skirt on which the nozzles are periodically "
@@ -7986,7 +9280,7 @@ msgstr ""
"Permite uma saia \"sacrificial\" em que as ponteiras são limpadas "
"periodicamente."
-#: src/libslic3r/PrintConfig.cpp:1786
+#: src/libslic3r/PrintConfig.cpp:1814
msgid ""
"This start procedure is inserted at the beginning, after bed has reached the "
"target temperature and extruder just started heating, and before extruder "
@@ -8006,7 +9300,7 @@ msgstr ""
"para que você possa colocar um comando \"M109 S "
"[temperatura_primeira_camada]\" onde quiser."
-#: src/libslic3r/PrintConfig.cpp:1801
+#: src/libslic3r/PrintConfig.cpp:1829
msgid ""
"This start procedure is inserted at the beginning, after any printer start "
"gcode (and after any toolchange to this filament in case of multi-material "
@@ -8030,19 +9324,19 @@ msgstr ""
"\"M109 S [temperatura_primeira_camada]\" onde quiser. Se você tiver várias "
"extrusoras, o Gcode é processado em ordem de extrusora."
-#: src/libslic3r/PrintConfig.cpp:1817
+#: src/libslic3r/PrintConfig.cpp:1845
msgid "Single Extruder Multi Material"
msgstr "Única extrusora multi material"
-#: src/libslic3r/PrintConfig.cpp:1818
+#: src/libslic3r/PrintConfig.cpp:1846
msgid "The printer multiplexes filaments into a single hot end."
msgstr "A impressora multiplexes filamentos em uma única extremidade quente."
-#: src/libslic3r/PrintConfig.cpp:1823
+#: src/libslic3r/PrintConfig.cpp:1851
msgid "Prime all printing extruders"
msgstr "Extrusar todas as extrusoras de impressão"
-#: src/libslic3r/PrintConfig.cpp:1824
+#: src/libslic3r/PrintConfig.cpp:1852
msgid ""
"If enabled, all printing extruders will be primed at the front edge of the "
"print bed at the start of the print."
@@ -8050,19 +9344,35 @@ msgstr ""
"Se ativada, todas as extrusoras de impressão extrusarão na aba dianteira da "
"mesa de impressão no início da impressão."
-#: src/libslic3r/PrintConfig.cpp:1829
+#: src/libslic3r/PrintConfig.cpp:1857
+msgid "No sparse layers (EXPERIMENTAL)"
+msgstr "Sem camadas esparsas (EXPERIMENTAL)"
+
+#: src/libslic3r/PrintConfig.cpp:1858
+msgid ""
+"If enabled, the wipe tower will not be printed on layers with no "
+"toolchanges. On layers with a toolchange, extruder will travel downward to "
+"print the wipe tower. User is responsible for ensuring there is no collision "
+"with the print."
+msgstr ""
+"Se ativada, a torre de limpeza não será impressa em camadas sem alterações "
+"de ferramentas. Em camadas com uma troca de ferramentas, o extrusor viajará "
+"para baixo para imprimir a torre de limpeza. O usuário é responsável por "
+"garantir que não haja colisão com a impressão."
+
+#: src/libslic3r/PrintConfig.cpp:1865
msgid "Generate support material"
msgstr "Gerar material de suporte"
-#: src/libslic3r/PrintConfig.cpp:1831
+#: src/libslic3r/PrintConfig.cpp:1867
msgid "Enable support material generation."
msgstr "Habilitar geração de material de suporte."
-#: src/libslic3r/PrintConfig.cpp:1835
+#: src/libslic3r/PrintConfig.cpp:1871
msgid "Auto generated supports"
msgstr "Gerar suportes automaticamente"
-#: src/libslic3r/PrintConfig.cpp:1837
+#: src/libslic3r/PrintConfig.cpp:1873
msgid ""
"If checked, supports will be generated automatically based on the overhang "
"threshold value. If unchecked, supports will be generated inside the "
@@ -8072,11 +9382,11 @@ msgstr ""
"limite de angulação. Se desmarcada, as sustentações serão geradas dentro dos "
"volumes do \"reforçador de suporte\" somente."
-#: src/libslic3r/PrintConfig.cpp:1843
+#: src/libslic3r/PrintConfig.cpp:1879
msgid "XY separation between an object and its support"
msgstr "Separação entre o objeto e seu suporte em XY"
-#: src/libslic3r/PrintConfig.cpp:1845
+#: src/libslic3r/PrintConfig.cpp:1881
msgid ""
"XY separation between an object and its support. If expressed as percentage "
"(for example 50%), it will be calculated over external perimeter width."
@@ -8085,11 +9395,11 @@ msgstr ""
"(por exemplo, 50%), será calculado com base na espessura do perímetro "
"externo."
-#: src/libslic3r/PrintConfig.cpp:1855
+#: src/libslic3r/PrintConfig.cpp:1891
msgid "Pattern angle"
msgstr "Ângulo do padrão"
-#: src/libslic3r/PrintConfig.cpp:1857
+#: src/libslic3r/PrintConfig.cpp:1893
msgid ""
"Use this setting to rotate the support material pattern on the horizontal "
"plane."
@@ -8097,7 +9407,7 @@ msgstr ""
"Use essa config. para girar o padrão de material de suporte no plano "
"horizontal."
-#: src/libslic3r/PrintConfig.cpp:1867 src/libslic3r/PrintConfig.cpp:2563
+#: src/libslic3r/PrintConfig.cpp:1903 src/libslic3r/PrintConfig.cpp:2686
msgid ""
"Only create support if it lies on a build plate. Don't create support on a "
"print."
@@ -8105,11 +9415,11 @@ msgstr ""
"Apenas criar suporte se ele está em uma mesa. Não crie suporte em uma "
"impressão."
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1909
msgid "Contact Z distance"
msgstr "Distância de contato Z"
-#: src/libslic3r/PrintConfig.cpp:1875
+#: src/libslic3r/PrintConfig.cpp:1911
msgid ""
"The vertical distance between object and support material interface. Setting "
"this to 0 will also prevent Slic3r from using bridge flow and speed for the "
@@ -8119,19 +9429,19 @@ msgstr ""
"Definir isso como 0 também impedirá Slic3r de usar o fluxo de ponte e a "
"velocidade para a primeira camada de objeto."
-#: src/libslic3r/PrintConfig.cpp:1882
+#: src/libslic3r/PrintConfig.cpp:1918
msgid "0 (soluble)"
msgstr "0 (solúvel)"
-#: src/libslic3r/PrintConfig.cpp:1883
+#: src/libslic3r/PrintConfig.cpp:1919
msgid "0.2 (detachable)"
msgstr "0.2 (destacável)"
-#: src/libslic3r/PrintConfig.cpp:1888
+#: src/libslic3r/PrintConfig.cpp:1924
msgid "Enforce support for the first"
msgstr "Reforçar suportes para a(s) primeira(s)"
-#: src/libslic3r/PrintConfig.cpp:1890
+#: src/libslic3r/PrintConfig.cpp:1926
msgid ""
"Generate support material for the specified number of layers counting from "
"bottom, regardless of whether normal support material is enabled or not and "
@@ -8144,15 +9454,15 @@ msgstr ""
"para obter mais aderência de objetos com uma pegada muito fina ou fraca na "
"placa de construção."
-#: src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1931
msgid "Enforce support for the first n layers"
msgstr "Reforçar suportes na(s) primera(s) n camada(s)"
-#: src/libslic3r/PrintConfig.cpp:1901
+#: src/libslic3r/PrintConfig.cpp:1937
msgid "Support material/raft/skirt extruder"
msgstr "Extrusora de material de suporte/estrado/saia"
-#: src/libslic3r/PrintConfig.cpp:1903
+#: src/libslic3r/PrintConfig.cpp:1939
msgid ""
"The extruder to use when printing support material, raft and skirt (1+, 0 to "
"use the current extruder to minimize tool changes)."
@@ -8160,7 +9470,7 @@ msgstr ""
"A extrusora a ser usada ao imprimir material de suporte, estrado e saia (1 "
"+, 0 para usar a extrusora atual para minimizar as mudanças na ferramenta)."
-#: src/libslic3r/PrintConfig.cpp:1912
+#: src/libslic3r/PrintConfig.cpp:1948
msgid ""
"Set this to a non-zero value to set a manual extrusion width for support "
"material. If left zero, default extrusion width will be used if set, "
@@ -8173,22 +9483,22 @@ msgstr ""
"expresso em porcentagem(por exemplo, 90%) Ele será calculado sobre a altura "
"da camada."
-#: src/libslic3r/PrintConfig.cpp:1920
+#: src/libslic3r/PrintConfig.cpp:1957
msgid "Interface loops"
msgstr "Voltas da interface"
-#: src/libslic3r/PrintConfig.cpp:1922
+#: src/libslic3r/PrintConfig.cpp:1959
msgid ""
"Cover the top contact layer of the supports with loops. Disabled by default."
msgstr ""
"Cubra a camada de contato superior dos suportes com laços. Desativado por "
"padrão."
-#: src/libslic3r/PrintConfig.cpp:1927
+#: src/libslic3r/PrintConfig.cpp:1964
msgid "Support material/raft interface extruder"
msgstr "Extrusora de material de suporte/estrado"
-#: src/libslic3r/PrintConfig.cpp:1929
+#: src/libslic3r/PrintConfig.cpp:1966
msgid ""
"The extruder to use when printing support material interface (1+, 0 to use "
"the current extruder to minimize tool changes). This affects raft too."
@@ -8197,11 +9507,11 @@ msgstr ""
"usar o extrusor atual para minimizar mudanças da ferramenta). Isso afeta o "
"estrado também."
-#: src/libslic3r/PrintConfig.cpp:1936
+#: src/libslic3r/PrintConfig.cpp:1973
msgid "Interface layers"
msgstr "Camadas de interface"
-#: src/libslic3r/PrintConfig.cpp:1938
+#: src/libslic3r/PrintConfig.cpp:1975
msgid ""
"Number of interface layers to insert between the object(s) and support "
"material."
@@ -8209,17 +9519,17 @@ msgstr ""
"Número de camadas de interface para inserir entre o objeto(s) e material de "
"suporte."
-#: src/libslic3r/PrintConfig.cpp:1945
+#: src/libslic3r/PrintConfig.cpp:1982
msgid "Interface pattern spacing"
msgstr "Espaçamento do padrão da interface"
-#: src/libslic3r/PrintConfig.cpp:1947
+#: src/libslic3r/PrintConfig.cpp:1984
msgid "Spacing between interface lines. Set zero to get a solid interface."
msgstr ""
"Espaçamento entre as linhas de interface. Defina zero para obter uma "
"interface sólida."
-#: src/libslic3r/PrintConfig.cpp:1956
+#: src/libslic3r/PrintConfig.cpp:1993
msgid ""
"Speed for printing support material interface layers. If expressed as "
"percentage (for example 50%) it will be calculated over support material "
@@ -8229,35 +9539,35 @@ msgstr ""
"expresso em porcentagem(por exemplo, 50%) Ele será calculado sobre a "
"velocidade do material de suporte."
-#: src/libslic3r/PrintConfig.cpp:1965
+#: src/libslic3r/PrintConfig.cpp:2002
msgid "Pattern"
msgstr "Padrão"
-#: src/libslic3r/PrintConfig.cpp:1967
+#: src/libslic3r/PrintConfig.cpp:2004
msgid "Pattern used to generate support material."
msgstr "Padrão usado para gerar material de suporte."
-#: src/libslic3r/PrintConfig.cpp:1973
+#: src/libslic3r/PrintConfig.cpp:2010
msgid "Rectilinear grid"
msgstr "Grade rectilínea"
-#: src/libslic3r/PrintConfig.cpp:1979
+#: src/libslic3r/PrintConfig.cpp:2016
msgid "Pattern spacing"
msgstr "Padrão de espaçamento"
-#: src/libslic3r/PrintConfig.cpp:1981
+#: src/libslic3r/PrintConfig.cpp:2018
msgid "Spacing between support material lines."
msgstr "Espaçamento entre linhas de material de suporte."
-#: src/libslic3r/PrintConfig.cpp:1990
+#: src/libslic3r/PrintConfig.cpp:2027
msgid "Speed for printing support material."
msgstr "Velocidade para imprimir material de suporte."
-#: src/libslic3r/PrintConfig.cpp:1997
+#: src/libslic3r/PrintConfig.cpp:2034
msgid "Synchronize with object layers"
msgstr "Sincronizar com camadas de objeto"
-#: src/libslic3r/PrintConfig.cpp:1999
+#: src/libslic3r/PrintConfig.cpp:2036
msgid ""
"Synchronize support layers with the object print layers. This is useful with "
"multi-material printers, where the extruder switch is expensive."
@@ -8266,11 +9576,11 @@ msgstr ""
"útil com as impressoras do multi-material, onde o interruptor da extrusora é "
"caro."
-#: src/libslic3r/PrintConfig.cpp:2005
+#: src/libslic3r/PrintConfig.cpp:2042
msgid "Overhang threshold"
msgstr "Limite de angulação"
-#: src/libslic3r/PrintConfig.cpp:2007
+#: src/libslic3r/PrintConfig.cpp:2044
msgid ""
"Support material will not be generated for overhangs whose slope angle (90° "
"= vertical) is above the given threshold. In other words, this value "
@@ -8284,11 +9594,11 @@ msgstr ""
"partir do plano horizontal) que você pode imprimir sem material de suporte. "
"Defina como zero para detecção automática (recomendado)."
-#: src/libslic3r/PrintConfig.cpp:2019
+#: src/libslic3r/PrintConfig.cpp:2056
msgid "With sheath around the support"
msgstr "Com bainha em torno do apoio"
-#: src/libslic3r/PrintConfig.cpp:2021
+#: src/libslic3r/PrintConfig.cpp:2058
msgid ""
"Add a sheath (a single perimeter line) around the base support. This makes "
"the support more reliable, but also more difficult to remove."
@@ -8296,7 +9606,7 @@ msgstr ""
"Adicione uma bainha (uma única linha de perímetro) em torno do suporte base. "
"Isso torna o suporte mais confiável, mas também mais difícil de remover."
-#: src/libslic3r/PrintConfig.cpp:2028
+#: src/libslic3r/PrintConfig.cpp:2065
msgid ""
"Extruder temperature for layers after the first one. Set this to zero to "
"disable temperature control commands in the output."
@@ -8304,11 +9614,11 @@ msgstr ""
"Temperatura da extrusora para camadas após a primeira. Defina como zero para "
"desabilitar os comandos de controle de temperatura na saída."
-#: src/libslic3r/PrintConfig.cpp:2036
+#: src/libslic3r/PrintConfig.cpp:2073
msgid "Detect thin walls"
msgstr "Detectar paredes finas"
-#: src/libslic3r/PrintConfig.cpp:2038
+#: src/libslic3r/PrintConfig.cpp:2075
msgid ""
"Detect single-width walls (parts where two extrusions don't fit and we need "
"to collapse them into a single trace)."
@@ -8316,11 +9626,11 @@ msgstr ""
"Detecte paredes de largura única (partes onde duas extrusões não cabem e "
"precisamos recolhê-las em um único traço)."
-#: src/libslic3r/PrintConfig.cpp:2044
+#: src/libslic3r/PrintConfig.cpp:2081
msgid "Threads"
msgstr "Roscas"
-#: src/libslic3r/PrintConfig.cpp:2045
+#: src/libslic3r/PrintConfig.cpp:2082
msgid ""
"Threads are used to parallelize long-running tasks. Optimal threads number "
"is slightly above the number of available cores/processors."
@@ -8329,7 +9639,7 @@ msgstr ""
"de tópicos ideais está ligeiramente acima do número de núcleos/processadores "
"disponíveis."
-#: src/libslic3r/PrintConfig.cpp:2057
+#: src/libslic3r/PrintConfig.cpp:2094
msgid ""
"This custom code is inserted before every toolchange. Placeholder variables "
"for all PrusaSlicer settings as well as {previous_extruder} and "
@@ -8346,7 +9656,7 @@ msgstr ""
"é possível script comportamento personalizado antes e depois da mudança de "
"ferramenta."
-#: src/libslic3r/PrintConfig.cpp:2070
+#: src/libslic3r/PrintConfig.cpp:2107
msgid ""
"Set this to a non-zero value to set a manual extrusion width for infill for "
"top surfaces. You may want to use thinner extrudates to fill all narrow "
@@ -8362,7 +9672,7 @@ msgstr ""
"Se expresso em porcentagem(por exemplo, 90%) Ele será calculado sobre a "
"altura da camada."
-#: src/libslic3r/PrintConfig.cpp:2081
+#: src/libslic3r/PrintConfig.cpp:2119
msgid ""
"Speed for printing top solid layers (it only applies to the uppermost "
"external layers and not to their internal solid layers). You may want to "
@@ -8376,25 +9686,40 @@ msgstr ""
"Isto pode ser expresso em porcentagem(por exemplo: 80%) sobre a velocidade "
"de preenchimento sólido acima. Defina como zero para auto."
-#: src/libslic3r/PrintConfig.cpp:2096
+#: src/libslic3r/PrintConfig.cpp:2134
msgid "Number of solid layers to generate on top surfaces."
msgstr "Número de camadas sólidas para gerar em superfícies superiores."
-#: src/libslic3r/PrintConfig.cpp:2097
+#: src/libslic3r/PrintConfig.cpp:2135
msgid "Top solid layers"
msgstr "Camadas sólidas de topo"
-#: src/libslic3r/PrintConfig.cpp:2103
+#: src/libslic3r/PrintConfig.cpp:2143
+msgid ""
+"The number of top solid layers is increased above top_solid_layers if "
+"necessary to satisfy minimum thickness of top shell. This is useful to "
+"prevent pillowing effect when printing with variable layer height."
+msgstr ""
+"O número de camadas sólidas superiores é aumentado acima de top_solid_layers "
+"se necessário para satisfazer a espessura mínima da camada superior. Isso é "
+"útil para evitar o efeito de travesseiro ao imprimir com altura de camada "
+"variável."
+
+#: src/libslic3r/PrintConfig.cpp:2146
+msgid "Minimum top shell thickness"
+msgstr "Espessura mínima vertical da parede"
+
+#: src/libslic3r/PrintConfig.cpp:2153
msgid "Speed for travel moves (jumps between distant extrusion points)."
msgstr ""
"Velocidade para movimentos de viagem (saltos entre pontos de extrusão "
"distantes)."
-#: src/libslic3r/PrintConfig.cpp:2111
+#: src/libslic3r/PrintConfig.cpp:2161
msgid "Use firmware retraction"
msgstr "Usar retração do firmware"
-#: src/libslic3r/PrintConfig.cpp:2112
+#: src/libslic3r/PrintConfig.cpp:2162
msgid ""
"This experimental setting uses G10 and G11 commands to have the firmware "
"handle the retraction. This is only supported in recent Marlin."
@@ -8402,11 +9727,11 @@ msgstr ""
"Esta config. experimental usa comandos G10 e G11 para que o firmware "
"manipule a retração. Isso só é suportado no recente Marlin."
-#: src/libslic3r/PrintConfig.cpp:2118
+#: src/libslic3r/PrintConfig.cpp:2168
msgid "Use relative E distances"
msgstr "Utilizar distâncias relativas do E"
-#: src/libslic3r/PrintConfig.cpp:2119
+#: src/libslic3r/PrintConfig.cpp:2169
msgid ""
"If your firmware requires relative E values, check this, otherwise leave it "
"unchecked. Most firmwares use absolute values."
@@ -8414,11 +9739,11 @@ msgstr ""
"Se o firmware necessitar de valores relativos E, verifique isto, caso "
"contrário, deixe-o desmarcado. A maioria dos firmwares usa valores absolutos."
-#: src/libslic3r/PrintConfig.cpp:2125
+#: src/libslic3r/PrintConfig.cpp:2175
msgid "Use volumetric E"
msgstr "Usar E volumétrico"
-#: src/libslic3r/PrintConfig.cpp:2126
+#: src/libslic3r/PrintConfig.cpp:2176
msgid ""
"This experimental setting uses outputs the E values in cubic millimeters "
"instead of linear millimeters. If your firmware doesn't already know "
@@ -8434,11 +9759,11 @@ msgstr ""
"do filamento associado ao filamento selecionado em Slic3r. Isso só é "
"suportado no recente Marlin."
-#: src/libslic3r/PrintConfig.cpp:2136
+#: src/libslic3r/PrintConfig.cpp:2186
msgid "Enable variable layer height feature"
msgstr "Habilitar altura de camada variável"
-#: src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2187
msgid ""
"Some printers or printer setups may have difficulties printing with a "
"variable layer height. Enabled by default."
@@ -8446,11 +9771,11 @@ msgstr ""
"Algumas impressoras ou config. de impressora podem ter dificuldades para "
"imprimir com uma altura de camada variável. Ativado por padrão."
-#: src/libslic3r/PrintConfig.cpp:2143
+#: src/libslic3r/PrintConfig.cpp:2193
msgid "Wipe while retracting"
msgstr "Limpe durante a retração"
-#: src/libslic3r/PrintConfig.cpp:2144
+#: src/libslic3r/PrintConfig.cpp:2194
msgid ""
"This flag will move the nozzle while retracting to minimize the possible "
"blob on leaky extruders."
@@ -8458,7 +9783,7 @@ msgstr ""
"Esta bandeira moverá a ponteira ao retrair para minimizar a bolha possível "
"em extrusoras vazando."
-#: src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2201
msgid ""
"Multi material printers may need to prime or purge extruders on tool "
"changes. Extrude the excess material into the wipe tower."
@@ -8467,11 +9792,11 @@ msgstr ""
"alterações de ferramenta. EXTRUDE o excesso de material para a torre de "
"limpeza."
-#: src/libslic3r/PrintConfig.cpp:2157
+#: src/libslic3r/PrintConfig.cpp:2207
msgid "Purging volumes - load/unload volumes"
msgstr "Volumes de purga-volumes de carga/descarregamento"
-#: src/libslic3r/PrintConfig.cpp:2158
+#: src/libslic3r/PrintConfig.cpp:2208
msgid ""
"This vector saves required volumes to change from/to each tool used on the "
"wipe tower. These values are used to simplify creation of the full purging "
@@ -8481,11 +9806,11 @@ msgstr ""
"usada na torre de limpeza. Esses valores são usados para simplificar a "
"criação dos volumes de purga completos abaixo."
-#: src/libslic3r/PrintConfig.cpp:2164
+#: src/libslic3r/PrintConfig.cpp:2214
msgid "Purging volumes - matrix"
msgstr "Volumes de purga-matriz"
-#: src/libslic3r/PrintConfig.cpp:2165
+#: src/libslic3r/PrintConfig.cpp:2215
msgid ""
"This matrix describes volumes (in cubic milimetres) required to purge the "
"new filament on the wipe tower for any given pair of tools."
@@ -8493,39 +9818,39 @@ msgstr ""
"Esta matriz descreve volumes (em milimetros cúbicos) necessários para limpar "
"o novo filamento na torre de limpeza para qualquer dado par de ferramentas."
-#: src/libslic3r/PrintConfig.cpp:2174
+#: src/libslic3r/PrintConfig.cpp:2224
msgid "Position X"
msgstr "Posição X"
-#: src/libslic3r/PrintConfig.cpp:2175
+#: src/libslic3r/PrintConfig.cpp:2225
msgid "X coordinate of the left front corner of a wipe tower"
msgstr "Coordenada X do canto frontal esquerdo de uma torre de limpeza"
-#: src/libslic3r/PrintConfig.cpp:2181
+#: src/libslic3r/PrintConfig.cpp:2231
msgid "Position Y"
msgstr "Posição Y"
-#: src/libslic3r/PrintConfig.cpp:2182
+#: src/libslic3r/PrintConfig.cpp:2232
msgid "Y coordinate of the left front corner of a wipe tower"
msgstr "Coordenada Y do canto dianteiro esquerdo de uma torre de limpeza"
-#: src/libslic3r/PrintConfig.cpp:2189
+#: src/libslic3r/PrintConfig.cpp:2239
msgid "Width of a wipe tower"
msgstr "Largura de uma torre da limpeza"
-#: src/libslic3r/PrintConfig.cpp:2195
+#: src/libslic3r/PrintConfig.cpp:2245
msgid "Wipe tower rotation angle"
msgstr "Ângulo de rotação da torre"
-#: src/libslic3r/PrintConfig.cpp:2196
+#: src/libslic3r/PrintConfig.cpp:2246
msgid "Wipe tower rotation angle with respect to x-axis."
msgstr "Ângulo de rotação da torre de limpeza em relação ao eixo X."
-#: src/libslic3r/PrintConfig.cpp:2203
+#: src/libslic3r/PrintConfig.cpp:2253
msgid "Wipe into this object's infill"
msgstr "Limpe no preenchimento deste objeto"
-#: src/libslic3r/PrintConfig.cpp:2204
+#: src/libslic3r/PrintConfig.cpp:2254
msgid ""
"Purging after toolchange will done inside this object's infills. This lowers "
"the amount of waste but may result in longer print time due to additional "
@@ -8535,11 +9860,11 @@ msgstr ""
"objeto. Isso diminui a quantidade de resíduos, mas pode resultar em tempo de "
"impressão mais longo devido a movimentos de viagem adicionais."
-#: src/libslic3r/PrintConfig.cpp:2211
+#: src/libslic3r/PrintConfig.cpp:2261
msgid "Wipe into this object"
msgstr "Limpar neste objeto"
-#: src/libslic3r/PrintConfig.cpp:2212
+#: src/libslic3r/PrintConfig.cpp:2262
msgid ""
"Object will be used to purge the nozzle after a toolchange to save material "
"that would otherwise end up in the wipe tower and decrease print time. "
@@ -8549,20 +9874,20 @@ msgstr ""
"salvar o material que de outra forma acabaria na torre de limpeza e diminuir "
"o tempo de impressão. As cores dos objetos serão misturadas como resultado."
-#: src/libslic3r/PrintConfig.cpp:2218
+#: src/libslic3r/PrintConfig.cpp:2268
msgid "Maximal bridging distance"
msgstr "Distância de ponte máxima"
-#: src/libslic3r/PrintConfig.cpp:2219
+#: src/libslic3r/PrintConfig.cpp:2269
msgid "Maximal distance between supports on sparse infill sections."
msgstr ""
"Distância máxima entre as sustentações em seções preenchimento esparsas."
-#: src/libslic3r/PrintConfig.cpp:2225
+#: src/libslic3r/PrintConfig.cpp:2275
msgid "XY Size Compensation"
msgstr "Compensação de tamanho em XY"
-#: src/libslic3r/PrintConfig.cpp:2227
+#: src/libslic3r/PrintConfig.cpp:2277
msgid ""
"The object will be grown/shrunk in the XY plane by the configured value "
"(negative = inwards, positive = outwards). This might be useful for fine-"
@@ -8572,11 +9897,11 @@ msgstr ""
"(negativo = para dentro, positivo = para fora). Isso pode ser útil para "
"ajustar os tamanhos dos furos."
-#: src/libslic3r/PrintConfig.cpp:2235
+#: src/libslic3r/PrintConfig.cpp:2285
msgid "Z offset"
msgstr "Compensamento do Z"
-#: src/libslic3r/PrintConfig.cpp:2236
+#: src/libslic3r/PrintConfig.cpp:2286
msgid ""
"This value will be added (or subtracted) from all the Z coordinates in the "
"output G-code. It is used to compensate for bad Z endstop position: for "
@@ -8589,63 +9914,63 @@ msgstr ""
"mm longe da mesa de impressão, defina este para-0,3 (ou corrigir o seu final "
"de curso)."
-#: src/libslic3r/PrintConfig.cpp:2294
+#: src/libslic3r/PrintConfig.cpp:2353
msgid "Display width"
msgstr "Largura do display"
-#: src/libslic3r/PrintConfig.cpp:2295
+#: src/libslic3r/PrintConfig.cpp:2354
msgid "Width of the display"
msgstr "Largura do display"
-#: src/libslic3r/PrintConfig.cpp:2300
+#: src/libslic3r/PrintConfig.cpp:2359
msgid "Display height"
msgstr "Altura do display"
-#: src/libslic3r/PrintConfig.cpp:2301
+#: src/libslic3r/PrintConfig.cpp:2360
msgid "Height of the display"
msgstr "Altura do display"
-#: src/libslic3r/PrintConfig.cpp:2306
+#: src/libslic3r/PrintConfig.cpp:2365
msgid "Number of pixels in"
msgstr "Número de pixels em"
-#: src/libslic3r/PrintConfig.cpp:2308
+#: src/libslic3r/PrintConfig.cpp:2367
msgid "Number of pixels in X"
msgstr "Número de pixels em X"
-#: src/libslic3r/PrintConfig.cpp:2314
+#: src/libslic3r/PrintConfig.cpp:2373
msgid "Number of pixels in Y"
msgstr "Número de pixels em Y"
-#: src/libslic3r/PrintConfig.cpp:2319
+#: src/libslic3r/PrintConfig.cpp:2378
msgid "Display horizontal mirroring"
msgstr "Exibir espelhamento horizontal"
-#: src/libslic3r/PrintConfig.cpp:2320
+#: src/libslic3r/PrintConfig.cpp:2379
msgid "Mirror horizontally"
msgstr "Espelhar horizontalmente"
-#: src/libslic3r/PrintConfig.cpp:2321
+#: src/libslic3r/PrintConfig.cpp:2380
msgid "Enable horizontal mirroring of output images"
msgstr "Habilitar espelhamento horizontal de imagens de saída"
-#: src/libslic3r/PrintConfig.cpp:2326
+#: src/libslic3r/PrintConfig.cpp:2385
msgid "Display vertical mirroring"
msgstr "Exibir espelhamento vertical"
-#: src/libslic3r/PrintConfig.cpp:2327
+#: src/libslic3r/PrintConfig.cpp:2386
msgid "Mirror vertically"
msgstr "Espelharvertical"
-#: src/libslic3r/PrintConfig.cpp:2328
+#: src/libslic3r/PrintConfig.cpp:2387
msgid "Enable vertical mirroring of output images"
msgstr "Habilitar espelhamento vertical de imagens de saída"
-#: src/libslic3r/PrintConfig.cpp:2333
+#: src/libslic3r/PrintConfig.cpp:2392
msgid "Display orientation"
msgstr "Orientação do display"
-#: src/libslic3r/PrintConfig.cpp:2334
+#: src/libslic3r/PrintConfig.cpp:2393
msgid ""
"Set the actual LCD display orientation inside the SLA printer. Portrait mode "
"will flip the meaning of display width and height parameters and the output "
@@ -8655,43 +9980,43 @@ msgstr ""
"retrato inverterá o significado dos parâmetros de largura e altura da tela e "
"as imagens de saída serão giradas por 90 graus."
-#: src/libslic3r/PrintConfig.cpp:2340
+#: src/libslic3r/PrintConfig.cpp:2399
msgid "Landscape"
msgstr "Paisagem"
-#: src/libslic3r/PrintConfig.cpp:2341
+#: src/libslic3r/PrintConfig.cpp:2400
msgid "Portrait"
msgstr "Retrato"
-#: src/libslic3r/PrintConfig.cpp:2346
+#: src/libslic3r/PrintConfig.cpp:2405
msgid "Fast"
msgstr "Rápido"
-#: src/libslic3r/PrintConfig.cpp:2347
+#: src/libslic3r/PrintConfig.cpp:2406
msgid "Fast tilt"
msgstr "Inclinação rápida"
-#: src/libslic3r/PrintConfig.cpp:2348
+#: src/libslic3r/PrintConfig.cpp:2407
msgid "Time of the fast tilt"
msgstr "Tempo da inclinação rápida"
-#: src/libslic3r/PrintConfig.cpp:2355
+#: src/libslic3r/PrintConfig.cpp:2414
msgid "Slow"
msgstr "Lento"
-#: src/libslic3r/PrintConfig.cpp:2356
+#: src/libslic3r/PrintConfig.cpp:2415
msgid "Slow tilt"
msgstr "Inclinação lenta"
-#: src/libslic3r/PrintConfig.cpp:2357
+#: src/libslic3r/PrintConfig.cpp:2416
msgid "Time of the slow tilt"
msgstr "Tempo da inclinação lenta"
-#: src/libslic3r/PrintConfig.cpp:2364
+#: src/libslic3r/PrintConfig.cpp:2423
msgid "Area fill"
msgstr "Preenchimento de área"
-#: src/libslic3r/PrintConfig.cpp:2365
+#: src/libslic3r/PrintConfig.cpp:2424
msgid ""
"The percentage of the bed area. \n"
"If the print area exceeds the specified value, \n"
@@ -8702,16 +10027,16 @@ msgstr ""
"em seguida, uma inclinação lenta será usada, caso contrário-uma inclinação "
"rápida"
-#: src/libslic3r/PrintConfig.cpp:2372 src/libslic3r/PrintConfig.cpp:2373
-#: src/libslic3r/PrintConfig.cpp:2374
+#: src/libslic3r/PrintConfig.cpp:2431 src/libslic3r/PrintConfig.cpp:2432
+#: src/libslic3r/PrintConfig.cpp:2433
msgid "Printer scaling correction"
msgstr "Correção de dimensionamento da impressora"
-#: src/libslic3r/PrintConfig.cpp:2380 src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2439 src/libslic3r/PrintConfig.cpp:2440
msgid "Printer absolute correction"
msgstr "Correção absoluta da impressora"
-#: src/libslic3r/PrintConfig.cpp:2382
+#: src/libslic3r/PrintConfig.cpp:2441
msgid ""
"Will inflate or deflate the sliced 2D polygons according to the sign of the "
"correction."
@@ -8719,11 +10044,22 @@ msgstr ""
"Irá inflar ou esvaziar os polígonos 2D cortados de acordo com o sinal da "
"correção."
-#: src/libslic3r/PrintConfig.cpp:2388 src/libslic3r/PrintConfig.cpp:2389
+#: src/libslic3r/PrintConfig.cpp:2447
+msgid "Elephant foot minimum width"
+msgstr "Largura mínima do pé de elefante"
+
+#: src/libslic3r/PrintConfig.cpp:2449
+msgid ""
+"Minimum width of features to maintain when doing elephant foot compensation."
+msgstr ""
+"Largura mínima de características para manter ao fazer compensação do pé de "
+"elefante."
+
+#: src/libslic3r/PrintConfig.cpp:2456 src/libslic3r/PrintConfig.cpp:2457
msgid "Printer gamma correction"
msgstr "Correção de gama de impressora"
-#: src/libslic3r/PrintConfig.cpp:2390
+#: src/libslic3r/PrintConfig.cpp:2458
msgid ""
"This will apply a gamma correction to the rasterized 2D polygons. A gamma "
"value of zero means thresholding with the threshold in the middle. This "
@@ -8733,15 +10069,43 @@ msgstr ""
"valor gama de zero significa limiarização com o limiar no meio. Este "
"comportamento elimina suavização sem perder buracos em polígonos."
-#: src/libslic3r/PrintConfig.cpp:2401 src/libslic3r/PrintConfig.cpp:2402
+#: src/libslic3r/PrintConfig.cpp:2470 src/libslic3r/PrintConfig.cpp:2471
+msgid "SLA material type"
+msgstr "Tipo de Material de SLA"
+
+#: src/libslic3r/PrintConfig.cpp:2482 src/libslic3r/PrintConfig.cpp:2483
msgid "Initial layer height"
msgstr "Altura da camada inicial"
-#: src/libslic3r/PrintConfig.cpp:2408
+#: src/libslic3r/PrintConfig.cpp:2489 src/libslic3r/PrintConfig.cpp:2490
+msgid "Bottle volume"
+msgstr "Volume do pote"
+
+#: src/libslic3r/PrintConfig.cpp:2491
+msgid "ml"
+msgstr "ml"
+
+#: src/libslic3r/PrintConfig.cpp:2496 src/libslic3r/PrintConfig.cpp:2497
+msgid "Bottle weight"
+msgstr "Peso do pote"
+
+#: src/libslic3r/PrintConfig.cpp:2498
+msgid "kg"
+msgstr "kg"
+
+#: src/libslic3r/PrintConfig.cpp:2505
+msgid "g/ml"
+msgstr "g/ml"
+
+#: src/libslic3r/PrintConfig.cpp:2512
+msgid "money/bottle"
+msgstr "dinheiro/pote"
+
+#: src/libslic3r/PrintConfig.cpp:2517
msgid "Faded layers"
msgstr "Camadas desbotadas"
-#: src/libslic3r/PrintConfig.cpp:2409
+#: src/libslic3r/PrintConfig.cpp:2518
msgid ""
"Number of the layers needed for the exposure time fade from initial exposure "
"time to the exposure time"
@@ -8749,92 +10113,104 @@ msgstr ""
"Número de camadas necessárias para o tempo de exposição desvanecer-se do "
"tempo de exposição inicial ao tempo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2416 src/libslic3r/PrintConfig.cpp:2417
+#: src/libslic3r/PrintConfig.cpp:2525 src/libslic3r/PrintConfig.cpp:2526
msgid "Minimum exposure time"
msgstr "Tempo mínimo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2425
+#: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2534
msgid "Maximum exposure time"
msgstr "Tempo máximo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2433
+#: src/libslic3r/PrintConfig.cpp:2541 src/libslic3r/PrintConfig.cpp:2542
msgid "Exposure time"
msgstr "Tempo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2439 src/libslic3r/PrintConfig.cpp:2440
+#: src/libslic3r/PrintConfig.cpp:2548 src/libslic3r/PrintConfig.cpp:2549
msgid "Minimum initial exposure time"
msgstr "Tempo inicial mínimo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2447 src/libslic3r/PrintConfig.cpp:2448
+#: src/libslic3r/PrintConfig.cpp:2556 src/libslic3r/PrintConfig.cpp:2557
msgid "Maximum initial exposure time"
msgstr "Tempo inicial máximo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2455 src/libslic3r/PrintConfig.cpp:2456
+#: src/libslic3r/PrintConfig.cpp:2564 src/libslic3r/PrintConfig.cpp:2565
msgid "Initial exposure time"
msgstr "Tempo inicial mínimo de exposição"
-#: src/libslic3r/PrintConfig.cpp:2462 src/libslic3r/PrintConfig.cpp:2463
+#: src/libslic3r/PrintConfig.cpp:2571 src/libslic3r/PrintConfig.cpp:2572
msgid "Correction for expansion"
msgstr "Correção para expansão"
-#: src/libslic3r/PrintConfig.cpp:2469
+#: src/libslic3r/PrintConfig.cpp:2578
msgid "SLA print material notes"
msgstr "Notas de material de impressão de SLA"
-#: src/libslic3r/PrintConfig.cpp:2470
+#: src/libslic3r/PrintConfig.cpp:2579
msgid "You can put your notes regarding the SLA print material here."
msgstr ""
"Você pode colocar suas anotações sobre o material de impressão de SLA aqui."
-#: src/libslic3r/PrintConfig.cpp:2478 src/libslic3r/PrintConfig.cpp:2489
+#: src/libslic3r/PrintConfig.cpp:2591 src/libslic3r/PrintConfig.cpp:2602
msgid "Default SLA material profile"
msgstr "Perfil de material de SLA padrão"
-#: src/libslic3r/PrintConfig.cpp:2500
+#: src/libslic3r/PrintConfig.cpp:2613
msgid "Generate supports"
msgstr "Gerar suportes"
-#: src/libslic3r/PrintConfig.cpp:2502
+#: src/libslic3r/PrintConfig.cpp:2615
msgid "Generate supports for the models"
msgstr "Gere suportes para os modelos"
-#: src/libslic3r/PrintConfig.cpp:2507
+#: src/libslic3r/PrintConfig.cpp:2620
msgid "Support head front diameter"
msgstr "Diâmetro dianteiro principal da sustentação"
-#: src/libslic3r/PrintConfig.cpp:2509
+#: src/libslic3r/PrintConfig.cpp:2622
msgid "Diameter of the pointing side of the head"
msgstr "Diâmetro do lado apontando da cabeça"
-#: src/libslic3r/PrintConfig.cpp:2516
+#: src/libslic3r/PrintConfig.cpp:2629
msgid "Support head penetration"
msgstr "Suporte de penetração da cabeça"
-#: src/libslic3r/PrintConfig.cpp:2518
+#: src/libslic3r/PrintConfig.cpp:2631
msgid "How much the pinhead has to penetrate the model surface"
msgstr "Quanto a cabeça de alfinete tem de penetrar na superfície do modelo"
-#: src/libslic3r/PrintConfig.cpp:2525
+#: src/libslic3r/PrintConfig.cpp:2638
msgid "Support head width"
msgstr "Largura da cabeça de suporte"
-#: src/libslic3r/PrintConfig.cpp:2527
+#: src/libslic3r/PrintConfig.cpp:2640
msgid "Width from the back sphere center to the front sphere center"
msgstr "Largura do centro da esfera traseira ao centro da esfera dianteira"
-#: src/libslic3r/PrintConfig.cpp:2535
+#: src/libslic3r/PrintConfig.cpp:2648
msgid "Support pillar diameter"
msgstr "Diâmetro do pilar do suporte"
-#: src/libslic3r/PrintConfig.cpp:2537
+#: src/libslic3r/PrintConfig.cpp:2650
msgid "Diameter in mm of the support pillars"
msgstr "Diâmetro em mm dos pilares de suporte"
-#: src/libslic3r/PrintConfig.cpp:2545
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Max bridges on a pillar"
+msgstr "Distância máxima de conexão entre pilares"
+
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid ""
+"Maximum number of bridges that can be placed on a pillar. Bridges hold "
+"support point pinheads and connect to pillars as small branches."
+msgstr ""
+"Número máximo de pontes que podem ser colocadas em um pilar. As pontes "
+"seguram pinças de ponto de apoio e se conectam a pilares como pequenos ramos."
+
+#: src/libslic3r/PrintConfig.cpp:2668
msgid "Support pillar connection mode"
msgstr "Modalidade da conexão da coluna da sustentação"
-#: src/libslic3r/PrintConfig.cpp:2546
+#: src/libslic3r/PrintConfig.cpp:2669
msgid ""
"Controls the bridge type between two neighboring pillars. Can be zig-zag, "
"cross (double zig-zag) or dynamic which will automatically switch between "
@@ -8844,23 +10220,23 @@ msgstr ""
"(zig-zag dobro) ou dinâmico que comutará automaticamente entre os primeiros "
"dois dependendo da distância dos dois pilares."
-#: src/libslic3r/PrintConfig.cpp:2554
+#: src/libslic3r/PrintConfig.cpp:2677
msgid "Zig-Zag"
msgstr "Zig-Zag"
-#: src/libslic3r/PrintConfig.cpp:2555
+#: src/libslic3r/PrintConfig.cpp:2678
msgid "Cross"
msgstr "Cruz"
-#: src/libslic3r/PrintConfig.cpp:2556
+#: src/libslic3r/PrintConfig.cpp:2679
msgid "Dynamic"
msgstr "Dinâmico"
-#: src/libslic3r/PrintConfig.cpp:2568
+#: src/libslic3r/PrintConfig.cpp:2691
msgid "Pillar widening factor"
msgstr "Fator de alargamento da coluna"
-#: src/libslic3r/PrintConfig.cpp:2570
+#: src/libslic3r/PrintConfig.cpp:2693
msgid ""
"Merging bridges or pillars into another pillars can increase the radius. "
"Zero means no increase, one means full increase."
@@ -8868,27 +10244,27 @@ msgstr ""
"Mesclar pontes ou pilares em outros pilares pode aumentar o raio. Zero "
"significa que não há aumento, um significa aumento total."
-#: src/libslic3r/PrintConfig.cpp:2579
+#: src/libslic3r/PrintConfig.cpp:2702
msgid "Support base diameter"
msgstr "Diâmetro base do suporte"
-#: src/libslic3r/PrintConfig.cpp:2581
+#: src/libslic3r/PrintConfig.cpp:2704
msgid "Diameter in mm of the pillar base"
msgstr "Diâmetro em mm da base do pilar"
-#: src/libslic3r/PrintConfig.cpp:2589
+#: src/libslic3r/PrintConfig.cpp:2712
msgid "Support base height"
msgstr "Altura base do suporte"
-#: src/libslic3r/PrintConfig.cpp:2591
+#: src/libslic3r/PrintConfig.cpp:2714
msgid "The height of the pillar base cone"
msgstr "A altura do cone da base da coluna"
-#: src/libslic3r/PrintConfig.cpp:2598
+#: src/libslic3r/PrintConfig.cpp:2721
msgid "Support base safety distance"
msgstr "Distância da segurança da base da sustentação"
-#: src/libslic3r/PrintConfig.cpp:2601
+#: src/libslic3r/PrintConfig.cpp:2724
msgid ""
"The minimum distance of the pillar base from the model in mm. Makes sense in "
"zero elevation mode where a gap according to this parameter is inserted "
@@ -8898,27 +10274,27 @@ msgstr ""
"elevação zero, onde uma lacuna de acordo com este parâmetro é inserida entre "
"o modelo e o pad."
-#: src/libslic3r/PrintConfig.cpp:2611
+#: src/libslic3r/PrintConfig.cpp:2734
msgid "Critical angle"
msgstr "Ângulo crítico"
-#: src/libslic3r/PrintConfig.cpp:2613
+#: src/libslic3r/PrintConfig.cpp:2736
msgid "The default angle for connecting support sticks and junctions."
msgstr "O ângulo padrão para conectar suportes e junções."
-#: src/libslic3r/PrintConfig.cpp:2621
+#: src/libslic3r/PrintConfig.cpp:2744
msgid "Max bridge length"
msgstr "Comprimento máximo da ponte"
-#: src/libslic3r/PrintConfig.cpp:2623
+#: src/libslic3r/PrintConfig.cpp:2746
msgid "The max length of a bridge"
msgstr "O comprimento máximo de uma ponte"
-#: src/libslic3r/PrintConfig.cpp:2630
+#: src/libslic3r/PrintConfig.cpp:2753
msgid "Max pillar linking distance"
msgstr "Distância máxima de conexão entre pilares"
-#: src/libslic3r/PrintConfig.cpp:2632
+#: src/libslic3r/PrintConfig.cpp:2755
msgid ""
"The max distance of two pillars to get linked with each other. A zero value "
"will prohibit pillar cascading."
@@ -8926,11 +10302,11 @@ msgstr ""
"A distância máxima de dois pilares para ficar ligado uns com os outros. Um "
"valor zero irá proibir o pilar em cascata."
-#: src/libslic3r/PrintConfig.cpp:2640
+#: src/libslic3r/PrintConfig.cpp:2763
msgid "Object elevation"
msgstr "Elevação do objeto"
-#: src/libslic3r/PrintConfig.cpp:2642
+#: src/libslic3r/PrintConfig.cpp:2765
msgid ""
"How much the supports should lift up the supported object. If \"Pad around "
"object\" is enabled, this value is ignored."
@@ -8938,39 +10314,39 @@ msgstr ""
"Quanto os suportes devem levantar o objecto suportado. Se \"pad em torno do "
"objeto\" estiver habilitado, esse valor será ignorado."
-#: src/libslic3r/PrintConfig.cpp:2653
+#: src/libslic3r/PrintConfig.cpp:2776
msgid "This is a relative measure of support points density."
msgstr "Esta é uma medida relativa de densidade de pontos de suporte."
-#: src/libslic3r/PrintConfig.cpp:2659
+#: src/libslic3r/PrintConfig.cpp:2782
msgid "Minimal distance of the support points"
msgstr "Distância mínima dos pontos de suporte"
-#: src/libslic3r/PrintConfig.cpp:2661
+#: src/libslic3r/PrintConfig.cpp:2784
msgid "No support points will be placed closer than this threshold."
msgstr "Nenhum ponto de apoio será colocado mais perto do que este limiar."
-#: src/libslic3r/PrintConfig.cpp:2667
+#: src/libslic3r/PrintConfig.cpp:2790
msgid "Use pad"
msgstr "Use pad"
-#: src/libslic3r/PrintConfig.cpp:2669
+#: src/libslic3r/PrintConfig.cpp:2792
msgid "Add a pad underneath the supported model"
msgstr "Adicionar um pad por baixo do modelo suportado"
-#: src/libslic3r/PrintConfig.cpp:2674
+#: src/libslic3r/PrintConfig.cpp:2797
msgid "Pad wall thickness"
msgstr "Espessura da parede do pad"
-#: src/libslic3r/PrintConfig.cpp:2676
+#: src/libslic3r/PrintConfig.cpp:2799
msgid "The thickness of the pad and its optional cavity walls."
msgstr "A espessura da pad e suas paredes de cavidade opcionais."
-#: src/libslic3r/PrintConfig.cpp:2684
+#: src/libslic3r/PrintConfig.cpp:2807
msgid "Pad wall height"
msgstr "Altura da parede do pad"
-#: src/libslic3r/PrintConfig.cpp:2685
+#: src/libslic3r/PrintConfig.cpp:2808
msgid ""
"Defines the pad cavity depth. Set to zero to disable the cavity. Be careful "
"when enabling this feature, as some resins may produce an extreme suction "
@@ -8982,11 +10358,19 @@ msgstr ""
"produzir um efeito de sucção extrema dentro da cavidade, o que torna a "
"descascar a impressão fora da folha de IVA difícil."
-#: src/libslic3r/PrintConfig.cpp:2698
+#: src/libslic3r/PrintConfig.cpp:2821
+msgid "Pad brim size"
+msgstr "Tamanho da borda do bloco"
+
+#: src/libslic3r/PrintConfig.cpp:2822
+msgid "How far should the pad extend around the contained geometry"
+msgstr "Até onde o bloco deve se estender em torno da geometria contida"
+
+#: src/libslic3r/PrintConfig.cpp:2832
msgid "Max merge distance"
msgstr "Distância máxima da fusão"
-#: src/libslic3r/PrintConfig.cpp:2700
+#: src/libslic3r/PrintConfig.cpp:2834
msgid ""
"Some objects can get along with a few smaller pads instead of a single big "
"one. This parameter defines how far the center of two smaller pads should "
@@ -8996,11 +10380,11 @@ msgstr ""
"grande. Este parâmetro define até que ponto o centro de duas pads menores "
"deve ser. Se eles estão mais perto, eles vão se fundir em uma pad."
-#: src/libslic3r/PrintConfig.cpp:2720
+#: src/libslic3r/PrintConfig.cpp:2854
msgid "Pad wall slope"
msgstr "Inclinação da parede da pad"
-#: src/libslic3r/PrintConfig.cpp:2722
+#: src/libslic3r/PrintConfig.cpp:2856
msgid ""
"The slope of the pad wall relative to the bed plane. 90 degrees means "
"straight walls."
@@ -9008,19 +10392,27 @@ msgstr ""
"A inclinação da parede da pad em relação ao plano da mesa. 90 graus "
"significa paredes retas."
-#: src/libslic3r/PrintConfig.cpp:2731
+#: src/libslic3r/PrintConfig.cpp:2865
msgid "Pad around object"
msgstr "Pad em torno do objeto"
-#: src/libslic3r/PrintConfig.cpp:2733
+#: src/libslic3r/PrintConfig.cpp:2867
msgid "Create pad around object and ignore the support elevation"
msgstr "Criar pad ao redor do objeto e ignorar a elevação de suporte"
-#: src/libslic3r/PrintConfig.cpp:2738
+#: src/libslic3r/PrintConfig.cpp:2872
+msgid "Pad around object everywhere"
+msgstr "Pad em torno do objeto em todo lugar"
+
+#: src/libslic3r/PrintConfig.cpp:2874
+msgid "Force pad around object everywhere"
+msgstr "Forçar Pad em torno do objeto em todo lugar"
+
+#: src/libslic3r/PrintConfig.cpp:2879
msgid "Pad object gap"
msgstr "Vão entre o pad e o objeto"
-#: src/libslic3r/PrintConfig.cpp:2740
+#: src/libslic3r/PrintConfig.cpp:2881
msgid ""
"The gap between the object bottom and the generated pad in zero elevation "
"mode."
@@ -9028,83 +10420,125 @@ msgstr ""
"A lacuna entre a parte inferior do objeto e o pad gerado no modo de elevação "
"zero."
-#: src/libslic3r/PrintConfig.cpp:2749
+#: src/libslic3r/PrintConfig.cpp:2890
msgid "Pad object connector stride"
msgstr "Inserir pad entre o objeto"
-#: src/libslic3r/PrintConfig.cpp:2751
+#: src/libslic3r/PrintConfig.cpp:2892
msgid ""
"Distance between two connector sticks which connect the object and the "
"generated pad."
msgstr ""
"Distância entre duas varas do conector que conectam o objeto e a pad gerada."
-#: src/libslic3r/PrintConfig.cpp:2758
+#: src/libslic3r/PrintConfig.cpp:2899
msgid "Pad object connector width"
msgstr "Largura do conector do objeto pad"
-#: src/libslic3r/PrintConfig.cpp:2760
+#: src/libslic3r/PrintConfig.cpp:2901
msgid ""
"Width of the connector sticks which connect the object and the generated pad."
msgstr "Largura das varas do conector que conectam o objeto e a pad gerada."
-#: src/libslic3r/PrintConfig.cpp:2767
+#: src/libslic3r/PrintConfig.cpp:2908
msgid "Pad object connector penetration"
msgstr "Pad objeto conector de penetração"
-#: src/libslic3r/PrintConfig.cpp:2770
+#: src/libslic3r/PrintConfig.cpp:2911
msgid "How much should the tiny connectors penetrate into the model body."
msgstr "Quanto deve os conectores minúsculos penetrar no corpo do modelo."
-#: src/libslic3r/PrintConfig.cpp:3130
+#: src/libslic3r/PrintConfig.cpp:2918
+msgid "Enable hollowing"
+msgstr "Ativar o modo oco"
+
+#: src/libslic3r/PrintConfig.cpp:2920
+msgid "Hollow out a model to have an empty interior"
+msgstr "Deixar o modelo oco para ter um interior vazio"
+
+#: src/libslic3r/PrintConfig.cpp:2925
+msgid "Wall thickness"
+msgstr "Espessura da parede"
+
+#: src/libslic3r/PrintConfig.cpp:2927
+msgid "Minimum wall thickness of a hollowed model."
+msgstr "Espessura mínima da parede de um modelo oco."
+
+#: src/libslic3r/PrintConfig.cpp:2935
+msgid "Accuracy"
+msgstr "Precisão"
+
+#: src/libslic3r/PrintConfig.cpp:2937
+msgid ""
+"Performance vs accuracy of calculation. Lower values may produce unwanted "
+"artifacts."
+msgstr ""
+"Desempenho versus precisão do cálculo. Valores mais baixos podem produzir "
+"artefatos indesejados."
+
+#: src/libslic3r/PrintConfig.cpp:2947
+msgid ""
+"Hollowing is done in two steps: first, an imaginary interior is calculated "
+"deeper (offset plus the closing distance) in the object and then it's "
+"inflated back to the specified offset. A greater closing distance makes the "
+"interior more rounded. At zero, the interior will resemble the exterior the "
+"most."
+msgstr ""
+"O oco é feito em duas etapas: primeiro, um interior imaginário é calculado "
+"mais fundo (deslocamento mais a distância de fechamento) no objeto e, em "
+"seguida, é inflado de volta para o deslocamento especificado. Uma maior "
+"distância de fechamento torna o interior mais arredondado. Ao zero, o "
+"interior será o mais parecido com o exterior."
+
+#: src/libslic3r/PrintConfig.cpp:3330
msgid "Export OBJ"
msgstr "Exportar OBJ"
-#: src/libslic3r/PrintConfig.cpp:3131
+#: src/libslic3r/PrintConfig.cpp:3331
msgid "Export the model(s) as OBJ."
msgstr "Exportar modelo(s) como OBJ."
-#: src/libslic3r/PrintConfig.cpp:3142
+#: src/libslic3r/PrintConfig.cpp:3342
msgid "Export SLA"
msgstr "Exportar SLA"
-#: src/libslic3r/PrintConfig.cpp:3143
+#: src/libslic3r/PrintConfig.cpp:3343
msgid "Slice the model and export SLA printing layers as PNG."
msgstr "Fatiar o modelo e exportar as camadas de impressão SLA como PNG."
-#: src/libslic3r/PrintConfig.cpp:3148
+#: src/libslic3r/PrintConfig.cpp:3348
msgid "Export 3MF"
msgstr "Exportar 3MF"
-#: src/libslic3r/PrintConfig.cpp:3149
+#: src/libslic3r/PrintConfig.cpp:3349
msgid "Export the model(s) as 3MF."
msgstr "Exportar modelo(s) como 3MF."
-#: src/libslic3r/PrintConfig.cpp:3153
+#: src/libslic3r/PrintConfig.cpp:3353
msgid "Export AMF"
msgstr "Exportar AMF"
-#: src/libslic3r/PrintConfig.cpp:3154
+#: src/libslic3r/PrintConfig.cpp:3354
msgid "Export the model(s) as AMF."
msgstr "Exportar modelo(s) como AMF."
-#: src/libslic3r/PrintConfig.cpp:3158
+#: src/libslic3r/PrintConfig.cpp:3358
msgid "Export STL"
msgstr "Exportar STL"
-#: src/libslic3r/PrintConfig.cpp:3159
+#: src/libslic3r/PrintConfig.cpp:3359
msgid "Export the model(s) as STL."
msgstr "Exportar modelo(s) como STL."
-#: src/libslic3r/PrintConfig.cpp:3164
+#: src/libslic3r/PrintConfig.cpp:3364
msgid "Slice the model and export toolpaths as G-code."
msgstr "Fatiar o modelo e exportar o percurso da ferramenta como G-code."
-#: src/libslic3r/PrintConfig.cpp:3169
+#: src/libslic3r/PrintConfig.cpp:3369
msgid "Slice"
msgstr "Fatiar"
-#: src/libslic3r/PrintConfig.cpp:3170
+#: src/libslic3r/PrintConfig.cpp:3370
msgid ""
"Slice the model as FFF or SLA based on the printer_technology configuration "
"value."
@@ -9112,71 +10546,71 @@ msgstr ""
"Divida o modelo como FFF ou SLA com base no valor de config. "
"printer_technology."
-#: src/libslic3r/PrintConfig.cpp:3175
+#: src/libslic3r/PrintConfig.cpp:3375
msgid "Help"
msgstr "Ajuda"
-#: src/libslic3r/PrintConfig.cpp:3176
+#: src/libslic3r/PrintConfig.cpp:3376
msgid "Show this help."
msgstr "Mostrar esta ajuda."
-#: src/libslic3r/PrintConfig.cpp:3181
+#: src/libslic3r/PrintConfig.cpp:3381
msgid "Help (FFF options)"
msgstr "Ajuda (opções FDM)"
-#: src/libslic3r/PrintConfig.cpp:3182
+#: src/libslic3r/PrintConfig.cpp:3382
msgid "Show the full list of print/G-code configuration options."
msgstr "Mostre a lista completa de opções de config. do Print/G-code."
-#: src/libslic3r/PrintConfig.cpp:3186
+#: src/libslic3r/PrintConfig.cpp:3386
msgid "Help (SLA options)"
msgstr "Ajuda (opções SLA)"
-#: src/libslic3r/PrintConfig.cpp:3187
+#: src/libslic3r/PrintConfig.cpp:3387
msgid "Show the full list of SLA print configuration options."
msgstr "Mostrar a lista completa de opções de config. de impressão de SLA."
-#: src/libslic3r/PrintConfig.cpp:3191
+#: src/libslic3r/PrintConfig.cpp:3391
msgid "Output Model Info"
msgstr "Informações do modelo de saída"
-#: src/libslic3r/PrintConfig.cpp:3192
+#: src/libslic3r/PrintConfig.cpp:3392
msgid "Write information about the model to the console."
msgstr "Escreva informações sobre o modelo para o console."
-#: src/libslic3r/PrintConfig.cpp:3196
+#: src/libslic3r/PrintConfig.cpp:3396
msgid "Save config file"
msgstr "Salvar arquivo de config."
-#: src/libslic3r/PrintConfig.cpp:3197
+#: src/libslic3r/PrintConfig.cpp:3397
msgid "Save configuration to the specified file."
msgstr "Salvar config. para o arquivo específico."
-#: src/libslic3r/PrintConfig.cpp:3207
+#: src/libslic3r/PrintConfig.cpp:3407
msgid "Align XY"
msgstr "Alinhar XY"
-#: src/libslic3r/PrintConfig.cpp:3208
+#: src/libslic3r/PrintConfig.cpp:3408
msgid "Align the model to the given point."
msgstr "Alinhar modelo de acordo com o ponto inserido."
-#: src/libslic3r/PrintConfig.cpp:3213
+#: src/libslic3r/PrintConfig.cpp:3413
msgid "Cut model at the given Z."
msgstr "Cortar modelo ao Z fornecido."
-#: src/libslic3r/PrintConfig.cpp:3234
+#: src/libslic3r/PrintConfig.cpp:3434
msgid "Center"
msgstr "Centralizar"
-#: src/libslic3r/PrintConfig.cpp:3235
+#: src/libslic3r/PrintConfig.cpp:3435
msgid "Center the print around the given center."
msgstr "Centralizar a impressão de acordo com o centro informado."
-#: src/libslic3r/PrintConfig.cpp:3239
+#: src/libslic3r/PrintConfig.cpp:3439
msgid "Don't arrange"
msgstr "Não organizar"
-#: src/libslic3r/PrintConfig.cpp:3240
+#: src/libslic3r/PrintConfig.cpp:3440
msgid ""
"Do not rearrange the given models before merging and keep their original XY "
"coordinates."
@@ -9184,27 +10618,27 @@ msgstr ""
"Não reorganize os modelos fornecidos antes de Mesclar e manter suas "
"coordenadas XY originais."
-#: src/libslic3r/PrintConfig.cpp:3243
+#: src/libslic3r/PrintConfig.cpp:3443
msgid "Duplicate"
msgstr "Duplicar"
-#: src/libslic3r/PrintConfig.cpp:3244
+#: src/libslic3r/PrintConfig.cpp:3444
msgid "Multiply copies by this factor."
msgstr "Multiplicar cópias por esse fator."
-#: src/libslic3r/PrintConfig.cpp:3248
+#: src/libslic3r/PrintConfig.cpp:3448
msgid "Duplicate by grid"
msgstr "Duplicar por grade"
-#: src/libslic3r/PrintConfig.cpp:3249
+#: src/libslic3r/PrintConfig.cpp:3449
msgid "Multiply copies by creating a grid."
msgstr "Multiplique cópias criando uma grade."
-#: src/libslic3r/PrintConfig.cpp:3252
+#: src/libslic3r/PrintConfig.cpp:3452
msgid "Merge"
msgstr "Mesclar"
-#: src/libslic3r/PrintConfig.cpp:3253
+#: src/libslic3r/PrintConfig.cpp:3453
msgid ""
"Arrange the supplied models in a plate and merge them in a single model in "
"order to perform actions once."
@@ -9212,7 +10646,7 @@ msgstr ""
"Organize os modelos fornecidos em uma placa e junte-os em um único modelo, a "
"fim de executar ações uma só vez."
-#: src/libslic3r/PrintConfig.cpp:3258
+#: src/libslic3r/PrintConfig.cpp:3458
msgid ""
"Try to repair any non-manifold meshes (this option is implicitly added "
"whenever we need to slice the model to perform the requested action)."
@@ -9221,31 +10655,31 @@ msgstr ""
"adicionada sempre que precisamos cortar o modelo para executar a ação "
"solicitada)."
-#: src/libslic3r/PrintConfig.cpp:3262
+#: src/libslic3r/PrintConfig.cpp:3462
msgid "Rotation angle around the Z axis in degrees."
msgstr "Ângulo de rotação ao redor do eixo Zem graus."
-#: src/libslic3r/PrintConfig.cpp:3266
+#: src/libslic3r/PrintConfig.cpp:3466
msgid "Rotate around X"
msgstr "Rotacionar no X"
-#: src/libslic3r/PrintConfig.cpp:3267
+#: src/libslic3r/PrintConfig.cpp:3467
msgid "Rotation angle around the X axis in degrees."
msgstr "Ângulo de rotação ao redor do eixo X em graus."
-#: src/libslic3r/PrintConfig.cpp:3271
+#: src/libslic3r/PrintConfig.cpp:3471
msgid "Rotate around Y"
msgstr "Rotacionar no Y"
-#: src/libslic3r/PrintConfig.cpp:3272
+#: src/libslic3r/PrintConfig.cpp:3472
msgid "Rotation angle around the Y axis in degrees."
msgstr "Ângulo de rotação ao redor do eixo Y em graus."
-#: src/libslic3r/PrintConfig.cpp:3277
+#: src/libslic3r/PrintConfig.cpp:3477
msgid "Scaling factor or percentage."
msgstr "Escalando fator ou porcentagem."
-#: src/libslic3r/PrintConfig.cpp:3282
+#: src/libslic3r/PrintConfig.cpp:3482
msgid ""
"Detect unconnected parts in the given model(s) and split them into separate "
"objects."
@@ -9253,27 +10687,27 @@ msgstr ""
"Detecte peças não conectadas em um determinado modelo (s) e divida-as em "
"objetos separados."
-#: src/libslic3r/PrintConfig.cpp:3285
+#: src/libslic3r/PrintConfig.cpp:3485
msgid "Scale to Fit"
msgstr "Dimensionar para caber"
-#: src/libslic3r/PrintConfig.cpp:3286
+#: src/libslic3r/PrintConfig.cpp:3486
msgid "Scale to fit the given volume."
msgstr "Escalar para se adequar ao volume informado."
-#: src/libslic3r/PrintConfig.cpp:3295
+#: src/libslic3r/PrintConfig.cpp:3495
msgid "Ignore non-existent config files"
msgstr "Ignorar arquivos de config. não existentes"
-#: src/libslic3r/PrintConfig.cpp:3296
+#: src/libslic3r/PrintConfig.cpp:3496
msgid "Do not fail if a file supplied to --load does not exist."
msgstr "Não falhe se um arquivo fornecido para--carregamento não existe."
-#: src/libslic3r/PrintConfig.cpp:3299
+#: src/libslic3r/PrintConfig.cpp:3499
msgid "Load config file"
msgstr "Carregar arquivo de config."
-#: src/libslic3r/PrintConfig.cpp:3300
+#: src/libslic3r/PrintConfig.cpp:3500
msgid ""
"Load configuration from the specified file. It can be used more than once to "
"load options from multiple files."
@@ -9281,11 +10715,11 @@ msgstr ""
"Carregar a config. do arquivo especificado. Ele pode ser usado mais de uma "
"vez para carregar opções de vários arquivos."
-#: src/libslic3r/PrintConfig.cpp:3303
+#: src/libslic3r/PrintConfig.cpp:3503
msgid "Output File"
msgstr "Arquivo de saída"
-#: src/libslic3r/PrintConfig.cpp:3304
+#: src/libslic3r/PrintConfig.cpp:3504
msgid ""
"The file where the output will be written (if not specified, it will be "
"based on the input file)."
@@ -9293,11 +10727,11 @@ msgstr ""
"O arquivo onde a saída será gravada (se não for especificado, ele será "
"baseado no arquivo de entrada)."
-#: src/libslic3r/PrintConfig.cpp:3314
+#: src/libslic3r/PrintConfig.cpp:3514
msgid "Data directory"
msgstr "Diretório de dados"
-#: src/libslic3r/PrintConfig.cpp:3315
+#: src/libslic3r/PrintConfig.cpp:3515
msgid ""
"Load and store settings at the given directory. This is useful for "
"maintaining different profiles or including configurations from a network "
@@ -9306,23 +10740,26 @@ msgstr ""
"Carregar e armazenar as config. no diretório especificado. Isso é útil para "
"manter perfis diferentes ou incluir config. de um armazenamento de rede."
-#: src/libslic3r/PrintConfig.cpp:3318
+#: src/libslic3r/PrintConfig.cpp:3518
msgid "Logging level"
msgstr "Nível de registro"
-#: src/libslic3r/PrintConfig.cpp:3319
+#: src/libslic3r/PrintConfig.cpp:3519
msgid ""
-"Messages with severity lower or eqal to the loglevel will be printed out. 0:"
-"trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
+"Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:"
+"trace\n"
+"For example. loglevel=2 logs fatal, error and warning level messages."
msgstr ""
-"Mensagens com severidade menor ou igual para o LogLevel serão impressos. 0: "
-"Trace, 1: debug, 2: info, 3: aviso, 4: erro, 5: fatal"
+"Define a sensibilidade de registro. 0:fatal, 1:erro, 2:warning, 3:info, 4:"
+"debug, 5:trace\n"
+"Por exemplo. loglevel=2 logs de mensagens fatais, de nível de erro e de "
+"aviso."
-#: src/libslic3r/PrintConfig.cpp:3324
+#: src/libslic3r/PrintConfig.cpp:3525
msgid "Render with a software renderer"
msgstr "Renderizar com um software renderizador"
-#: src/libslic3r/PrintConfig.cpp:3325
+#: src/libslic3r/PrintConfig.cpp:3526
msgid ""
"Render with a software renderer. The bundled MESA software renderer is "
"loaded instead of the default OpenGL driver."
@@ -9330,57 +10767,94 @@ msgstr ""
"Renderizar com um software renderizador. O renderizador de software MESA "
"empacotado é carregado em vez do driver OpenGL padrão."
-#: src/libslic3r/PrintObject.cpp:110
+#: src/libslic3r/PrintObject.cpp:108
msgid "Processing triangulated mesh"
msgstr "Processando malha triangulada"
-#: src/libslic3r/PrintObject.cpp:141
+#: src/libslic3r/PrintObject.cpp:152
msgid "Generating perimeters"
msgstr "Gerando perímetros"
-#: src/libslic3r/PrintObject.cpp:251
+#: src/libslic3r/PrintObject.cpp:255
msgid "Preparing infill"
msgstr "Preparando o preenchimento"
-#: src/libslic3r/PrintObject.cpp:391
+#: src/libslic3r/PrintObject.cpp:395
msgid "Generating support material"
msgstr "Gerando material de suporte"
-#: src/libslic3r/GCode/PreviewData.cpp:160
-msgid "Mixed"
-msgstr "Misto"
-
-#: src/libslic3r/GCode/PreviewData.cpp:380
+#: src/libslic3r/GCode/PreviewData.cpp:347
msgid "Height (mm)"
msgstr "Altura (mm)"
-#: src/libslic3r/GCode/PreviewData.cpp:382
+#: src/libslic3r/GCode/PreviewData.cpp:349
msgid "Width (mm)"
msgstr "Espessura (mm)"
-#: src/libslic3r/GCode/PreviewData.cpp:384
+#: src/libslic3r/GCode/PreviewData.cpp:351
msgid "Speed (mm/s)"
msgstr "Velocidade (mm/s)"
-#: src/libslic3r/GCode/PreviewData.cpp:386
-msgid "Volumetric flow rate (mm3/s)"
-msgstr "Fluxo volumétrico (mm3/s)"
+#: src/libslic3r/GCode/PreviewData.cpp:353
+msgid "Fan Speed (%)"
+msgstr "Velocidade da ventoinha (%)"
-#: src/libslic3r/GCode/PreviewData.cpp:477
-msgid "Default print color"
-msgstr "Cor de impressão padrão"
+#: src/libslic3r/GCode/PreviewData.cpp:355
+msgid "Volumetric flow rate (mm³/s)"
+msgstr "Vazão volumétrica (mm³/s)"
-#: src/libslic3r/GCode/PreviewData.cpp:484
-#, c-format
-msgid "up to %.2f mm"
-msgstr "até %.2f mm"
+#~ msgid "Layers heights"
+#~ msgstr "Altura de camada"
-#: src/libslic3r/GCode/PreviewData.cpp:488
-#, c-format
-msgid "above %.2f mm"
-msgstr "acima de %.2f mm"
+#~ msgid "Position (mm)"
+#~ msgstr "Posição (mm)"
-#: src/libslic3r/GCode/PreviewData.cpp:493
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr "%.2f - %.2f mm"
+#~ msgid "Displacement (mm)"
+#~ msgstr "Deslocamento (mm)"
+
+#~ msgid "Rotation (deg)"
+#~ msgstr "Rotacionar (graus)"
+
+#~ msgid "Scale (%)"
+#~ msgstr "Escala (%)"
+
+#~ msgid "Change Application &Language"
+#~ msgstr "Mudar &idioma"
+
+#~ msgid "Select new extruder for the object/part"
+#~ msgstr "Selecionar nova extrusora para objeto/parte"
+
+#~ msgid "Select extruder number for selected objects and/or parts"
+#~ msgstr ""
+#~ "Selecione o número da extrusora para objetos e/ou peças selecionados"
+
+#~ msgid "Object Manipulation"
+#~ msgstr "Manipulação de objeto"
+
+#~ msgid "Main Shortcuts"
+#~ msgstr "Atalhos principais"
+
+#~ msgid "Select All objects"
+#~ msgstr "Selecionar todos os objetos"
+
+#~ msgid "Delete All"
+#~ msgstr "Deletar todos"
+
+#~ msgid "Zoom to selected object"
+#~ msgstr "Ampliar para o objeto selecionado"
+
+#~ msgid "Plater Shortcuts"
+#~ msgstr "Atalhos da bandeja"
+
+#~ msgid "Preview Shortcuts"
+#~ msgstr "Atalhos de visualização"
+
+#~ msgid "The selected project is no more available"
+#~ msgstr "O projeto selecionado não está mais disponível"
+
+#~ msgid ""
+#~ "Messages with severity lower or eqal to the loglevel will be printed out. "
+#~ "0:trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
+#~ msgstr ""
+#~ "Mensagens com severidade menor ou igual para o LogLevel serão impressos. "
+#~ "0: Trace, 1: debug, 2: info, 3: aviso, 4: erro, 5: fatal"
diff --git a/resources/localization/tr/PrusaSlicer.mo b/resources/localization/tr/PrusaSlicer.mo
index ad28072e06..8b8b27069b 100644
Binary files a/resources/localization/tr/PrusaSlicer.mo and b/resources/localization/tr/PrusaSlicer.mo differ
diff --git a/resources/localization/tr/PrusaSlicer_tr.po b/resources/localization/tr/PrusaSlicer_tr.po
index be59157426..16af1a8367 100644
--- a/resources/localization/tr/PrusaSlicer_tr.po
+++ b/resources/localization/tr/PrusaSlicer_tr.po
@@ -3679,13 +3679,15 @@ msgstr "CA sertifika dosyasını aç"
#: src/slic3r/GUI/Tab.cpp:1810
#, c-format
msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
+"On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."
msgstr ""
-"HTTPS CA Dosyası:\n"
-" \tBu sistemde, %s , sistem Sertifika Deposu veya Anahtarlıktan HTTPS sertifikaları kullanır.\n"
-" \tÖzel bir CA dosyası kullanmak için, lütfen CA dosyanızı Sertifika Deposu/Anahtarlık içine aktarın."
+"Bu sistemde, %s , sistem Sertifika Deposu veya Anahtarlıktan HTTPS sertifikaları kullanır."
+
+#: src/slic3r/GUI/Tab.cpp:1810
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr ""
+"Özel bir CA dosyası kullanmak için, lütfen CA dosyanızı Sertifika Deposu/Anahtarlık içine aktarın."
#: src/slic3r/GUI/Tab.cpp:1850 src/slic3r/GUI/Tab.cpp:2051
msgid "Size and coordinates"
@@ -3948,11 +3950,11 @@ msgstr "BEYAZ NOKTA"
#. TRN Description for "WHITE BULLET"
#: src/slic3r/GUI/Tab.cpp:3129
msgid ""
-"for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
-"sol tuş için: \tsistem dışı bir ön ayarı gösterir,\n"
-"sağ tuş için: \tayarların değiştirilmediğini gösterir."
+"sol tuş için: sistem dışı bir ön ayarı gösterir,\n"
+"sağ tuş için: ayarların değiştirilmediğini gösterir."
#: src/slic3r/GUI/Tab.cpp:3103
msgid "BACK ARROW"
diff --git a/resources/localization/zh_cn/PrusaSlicer.mo b/resources/localization/zh_cn/PrusaSlicer.mo
index 2d8b31823e..74bbb3d69d 100644
Binary files a/resources/localization/zh_cn/PrusaSlicer.mo and b/resources/localization/zh_cn/PrusaSlicer.mo differ
diff --git a/resources/localization/zh_cn/PrusaSlicer_zh_CN.po b/resources/localization/zh_cn/PrusaSlicer_zh_CN.po
index 3a13519bb5..a46b217415 100644
--- a/resources/localization/zh_cn/PrusaSlicer_zh_CN.po
+++ b/resources/localization/zh_cn/PrusaSlicer_zh_CN.po
@@ -4106,11 +4106,9 @@ msgstr "当前预设从默认预设继承。"
#: src/slic3r/GUI/Tab.cpp:947
#, c-format
msgid ""
-"Current preset is inherited from:\n"
-"\t%s"
+"Current preset is inherited from"
msgstr ""
-"当前预设继承自:\n"
-"\t%s"
+"当前预设继承自"
#: src/slic3r/GUI/Tab.cpp:951
msgid "It can't be deleted or modified."
@@ -4375,15 +4373,17 @@ msgstr "打开 CA 证书文件"
#: src/slic3r/GUI/Tab.cpp:1959
#, c-format
msgid ""
-"HTTPS CA File:\n"
-" \tOn this system, %s uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-" \tTo use a custom CA file, please import your CA file into Certificate "
+"On this system, %s uses HTTPS certificates from the system Certificate "
+"Store or Keychain."
+msgstr ""
+"在此系统上,%s 使用来自系统证书存储或钥匙串的 HTTPS 证书。"
+
+#: src/slic3r/GUI/Tab.cpp:1959
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate "
"Store / Keychain."
msgstr ""
-"HTTPS CA 文件:\n"
-" \t在此系统上,%s 使用来自系统证书存储或钥匙串的 HTTPS 证书。\n"
-" \t要使用自定义 CA 文件,请将 CA 文件导入证书存储/钥匙串。"
+"要使用自定义 CA 文件,请将 CA 文件导入证书存储/钥匙串。"
#: src/slic3r/GUI/Tab.cpp:1999 src/slic3r/GUI/Tab.cpp:2240
msgid "Size and coordinates"
@@ -4671,8 +4671,8 @@ msgstr "白色子弹"
#. TRN Description for "WHITE BULLET"
#: src/slic3r/GUI/Tab.cpp:3424
msgid ""
-"for the left button: \tindicates a non-system (or non-default) preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"for the left button: indicates a non-system (or non-default) preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
"对于左侧按钮:指示非系统(或非默认)预设,\n"
"对于右侧按钮:指示设置尚未修改。"
diff --git a/resources/localization/zh_tw/PrusaSlicer.mo b/resources/localization/zh_tw/PrusaSlicer.mo
index 12b1a17eb0..61b0de0191 100644
Binary files a/resources/localization/zh_tw/PrusaSlicer.mo and b/resources/localization/zh_tw/PrusaSlicer.mo differ
diff --git a/resources/localization/zh_tw/PrusaSlicer_zh_TW.po b/resources/localization/zh_tw/PrusaSlicer_zh_TW.po
index ce35bc342a..9e37785dc6 100644
--- a/resources/localization/zh_tw/PrusaSlicer_zh_TW.po
+++ b/resources/localization/zh_tw/PrusaSlicer_zh_TW.po
@@ -3049,8 +3049,8 @@ msgid "It's a system preset."
msgstr "這是一個系統預設。"
#: src/slic3r/GUI/Tab.cpp:860
-msgid "Current preset is inherited from "
-msgstr "當前預設繼承自 "
+msgid "Current preset is inherited from"
+msgstr "當前預設繼承自"
#: src/slic3r/GUI/Tab.cpp:865
msgid "It can't be deleted or modified. "
@@ -3391,16 +3391,19 @@ msgid "Open CA certificate file"
msgstr "打開 CA 證書文件"
#: src/slic3r/GUI/Tab.cpp:1725
+#, c-format
msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
+"On this system, %s uses HTTPS certificates from the system Certificate "
+"Store or Keychain."
+msgstr ""
+"在此係統上, %s 使用來自系統證書存儲或鑰匙串的 https 證書。"
+
+#: src/slic3r/GUI/Tab.cpp:1725
+msgid ""
+"To use a custom CA file, please import your CA file into Certificate "
"Store / Keychain."
msgstr ""
-"HTTPS CA 文件:\n"
-"\t在此係統上, Slic3r 使用來自系統證書存儲或鑰匙串的 https 證書。\n"
-"\t要使用自定義 CA 文件, 請將 CA 文件導入到證書存儲/鑰匙串。"
+"要使用自定義 CA 文件, 請將 CA 文件導入到證書存儲/鑰匙串。"
#: src/slic3r/GUI/Tab.cpp:1763 src/slic3r/GUI/Tab.cpp:1964
msgid "Size and coordinates"
@@ -3664,11 +3667,11 @@ msgstr ""
#: src/slic3r/GUI/Tab.cpp:2998
msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
+"WHITE BULLET;for the left button: indicates a non-system preset,\n"
+"for the right button: indicates that the settings hasn't been modified."
msgstr ""
-"白色彈頭; 對於左側按鈕: \t表示非系統預設,\n"
-"對於右側按鈕: \t表示設置尚未被修改。"
+"白色彈頭; 對於左側按鈕: 表示非系統預設,\n"
+"對於右側按鈕: 表示設置尚未被修改。"
#: src/slic3r/GUI/Tab.cpp:3002
msgid ""
diff --git a/resources/profiles/BIBO.idx b/resources/profiles/BIBO.idx
new file mode 100644
index 0000000000..f8ad05323b
--- /dev/null
+++ b/resources/profiles/BIBO.idx
@@ -0,0 +1,13 @@
+min_slic3r_version = 2.2.0-alpha3
+0.0.1 Multiple Print models were unified into a single one.
+0.0.1-beta2 Bed model and textures added. Materials all use the BOBO2 identifier. deretract speed set to 0 to use retract speed.
+0.0.1-beta1 Added new printer profiles for ditto printing. New retraction settings, new materials. Removed some settings which do not apply. More start gcode improvements.
+0.0.1-alpha13 Adjusted Jerk, Acceleration, and maximum feedrates to better match the stock firmware. For Dual extrusion, tool change retractions were increased.
+0.0.1-alpha12 github repo created for version history
+0.0.1-alpha11 Revised version available to community for testing. Removed PVA and HIPS disolvable support materials from single extruder versions. Improved single extruder second nozzle standby temperature
+0.0.1-alpha8 Available to community Early adopters for testing. Corrected filament settings to prevent duplicates, and reworked start and end gcode.
+# The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 0.0.1-alpha12 and newer,
+# so they will see the print bed.
+max_slic3r_version = 2.2.0-alpha2
+min_slic3r_version = 2.2.0-alpha0
+0.0.1-alpha Initial version
diff --git a/resources/profiles/BIBO.ini b/resources/profiles/BIBO.ini
new file mode 100644
index 0000000000..8247a34a79
--- /dev/null
+++ b/resources/profiles/BIBO.ini
@@ -0,0 +1,858 @@
+# Print profiles for the BIBO printers.
+
+[vendor]
+# Vendor name will be shown by the Config Wizard.
+name = BIBO
+# Configuration version of this file. Config file will only be installed, if the config_version differs.
+# This means, the server may force the PrusaSlicer configuration to be downgraded.
+config_version = 0.0.1
+# Where to get the updates from?
+config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/BIBO/
+
+# The printer models will be shown by the Configuration Wizard in this order,
+# also the first model installed & the first nozzle installed will be activated after install.
+# Printer model name will be shown by the installation wizard.
+
+[printer_model:BIBO2]
+name = BIBO2 Touch
+variants = 0.4
+technology = FFF
+family = BIBO2
+bed_model = BIBO2_bed.stl
+bed_texture = BIBO2.svg
+default_materials = Generic PLA @BIBO2; Generic PETG @BIBO2; Generic ABS @BIBO2; Prusament PLA @BIBO2; Prusament PETG @BIBO2
+
+# All presets starting with asterisk, for example *common*, are intermediate and they will
+# not make it into the user interface.
+
+# Common print preset
+[print:*common*]
+avoid_crossing_perimeters = 0
+bottom_fill_pattern = rectilinear
+bridge_angle = 0
+bridge_flow_ratio = 0.95
+bridge_speed = 25
+brim_width = 0
+clip_multipart_objects = 1
+compatible_printers =
+complete_objects = 0
+dont_support_bridges = 1
+elefant_foot_compensation = 0
+ensure_vertical_shell_thickness = 1
+external_fill_pattern = rectilinear
+external_perimeters_first = 0
+external_perimeter_extrusion_width = 0.45
+extra_perimeters = 0
+extruder_clearance_height = 12
+extruder_clearance_radius = 45
+extrusion_width = 0.45
+fill_angle = 45
+fill_density = 20%
+fill_pattern = grid
+first_layer_extrusion_width = 0.42
+first_layer_height = 0.2
+first_layer_speed = 20
+gap_fill_speed = 30
+gcode_comments = 0
+infill_every_layers = 1
+infill_extruder = 1
+infill_extrusion_width = 0.45
+infill_first = 0
+infill_only_where_needed = 0
+infill_overlap = 25%
+interface_shells = 0
+max_print_speed = 60
+max_volumetric_extrusion_rate_slope_negative = 0
+max_volumetric_extrusion_rate_slope_positive = 0
+max_volumetric_speed = 0
+min_skirt_length = 4
+notes =
+overhangs = 1
+only_retract_when_crossing_perimeters = 0
+ooze_prevention = 0
+output_filename_format = {input_filename_base}_{layer_height}mm_{if num_extruders==1}{filament_type[0]}{else}E1{filament_type[0]}_E2{filament_type[1]}{endif}_{printer_model}_{print_time}.gcode
+perimeters = 2
+perimeter_extruder = 1
+perimeter_extrusion_width = 0.45
+post_process =
+print_settings_id =
+raft_layers = 0
+resolution = 0
+seam_position = aligned
+single_extruder_multi_material_priming = 0
+skirts = 3
+skirt_distance = 2
+skirt_height = 1
+small_perimeter_speed = 25
+solid_infill_below_area = 0
+solid_infill_every_layers = 0
+solid_infill_extruder = 1
+solid_infill_extrusion_width = 0.45
+spiral_vase = 0
+standby_temperature_delta = -5
+support_material = 0
+support_material_extruder = 0
+support_material_extrusion_width = 0.4
+support_material_interface_extruder = 0
+support_material_angle = 0
+support_material_buildplate_only = 0
+support_material_enforce_layers = 0
+support_material_contact_distance = 0.15
+support_material_interface_contact_loops = 0
+support_material_interface_layers = 2
+support_material_interface_spacing = 0.2
+support_material_interface_speed = 100%
+support_material_pattern = rectilinear
+support_material_spacing = 2
+support_material_speed = 40
+support_material_synchronize_layers = 0
+support_material_threshold = 45
+support_material_with_sheath = 0
+support_material_xy_spacing = 60%
+thin_walls = 0
+top_infill_extrusion_width = 0.45
+top_solid_infill_speed = 40
+travel_speed = 130
+wipe_tower = 0
+wipe_tower_bridging = 10
+wipe_tower_rotation_angle = 0
+wipe_tower_width = 60
+wipe_tower_x = 50
+wipe_tower_y = 50
+xy_size_compensation = 0
+
+[print:*0.05mm*]
+inherits = *common*
+bottom_solid_layers = 10
+bridge_acceleration = 300
+bridge_flow_ratio = 0.7
+default_acceleration = 500
+external_perimeter_speed = 20
+fill_density = 20%
+first_layer_acceleration = 250
+gap_fill_speed = 20
+infill_acceleration = 800
+infill_speed = 30
+max_print_speed = 60
+small_perimeter_speed = 20
+solid_infill_speed = 30
+support_material_extrusion_width = 0.3
+support_material_spacing = 1.5
+layer_height = 0.05
+perimeter_acceleration = 300
+perimeter_speed = 30
+perimeters = 3
+support_material_speed = 30
+top_solid_infill_speed = 20
+top_solid_layers = 15
+
+[print:*0.07mm*]
+inherits = *common*
+bottom_solid_layers = 8
+bridge_acceleration = 300
+bridge_flow_ratio = 0.7
+bridge_speed = 20
+default_acceleration = 1000
+external_perimeter_speed = 20
+fill_density = 15%
+first_layer_acceleration = 500
+gap_fill_speed = 20
+infill_acceleration = 800
+infill_speed = 40
+max_print_speed = 60
+small_perimeter_speed = 20
+solid_infill_speed = 40
+support_material_extrusion_width = 0.3
+support_material_spacing = 1.5
+layer_height = 0.07
+perimeter_acceleration = 300
+perimeter_speed = 30
+perimeters = 3
+support_material_speed = 40
+top_solid_infill_speed = 30
+top_solid_layers = 11
+
+[print:*0.10mm*]
+inherits = *common*
+bottom_solid_layers = 7
+bridge_flow_ratio = 0.7
+layer_height = 0.1
+perimeter_acceleration = 800
+top_solid_layers = 9
+
+[print:*0.12mm*]
+inherits = *common*
+perimeter_speed = 40
+external_perimeter_speed = 25
+infill_speed = 50
+solid_infill_speed = 40
+layer_height = 0.12
+perimeters = 3
+top_infill_extrusion_width = 0.4
+bottom_solid_layers = 6
+top_solid_layers = 7
+
+[print:*0.15mm*]
+inherits = *common*
+external_perimeter_speed = 40
+infill_acceleration = 1100
+infill_speed = 50
+layer_height = 0.15
+perimeter_acceleration = 800
+perimeter_speed = 40
+solid_infill_speed = 40
+top_infill_extrusion_width = 0.4
+bottom_solid_layers = 5
+top_solid_layers = 7
+
+[print:*0.20mm*]
+inherits = *common*
+perimeter_speed = 40
+external_perimeter_speed = 25
+infill_speed = 50
+solid_infill_speed = 40
+layer_height = 0.20
+top_infill_extrusion_width = 0.4
+bottom_solid_layers = 4
+top_solid_layers = 5
+
+[print:*0.24mm*]
+inherits = *common*
+perimeter_speed = 40
+external_perimeter_speed = 25
+infill_speed = 50
+solid_infill_speed = 40
+layer_height = 0.24
+top_infill_extrusion_width = 0.45
+bottom_solid_layers = 3
+top_solid_layers = 4
+
+[print:*0.28mm*]
+inherits = *common*
+perimeter_speed = 40
+external_perimeter_speed = 25
+infill_speed = 50
+solid_infill_speed = 40
+layer_height = 0.28
+top_infill_extrusion_width = 0.45
+bottom_solid_layers = 3
+top_solid_layers = 4
+
+[print:*0.30mm*]
+inherits = *common*
+bottom_solid_layers = 4
+bridge_flow_ratio = 0.95
+external_perimeter_speed = 40
+infill_acceleration = 1100
+infill_speed = 60
+layer_height = 0.3
+perimeter_acceleration = 800
+perimeter_speed = 50
+solid_infill_speed = 50
+top_infill_extrusion_width = 0.4
+top_solid_layers = 4
+
+[print:*soluble_support*]
+inherits = *common*
+overhangs = 1
+skirts = 0
+support_material = 1
+support_material_contact_distance = 0
+support_material_extruder = 2
+support_material_extrusion_width = 0.45
+support_material_interface_extruder = 2
+support_material_interface_layers = 3
+support_material_interface_spacing = 0.1
+support_material_synchronize_layers = 1
+support_material_threshold = 80
+support_material_with_sheath = 1
+wipe_tower_bridging = 6
+support_material_interface_speed = 80%
+perimeter_speed = 40
+solid_infill_speed = 40
+top_infill_extrusion_width = 0.45
+top_solid_infill_speed = 30
+
+[print:0.05mm ULTRADETAIL @BIBO2]
+inherits = *0.05mm*
+# alias = 0.05mm ULTRADETAIL
+infill_extrusion_width = 0.5
+
+[print:0.07mm SUPERDETAIL @BIBO2]
+inherits = *0.07mm*
+# alias = 0.07mm SUPERDETAIL
+infill_extrusion_width = 0.5
+
+[print:0.10mm HIGHDETAIL @BIBO2]
+inherits = *0.10mm*
+# alias = 0.10mm HIGHDETAIL
+infill_extrusion_width = 0.5
+
+[print:0.12mm DETAIL @BIBO2]
+inherits = *0.12mm*
+# alias = 0.12mm DETAIL
+travel_speed = 130
+infill_speed = 50
+solid_infill_speed = 40
+top_solid_infill_speed = 30
+support_material_extrusion_width = 0.38
+
+[print:0.15mm OPTIMAL @BIBO2]
+inherits = *0.15mm*
+# alias = 0.15mm OPTIMAL
+top_infill_extrusion_width = 0.45
+
+[print:0.20mm NORMAL @BIBO2]
+inherits = *0.20mm*
+# alias = 0.20mm NORMAL
+travel_speed = 130
+infill_speed = 50
+solid_infill_speed = 40
+top_solid_infill_speed = 30
+support_material_extrusion_width = 0.38
+
+[print:0.24mm DRAFT @BIBO2]
+inherits = *0.24mm*
+# alias = 0.24mm DRAFT
+travel_speed = 130
+infill_speed = 50
+solid_infill_speed = 40
+top_solid_infill_speed = 30
+support_material_extrusion_width = 0.38
+
+[print:0.28mm SUPERDRAFT @BIBO2]
+inherits = *0.28mm*
+# alias = 0.28mm SUPERDRAFT
+travel_speed = 130
+infill_speed = 50
+solid_infill_speed = 40
+top_solid_infill_speed = 30
+support_material_extrusion_width = 0.38
+
+[print:0.30mm ULTRADRAFT @BIBO2]
+inherits = *0.30mm*
+# alias = 0.30mm ULTRADRAFT
+bottom_solid_layers = 3
+bridge_speed = 30
+external_perimeter_speed = 35
+infill_acceleration = 1100
+infill_speed = 55
+max_print_speed = 60
+perimeter_speed = 50
+small_perimeter_speed = 30
+solid_infill_speed = 50
+top_solid_infill_speed = 40
+support_material_speed = 45
+external_perimeter_extrusion_width = 0.6
+extrusion_width = 0.5
+first_layer_extrusion_width = 0.42
+infill_extrusion_width = 0.5
+perimeter_extrusion_width = 0.5
+solid_infill_extrusion_width = 0.5
+top_infill_extrusion_width = 0.45
+support_material_extrusion_width = 0.38
+
+# Soluble Supports Profiles for dual extrusion #
+[print:0.15mm OPTIMAL SOLUBLE FULL @BIBO2]
+inherits = 0.15mm OPTIMAL @BIBO2; *soluble_support*
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_BIBO.*/ and num_extruders==2
+external_perimeter_speed = 25
+notes = Set your soluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
+support_material_extruder = 2
+perimeter_speed = 40
+solid_infill_speed = 40
+top_infill_extrusion_width = 0.45
+top_solid_infill_speed = 30
+
+[print:0.15mm OPTIMAL SOLUBLE INTERFACE @BIBO2]
+inherits = 0.15mm OPTIMAL SOLUBLE FULL @BIBO2
+notes = Set your soluble extruder in Multiple Extruders > Support material/raft interface extruder
+support_material_interface_layers = 3
+support_material_with_sheath = 0
+support_material_xy_spacing = 80%
+
+[print:0.20mm NORMAL SOLUBLE FULL @BIBO2]
+inherits = 0.20mm NORMAL @BIBO2; *soluble_support*
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_BIBO.*/ and num_extruders==2
+external_perimeter_speed = 30
+notes = Set your soluble extruder in Multiple Extruders > Support material/raft/skirt extruder & Support material/raft interface extruder
+support_material_extruder = 2
+perimeter_speed = 40
+solid_infill_speed = 40
+top_solid_infill_speed = 30
+
+[print:0.20mm NORMAL SOLUBLE INTERFACE @BIBO2]
+inherits = 0.20mm NORMAL SOLUBLE FULL @BIBO2
+notes = Set your soluble extruder in Multiple Extruders > Support material/raft interface extruder
+support_material_interface_layers = 3
+support_material_with_sheath = 0
+support_material_xy_spacing = 80%
+
+# Common filament preset
+[filament:*common*]
+cooling = 0
+compatible_printers =
+extrusion_multiplier = 1
+filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
+filament_minimal_purge_on_wipe_tower = 15
+filament_cost = 0
+filament_density = 0
+filament_diameter = 1.75
+filament_notes = ""
+filament_settings_id = ""
+filament_soluble = 0
+min_print_speed = 15
+slowdown_below_layer_time = 20
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_BIBO.*/
+
+[filament:*PLA*]
+inherits = *common*
+bed_temperature = 60
+fan_below_layer_time = 100
+filament_colour = #FF3232
+filament_max_volumetric_speed = 15
+filament_type = PLA
+filament_density = 1.24
+filament_cost = 20
+first_layer_bed_temperature = 60
+first_layer_temperature = 215
+fan_always_on = 1
+cooling = 1
+max_fan_speed = 100
+min_fan_speed = 100
+bridge_fan_speed = 100
+disable_fan_first_layers = 3
+temperature = 200
+
+[filament:*PET*]
+inherits = *common*
+bed_temperature = 70
+cooling = 1
+disable_fan_first_layers = 3
+fan_below_layer_time = 20
+filament_colour = #FF8000
+filament_max_volumetric_speed = 8
+filament_type = PETG
+filament_density = 1.27
+filament_cost = 30
+first_layer_bed_temperature =70
+first_layer_temperature = 240
+fan_always_on = 1
+max_fan_speed = 50
+min_fan_speed = 20
+bridge_fan_speed = 100
+temperature = 240
+
+[filament:*ABS*]
+inherits = *common*
+bed_temperature = 100
+cooling = 0
+disable_fan_first_layers = 3
+fan_below_layer_time = 20
+filament_colour = #FFF2EC
+filament_max_volumetric_speed = 11
+filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
+filament_type = ABS
+filament_density = 1.04
+filament_cost = 20
+first_layer_bed_temperature = 100
+first_layer_temperature = 245
+fan_always_on = 0
+max_fan_speed = 0
+min_fan_speed = 0
+bridge_fan_speed = 25
+top_fan_speed = 0
+temperature = 245
+
+[filament:*FLEX*]
+inherits = *common*
+bed_temperature = 50
+bridge_fan_speed = 80
+# For now, all but selected filaments are disabled for the MMU 2.0
+cooling = 0
+disable_fan_first_layers = 3
+extrusion_multiplier = 1.2
+fan_always_on = 0
+fan_below_layer_time = 100
+filament_colour = #008000
+filament_max_volumetric_speed = 1.5
+filament_type = FLEX
+first_layer_bed_temperature = 50
+first_layer_temperature = 240
+max_fan_speed = 90
+min_fan_speed = 70
+#start_filament_gcode = "M900 K0"; Filament gcode"
+temperature = 240
+filament_retract_length = 0.8
+filament_deretract_speed = 15
+filament_retract_lift = 0
+filament_wipe = 0
+
+[filament:Generic PLA @BIBO2]
+inherits = *PLA*
+filament_vendor = Generic
+filament_notes = "List of materials which typically use standard PLA print settings:\n\nDas Filament\nEsun PLA\nEUMAKERS PLA\nFiberlogy HD-PLA\nFillamentum PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladec PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nVerbatim PLA\nVerbatim BVOH"
+
+[filament:Generic PETG @BIBO2]
+inherits = *PET*
+filament_vendor = Generic
+
+[filament:Generic ABS @BIBO2]
+inherits = *ABS*
+first_layer_bed_temperature = 90
+bed_temperature = 90
+filament_vendor = Generic
+filament_cost = 27.82
+filament_density = 1.08
+fan_always_on = 0
+cooling = 0
+min_fan_speed = 15
+max_fan_speed = 15
+slowdown_below_layer_time = 20
+disable_fan_first_layers = 4
+fan_below_layer_time = 20
+bridge_fan_speed = 25
+
+[filament:Esun ABS @BIBO2]
+inherits = Generic ABS @BIBO2
+filament_vendor = Esun
+filament_cost = 27.82
+filament_density = 1.08
+fan_always_on = 0
+cooling = 0
+min_fan_speed = 15
+max_fan_speed = 15
+slowdown_below_layer_time = 20
+disable_fan_first_layers = 4
+fan_below_layer_time = 20
+bridge_fan_speed = 25
+
+[filament:Hatchbox ABS @BIBO2]
+inherits = Generic ABS @BIBO2
+filament_vendor = Hatchbox
+filament_cost = 27.82
+filament_density = 1.08
+fan_always_on = 0
+cooling = 0
+min_fan_speed = 15
+max_fan_speed = 15
+slowdown_below_layer_time = 20
+disable_fan_first_layers = 4
+fan_below_layer_time = 20
+bridge_fan_speed = 25
+
+[filament:Generic HIPS @BIBO2]
+inherits = *ABS*
+filament_vendor = Generic
+filament_cost = 27.3
+filament_density = 1.04
+bridge_fan_speed = 50
+cooling = 1
+extrusion_multiplier = 1
+fan_always_on = 1
+fan_below_layer_time = 10
+filament_colour = #FFFFD7
+filament_soluble = 1
+filament_type = HIPS
+first_layer_temperature = 230
+max_fan_speed = 20
+min_fan_speed = 20
+temperature = 230
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_BIBO.*/ and num_extruders==2
+
+[filament:AMOLEN bronze PLA @BIBO2]
+inherits = *PLA*
+filament_vendor = AMOLEN
+temperature = 205
+bed_temperature = 65
+filament_colour = #808040
+first_layer_bed_temperature = 65
+first_layer_temperature = 215
+filament_cost = 25.99
+filament_density = 1.24
+
+[filament:Prusament PLA @BIBO2]
+inherits = *PLA*
+filament_vendor = Prusa Polymers
+temperature = 215
+bed_temperature = 60
+first_layer_temperature = 215
+first_layer_bed_temperature = 60
+filament_cost = 24.99
+filament_density = 1.24
+
+[filament:Prusament PETG @BIBO2]
+inherits = *PET*
+filament_vendor = Prusa Polymers
+temperature = 245
+bed_temperature = 70
+first_layer_temperature = 245
+first_layer_bed_temperature =70
+filament_cost = 24.99
+filament_density = 1.27
+
+[filament:PrimaSelect PVA+ @BIBO2]
+inherits = *PLA*
+filament_vendor = PrimaSelect
+filament_cost = 108
+filament_density = 1.23
+cooling = 0
+fan_always_on = 0
+filament_colour = #FFFFD7
+filament_max_volumetric_speed = 3.8
+filament_ramming_parameters = "120 100 8.3871 8.6129 8.93548 9.22581 9.48387 9.70968 9.87097 10.0323 10.2258 10.4194 10.6452 10.8065| 0.05 8.34193 0.45 8.73548 0.95 9.34836 1.45 9.78385 1.95 10.0871 2.45 10.5161 2.95 10.8903 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
+filament_soluble = 1
+filament_type = PVA
+first_layer_temperature = 195
+temperature = 195
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_BIBO.*/ and num_extruders==2
+
+[filament:No Filament - standby only @BIBO2]
+first_layer_temperature = 170
+temperature = 170
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_BIBO.*/ and num_extruders==2
+
+[filament:Generic FLEX @BIBO2]
+inherits = *FLEX*
+filament_vendor = Generic
+filament_cost = 82
+filament_density = 1.22
+filament_max_volumetric_speed = 1.2
+filament_retract_length = 0
+filament_retract_speed = nil
+filament_retract_lift = nil
+
+[filament:Overture TPU @BIBO2]
+inherits = *FLEX*
+filament_vendor = Overture
+filament_max_volumetric_speed = 1.5
+first_layer_temperature = 235
+first_layer_bed_temperature = 50
+temperature = 235
+bed_temperature = 50
+bridge_fan_speed = 100
+max_fan_speed = 80
+min_fan_speed = 80
+filament_retract_before_travel = 3
+filament_cost = 23.99
+filament_density = 1.21
+
+[filament:SainSmart TPU @BIBO2]
+inherits = *FLEX*
+filament_vendor = SainSmart
+fan_always_on = 1
+filament_max_volumetric_speed = 2.5
+extrusion_multiplier = 1.15
+first_layer_temperature = 230
+first_layer_bed_temperature = 50
+temperature = 230
+bed_temperature = 50
+bridge_fan_speed = 100
+max_fan_speed = 80
+min_fan_speed = 80
+filament_retract_before_travel = 3
+filament_cost = 32.99
+filament_density = 1.21
+filament_retract_length = 0.5
+filament_retract_speed = nil
+filament_deretract_speed = 15
+filament_retract_lift = 0
+filament_wipe = 0
+disable_fan_first_layers = 3
+min_print_speed = 15
+slowdown_below_layer_time = 10
+cooling = 1
+
+[filament:Filatech FilaFlex40 @BIBO2]
+inherits = *FLEX*
+filament_vendor = Filatech
+fan_always_on = 1
+filament_max_volumetric_speed = 2.5
+extrusion_multiplier = 1.15
+first_layer_temperature = 230
+first_layer_bed_temperature = 50
+temperature = 230
+bed_temperature = 50
+bridge_fan_speed = 100
+max_fan_speed = 50
+min_fan_speed = 50
+filament_retract_before_travel = 3
+filament_cost = 51.45
+filament_density = 1.22
+filament_retract_length = 0.5
+filament_retract_speed = 20
+filament_deretract_speed = 15
+filament_retract_lift = 0
+filament_wipe = 0
+disable_fan_first_layers = 3
+min_print_speed = 15
+slowdown_below_layer_time = 10
+cooling = 1
+
+# Common printer preset
+[printer:*common*]
+printer_technology = FFF
+bed_shape = -107x-93,107x-93,107x93,-107x93
+before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\n\n
+between_objects_gcode =
+deretract_speed = 0 # By setting this value to 0 deretract used the retract_speed
+extruder_colour = #FFFF00
+extruder_offset = 0x0
+gcode_flavor = marlin
+silent_mode = 0
+remaining_times = 0
+machine_max_acceleration_e = 1100
+machine_max_acceleration_extruding = 5000
+machine_max_acceleration_retracting = 1100
+machine_max_acceleration_x = 500
+machine_max_acceleration_y = 500
+machine_max_acceleration_z = 100
+machine_max_feedrate_e = 20
+machine_max_feedrate_x = 350
+machine_max_feedrate_y = 350
+machine_max_feedrate_z = 2
+machine_max_jerk_e = 5
+machine_max_jerk_x = 8
+machine_max_jerk_y = 8
+machine_max_jerk_z = 0.3
+machine_min_extruding_rate = 0
+machine_min_travel_rate = 0
+layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
+max_layer_height = 0.30
+min_layer_height = 0.05
+max_print_height = 160
+octoprint_apikey =
+octoprint_host =
+printer_notes =
+printer_settings_id =
+printer_vendor = BIBO
+printhost_apikey =
+printhost_cafile =
+retract_before_travel = 1
+retract_before_wipe = 100%
+retract_layer_change = 1
+retract_length = 1.5
+retract_length_toolchange = 1.5
+retract_lift = 0
+retract_lift_above = 0
+retract_lift_below = 0
+retract_restart_extra = 0
+retract_restart_extra_toolchange = 0
+retract_speed = 20
+serial_port =
+serial_speed = 250000
+single_extruder_multi_material = 0
+toolchange_gcode =
+use_firmware_retraction = 0
+use_relative_e_distances = 1
+use_volumetric_e = 0
+variable_layer_height = 1
+wipe = 1
+z_offset = 0
+printer_model =
+default_print_profile =
+default_filament_profile =
+
+[printer:BIBO2 Touch Dual extrusion]
+inherits = *common*
+printer_model = BIBO2
+between_objects_gcode =
+default_filament_profile = Generic PLA @BIBO2
+default_print_profile = 0.20mm NORMAL @BIBO2
+deretract_speed = 0,0 # Setting this value to 0 uses the retract speed
+extruder_colour = #FFFF00;#229403
+extruder_offset = 0x0,0x0
+layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
+max_layer_height = 0.3,0.3
+min_layer_height = 0.05,0.05
+printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_BIBO\nPRINTER_MODEL_BIBO2
+printer_settings_id =
+printer_variant = 0.4
+nozzle_diameter = 0.4,0.4
+remaining_times = 0
+retract_before_travel = 1,1
+retract_before_wipe = 100%,100%
+retract_layer_change = 1,1
+retract_length = 1.5,1.5
+retract_length_toolchange = 1.5,1.5
+retract_lift = 0,0
+retract_lift_above = 0,0
+retract_lift_below = 0,0
+retract_restart_extra = 0,0
+retract_restart_extra_toolchange = 0,0
+retract_speed = 20,20
+start_gcode = ;Start code PrusaSlicer BIBO 2 printers\nG21 ; set units to metric\nG90 ; absolute positioning\nM107 ; start with the fan off\nM190 S{max(first_layer_bed_temperature[0] - 5, first_layer_bed_temperature[1] - 5)} ; wait for bed temp\nM140 S{max(first_layer_bed_temperature[0], first_layer_bed_temperature[1])} ; continue bed heating to full temp while other things are happening\nM104 S{first_layer_temperature[0]} T0; set 1st nozzle heater to first layer temperature\nM104 S{first_layer_temperature[1]} T1; set 2nd nozzle heater to first layer temperature\nM105 ; Report Temperatures\nM109 S{first_layer_temperature[0]} T0; wait for 1st nozzle heat to first layer temperature\nM109 S{first_layer_temperature[1]} T1; wait for 2nd nozzle heat to first layer temperature\nM105 ; Report Temperatures\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\nG1 Z2.0 F400 ; move the platform down 2mm\nT[initial_tool]; switch to initial tool position\nG92 E0.0 ; reset extruder\nG28 ; Home all axis\nG1 Y0 F1200 E0 ; move Y to min endstop and extrude 0 filament\nG92 E0.0 ; reset extruder and zero the current extruder coordinate before printing\nM117 BIBO now Printing... ; Put now printing message on screen
+end_gcode = ;BIBO End GCode\nM107 ; turn fans off\nG91 ; Relative positioning\nG1 Z1 F100\nM140 S0 ; Disable heated bed\nM104 T0 S0 ; extruder T0 heater off\nM104 T1 S0 ; extruder T1 heater off\nG1 Z+0.5 X-20 Y-20 F300 ; move Z down then move print head a bit out of the way\nG28 X0 Y0 ; move X/Y to min endstops, so the head is out of the way\nG90 ; Absolute positioning\nG92 E0.0 ; Reset extruder position\nM84 ; Turn steppers off\nM117 BIBO Print complete ; Put print complete message on screen
+thumbnails =
+toolchange_gcode =
+use_relative_e_distances = 1
+wipe = 1,1
+z_offset = 0
+
+[printer:BIBO2 Touch E1 right only extrusion]
+inherits = *common*
+printer_model = BIBO2
+printer_variant = 0.4
+extruder_colour = #FFFF00
+printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_BIBO\nPRINTER_MODEL_BIBO2
+nozzle_diameter = 0.4
+retract_before_travel = 1
+retract_length = 1.5
+retract_speed = 20
+deretract_speed = 0 # Setting this value to 0 uses the retract speed
+retract_before_wipe = 100%
+default_print_profile = 0.20mm NORMAL @BIBO2
+default_filament_profile = Generic PLA @BIBO2
+start_gcode = ;Start code PrusaSlicer BIBO 2 printers E1 only (i.e. T0)\nG21 ; set units to metric\nG90 ; absolute positioning\nM107 ; start with the fan off\nM190 S{first_layer_bed_temperature[0] - 5} ; wait for bed temp\nM140 S{first_layer_bed_temperature[0]} ; continue bed heating to full temp while other things are happening\nM104 S{first_layer_temperature[0]} T0 ; set 1st nozzle heater to first layer temperature\nM104 S{first_layer_temperature[0] * 0.791} T1 ; set 2nd nozzle heater to 79.1 percent standby temp\nM105 ; Report Temperatures\nM109 S{first_layer_temperature[0]} T0 ; wait for 1st nozzle heat to first layer temperature\nM109 S{first_layer_temperature[0] * 0.791} T1 ; wait for 2nd nozzle heat to 79.1 percent standby temp\nM105 ; Report Temperatures\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\nG1 Y0 F1200 E0 ; move Y to min endstop and extrude 0 filament\nT[initial_tool] ; switch to initial tool position\nG92 E0.0 ; reset extruder\nG28 ; Home all axis\nG1 Y0 F1200 E0 ; move Y to min endstop and reset extruder\nG92 E0.0 ; zero the current extruder coordinate\nM117 Cleaning... ; Put Cleaning message on screen, Attempt Nozzle Wipe (for ooze free startup)\nG1 X-15.0 Y-92.9 Z0.3 F2400.0 ; move to start-line position\nG1 X15.0 Y-92.9 Z0.3 F1000.0 E2 ; draw 1st line\nG1 X15.0 Y-92.6 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92.6 Z0.3 F1000.0 E4 ; draw 2nd line\nG1 X-15.0 Y-92.3 Z0.3 F3000.0 ; move to side a little\nG1 X15.0 Y-92.3 Z0.3 F1000.0 E6 ; draw 3rd line\nG1 X15.0 Y-92 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92 Z0.3 F1000.0 E8 ; draw 4th line\nG92 E0.0 ; reset extruder and zero the current extruder coordinate before printing\nM117 BIBO E1 now Printing... ; Put now printing message on screen
+end_gcode = ;BIBO End GCode\nM107 ; turn fans off\nG91 ; Relative positioning\nG1 Z1 F100\nM140 S0 ; Disable heated bed\nM104 T0 S0 ; extruder T0 heater off\nM104 T1 S0 ; extruder T1 heater off\nG1 Z+0.5 X-20 Y-20 F300 ; move Z down then move print head a bit out of the way\nG28 X0 Y0 ; move X/Y to min endstops, so the head is out of the way\nG90 ; Absolute positioning\nG92 E0.0 ; Reset extruder position\nM84 ; Turn steppers off\nM117 BIBO Print complete ; Put print complete message on screen
+thumbnails =
+toolchange_gcode =
+use_relative_e_distances = 1
+wipe = 1
+z_offset = 0
+
+
+[printer:BIBO2 Touch E2 left only extrusion]
+inherits = *common*
+printer_model = BIBO2
+printer_variant = 0.4
+extruder_colour = #229403
+printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_BIBO\nPRINTER_MODEL_BIBO2
+nozzle_diameter = 0.4
+retract_before_travel = 1
+retract_length = 1.5
+retract_speed = 20
+deretract_speed = 0 # Setting this value to 0 uses the retract speed
+retract_before_wipe = 100%
+default_print_profile = 0.20mm NORMAL @BIBO2
+default_filament_profile = Generic PLA @BIBO2
+start_gcode = ;Start code PrusaSlicer BIBO 2 printers E2 only (i.e. T1)\nG21 ; set units to metric\nG90 ; absolute positioning\nM107 ; start with the fan off\nM140 S{first_layer_bed_temperature[0] - 5} ; set bed temp\nM105 ; Report Temperatures\nM190 S{first_layer_bed_temperature[0]} ; wait for bed temp\nM104 S{first_layer_temperature[0] * 0.791} T0 ; set 1st nozzle heater to 79.1 percent standby temp\nM104 S{first_layer_temperature[0]} T1 ; set 2nd nozzle heater to first layer temperature\nM105 ; Report Temperatures\nM109 S{first_layer_temperature[0] * 0.791} T0 ; set 1st nozzle heater to 79.1 percent standby temp\nM109 S{first_layer_temperature[0]} T1 ; Wait for 2nd nozzle heater to first layer temperature\nM105 ; Report Temperatures\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\nG1 Z2 F400 ; move the print bed down 2mm\nT0 ; switch to tool position T0\nG90 ; absolute positioning\nG92 E0.0 ; zero the current extruder coordinate\nG28 ; Home all axis\nG1 Y0 F1200 E0 ; move Y to min endstop and reset extruder\nG92 E0.0 ; zero the current extruder coordinate\nT1 ; switch to tool position T1\nG92 E0.0 ; zero the current extruder coordinate\nM117 E2 nozzle wipe... ; Put Nozzle wipe message on screen, Attempt Nozzle Wipe (for ooze free startup)\nG1 X-15.0 Y-92.9 Z0.3 F2400.0 ; move to start-line position\nG1 X15.0 Y-92.9 Z0.3 F1000.0 E2 ; draw 1st line\nG1 X15.0 Y-92.6 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92.6 Z0.3 F1000.0 E4 ; draw 2nd line\nG1 X-15.0 Y-92.3 Z0.3 F3000.0 ; move to side a little\nG1 X15.0 Y-92.3 Z0.3 F1000.0 E6 ; draw 3rd line\nG1 X15.0 Y-92 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92 Z0.3 F1000.0 E8 ; draw 4th line\nG92 E0.0 ; reset extruder coordinate to zero before printing\nM117 BIBO Now Printing from E2... ; Put now printing message on screen
+end_gcode = ;BIBO End GCode\nM107 ; turn fans off\nG91 ; Relative positioning\nG1 Z1 F100\nM140 S0 ; Disable heated bed\nM104 T0 S0 ; extruder T0 heater off\nM104 T1 S0 ; extruder T1 heater off\nG1 Z+0.5 X-20 Y-20 F300 ; move Z down then move print head a bit out of the way\nG28 X0 Y0 ; move X/Y to min endstops, so the head is out of the way\nG90 ; Absolute positioning\nG92 E0.0 ; Reset extruder position\nM84 ; Turn steppers off\nM117 BIBO Print complete ; Put print complete message on screen
+thumbnails =
+toolchange_gcode =
+use_relative_e_distances = 1
+wipe = 1
+z_offset = 0
+
+# Ditto Printing options with custom beds and special start end gcode for print duplication from one nozzle to the other
+[printer:BIBO2 E1 right E2 Ditto]
+inherits = BIBO2 Touch E1 right only extrusion
+printer_model = BIBO2
+printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_BIBO\nPRINTER_MODEL_BIBO2
+bed_shape = 0x-93,33x-93,33x93,0x93
+#bed_model = BIBO2_bed.stl
+#bed_texture = BIBO2.svg
+before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\nM104 S{temperature[0]} T1 ; set 2nd nozzle heater to print temperature\n
+start_gcode = ;Start code PrusaSlicer BIBO 2 printers E1 only (i.e. T0)\nM420 S1 ; Turn on Ditto Printing\nG21 ; set units to metric\nG90 ; absolute positioning\nM107 ; start with the fan off\nM190 S{first_layer_bed_temperature[0] - 5} ; wait for bed temp\nM140 S{first_layer_bed_temperature[0]} ; continue bed heating to full temp while other things are happening\nM104 S{first_layer_temperature[0]} T0 ; set 1st nozzle heater to first layer temperature\nM104 S{first_layer_temperature[0]} T1 ; set 2nd nozzle heater to same first layer temperature\nM105 ; Report Temperatures\nM109 S{first_layer_temperature[0]} T0 ; wait for 1st nozzle heat to first layer temperature\nM109 S{first_layer_temperature[0]} T1 ; wait for 2nd nozzle heat to same first layer temperature\nM105 ; Report Temperatures\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\nG1 Y0 F1200 E0 ; move Y to min endstop and extrude 0 filament\nT[initial_tool] ; switch to initial tool position\nG92 E0.0 ; reset extruder\nG28 ; Home all axis\nG1 Y0 F1200 E0 ; move Y to min endstop and reset extruder\nG92 E0.0 ; zero the current extruder coordinate\nM117 Cleaning... ; Put Cleaning message on screen, Attempt Nozzle Wipe (for ooze free startup)\nG1 X-15.0 Y-92.9 Z0.3 F2400.0 ; move to start-line position\nG1 X15.0 Y-92.9 Z0.3 F1000.0 E2 ; draw 1st line\nG1 X15.0 Y-92.6 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92.6 Z0.3 F1000.0 E4 ; draw 2nd line\nG1 X-15.0 Y-92.3 Z0.3 F3000.0 ; move to side a little\nG1 X15.0 Y-92.3 Z0.3 F1000.0 E6 ; draw 3rd line\nG1 X15.0 Y-92 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92 Z0.3 F1000.0 E8 ; draw 4th line\nG92 E0.0 ; reset extruder and zero the current extruder coordinate before printing\nM117 BIBO E1 now Printing... ; Put now printing message on screen
+end_gcode = ;BIBO End GCode\nM107 ; turn fans off\nG91 ; Relative positioning\nG1 Z1 F100\nM140 S0 ; Disable heated bed\nM104 T0 S0 ; extruder T0 heater off\nM104 T1 S0 ; extruder T1 heater off\nG1 Z+0.5 X-20 Y-20 F300 ; move Z down then move print head a bit out of the way\nG28 X0 Y0 ; move X/Y to min endstops, so the head is out of the way\nG90 ; Absolute positioning\nG92 E0.0 ; Reset extruder position\nM84 ; Turn steppers off\nM420 S0 ; Turn off Ditto Printing function\nM117 BIBO Print complete ; Put print complete message on screen
+
+[printer:BIBO2 E2 left E1 Ditto]
+inherits = BIBO2 Touch E2 left only extrusion
+printer_model = BIBO2
+printer_notes = Do not remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_BIBO\nPRINTER_MODEL_BIBO2
+bed_shape = -33x-93,0x-93,0x93,-33x93
+#bed_model = BIBO2_bed.stl
+#bed_texture = BIBO2.svg
+before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\nM104 S{temperature[0]} T0 ; set 1st nozzle heater to print temperature\n
+start_gcode = ;Start code PrusaSlicer BIBO 2 printers E2 only (i.e. T1)\nM420 S1 ; Turn on Ditto Printing\nG21 ; set units to metric\nG90 ; absolute positioning\nM107 ; start with the fan off\nM140 S{first_layer_bed_temperature[0] - 5} ; set bed temp\nM105 ; Report Temperatures\nM190 S{first_layer_bed_temperature[0]} ; wait for bed temp\nM104 S{first_layer_temperature[0]} T0 ; set 1st nozzle heater to ditto print temperature\nM104 S{first_layer_temperature[0]} T1 ; set 2nd nozzle heater to first layer temperature\nM105 ; Report Temperatures\nM109 S{first_layer_temperature[0]} T0 ; set 1st nozzle heater to ditto printing temperature\nM109 S{first_layer_temperature[0]} T1 ; Wait for 2nd nozzle heater to first layer temperature\nM105 ; Report Temperatures\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\nG1 Z2 F400 ; move the print bed down 2mm\nT0 ; switch to tool position T0\nG90 ; absolute positioning\nG92 E0.0 ; zero the current extruder coordinate\nG28 ; Home all axis\nG1 Y0 F1200 E0 ; move Y to min endstop and reset extruder\nG92 E0.0 ; zero the current extruder coordinate\nT1 ; switch to tool position T1\nG92 E0.0 ; zero the current extruder coordinate\nM117 E2 nozzle wipe... ; Put Nozzle wipe message on screen, Attempt Nozzle Wipe (for ooze free startup)\nG1 X-15.0 Y-92.9 Z0.3 F2400.0 ; move to start-line position\nG1 X15.0 Y-92.9 Z0.3 F1000.0 E2 ; draw 1st line\nG1 X15.0 Y-92.6 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92.6 Z0.3 F1000.0 E4 ; draw 2nd line\nG1 X-15.0 Y-92.3 Z0.3 F3000.0 ; move to side a little\nG1 X15.0 Y-92.3 Z0.3 F1000.0 E6 ; draw 3rd line\nG1 X15.0 Y-92 Z0.3 F3000.0 ; move to side a little\nG1 X-15.0 Y-92 Z0.3 F1000.0 E8 ; draw 4th line\nG92 E0.0 ; reset extruder coordinate to zero before printing\nM117 BIBO Now Printing from E2... ; Put now printing message on screen
+end_gcode = ;BIBO End GCode\nM107 ; turn fans off\nG91 ; Relative positioning\nG1 Z1 F100\nM140 S0 ; Disable heated bed\nM104 T0 S0 ; extruder T0 heater off\nM104 T1 S0 ; extruder T1 heater off\nG1 Z+0.5 X-20 Y-20 F300 ; move Z down then move print head a bit out of the way\nG28 X0 Y0 ; move X/Y to min endstops, so the head is out of the way\nG90 ; Absolute positioning\nG92 E0.0 ; Reset extruder position\nM84 ; Turn steppers off\nM420 S0 ; Turn off Ditto Printing function\nM117 BIBO Print complete ; Put print complete message on screen
\ No newline at end of file
diff --git a/resources/profiles/BIBO/BIBO2.svg b/resources/profiles/BIBO/BIBO2.svg
new file mode 100644
index 0000000000..184bc35ab3
--- /dev/null
+++ b/resources/profiles/BIBO/BIBO2.svg
@@ -0,0 +1,108 @@
+
diff --git a/resources/profiles/BIBO/BIBO2_bed.stl b/resources/profiles/BIBO/BIBO2_bed.stl
new file mode 100644
index 0000000000..aeb2a20ff7
Binary files /dev/null and b/resources/profiles/BIBO/BIBO2_bed.stl differ
diff --git a/resources/profiles/BIBO/BIBO2_thumbnail.png b/resources/profiles/BIBO/BIBO2_thumbnail.png
new file mode 100644
index 0000000000..3d99c7ee87
Binary files /dev/null and b/resources/profiles/BIBO/BIBO2_thumbnail.png differ
diff --git a/resources/profiles/Creality/ENDER3_thumbnail.png b/resources/profiles/Creality/ENDER3_thumbnail.png
new file mode 100644
index 0000000000..8b1ca5889a
Binary files /dev/null and b/resources/profiles/Creality/ENDER3_thumbnail.png differ
diff --git a/resources/profiles/LulzBot.idx b/resources/profiles/LulzBot.idx
new file mode 100644
index 0000000000..4d6436f82e
--- /dev/null
+++ b/resources/profiles/LulzBot.idx
@@ -0,0 +1,2 @@
+min_slic3r_version = 2.2.0-alpha3
+0.0.1 Initial version
diff --git a/resources/profiles/LulzBot.ini b/resources/profiles/LulzBot.ini
new file mode 100644
index 0000000000..53151d8195
--- /dev/null
+++ b/resources/profiles/LulzBot.ini
@@ -0,0 +1,384 @@
+# generated by PrusaSlicer 2.1.1+win64 on 2020-02-25 at 01:51:21 UTC
+
+[vendor]
+# Vendor name will be shown by the Config Wizard.
+name = LulzBot
+config_version = 0.0.1
+config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/LulzBot/
+
+[printer_model:MINI_AERO]
+name = Mini Aero
+variants = 0.5
+technology = FFF
+#bed_model = mini_bed.stl
+#bed_texture = mini.svg
+default_materials = ColorFabb PLA-PHA @lulzbot;PrintedSolid Jesse PLA @lulzbot
+
+[printer_model:TAZ6_AERO]
+name = Taz6 Aero
+variants = 0.5
+technology = FFF
+default_materials = ColorFabb PLA-PHA @lulzbot;PrintedSolid Jesse PLA @lulzbot
+
+[print:0.3mm @lulzbot]
+avoid_crossing_perimeters = 0
+bottom_fill_pattern = rectilinear
+bottom_solid_layers = 3
+bridge_acceleration = 500
+bridge_angle = 0
+bridge_flow_ratio = 1
+bridge_speed = 30
+brim_width = 0
+clip_multipart_objects = 0
+compatible_printers =
+compatible_printers_condition =
+complete_objects = 0
+default_acceleration = 500
+dont_support_bridges = 1
+elefant_foot_compensation = 0
+ensure_vertical_shell_thickness = 0
+external_perimeter_extrusion_width = 0.56
+external_perimeter_speed = 50%
+external_perimeters_first = 0
+extra_perimeters = 1
+extruder_clearance_height = 20
+extruder_clearance_radius = 20
+extrusion_width = 0.56
+fill_angle = 45
+fill_density = 20%
+fill_pattern = gyroid
+first_layer_acceleration = 500
+first_layer_extrusion_width = 0.6
+first_layer_height = 100%
+first_layer_speed = 40%
+gap_fill_speed = 20
+gcode_comments = 0
+gcode_label_objects = 0
+infill_acceleration = 500
+infill_every_layers = 1
+infill_extruder = 1
+infill_extrusion_width = 0.56
+infill_first = 0
+infill_only_where_needed = 0
+infill_overlap = 25%
+infill_speed = 60
+inherits =
+interface_shells = 0
+layer_height = 0.3
+max_print_speed = 80
+max_volumetric_speed = 0
+min_skirt_length = 0
+notes =
+only_retract_when_crossing_perimeters = 1
+ooze_prevention = 0
+output_filename_format = [printer_settings_id]_[input_filename_base]_[layer_height]_[filament_type]_[print_time].gcode
+overhangs = 1
+perimeter_acceleration = 500
+perimeter_extruder = 1
+perimeter_extrusion_width = 0.56
+perimeter_speed = 60
+perimeters = 3
+post_process =
+raft_layers = 0
+resolution = 0
+seam_position = nearest
+single_extruder_multi_material_priming = 1
+skirt_distance = 3
+skirt_height = 1
+skirts = 3
+slice_closing_radius = 0.049
+small_perimeter_speed = 15
+solid_infill_below_area = 70
+solid_infill_every_layers = 0
+solid_infill_extruder = 1
+solid_infill_extrusion_width = 0.56
+solid_infill_speed = 60
+spiral_vase = 0
+standby_temperature_delta = -5
+support_material = 0
+support_material_angle = 0
+support_material_auto = 1
+support_material_buildplate_only = 0
+support_material_contact_distance = 0.2
+support_material_enforce_layers = 0
+support_material_extruder = 1
+support_material_extrusion_width = 0.44
+support_material_interface_contact_loops = 0
+support_material_interface_extruder = 1
+support_material_interface_layers = 3
+support_material_interface_spacing = 0
+support_material_interface_speed = 100%
+support_material_pattern = rectilinear
+support_material_spacing = 2.5
+support_material_speed = 60
+support_material_synchronize_layers = 0
+support_material_threshold = 0
+support_material_with_sheath = 1
+support_material_xy_spacing = 50%
+thin_walls = 1
+threads = 12
+top_fill_pattern = rectilinear
+top_infill_extrusion_width = 0.52
+top_solid_infill_speed = 40
+top_solid_layers = 3
+travel_speed = 175
+wipe_tower = 0
+wipe_tower_bridging = 10
+wipe_tower_rotation_angle = 0
+wipe_tower_width = 60
+wipe_tower_x = 180
+wipe_tower_y = 140
+xy_size_compensation = 0
+
+[filament:ColorFabb PLA-PHA @lulzbot]
+filament_vendor = ColorFabb
+bed_temperature = 60
+bridge_fan_speed = 100
+compatible_printers =
+compatible_printers_condition =
+compatible_prints =
+compatible_prints_condition =
+cooling = 1
+disable_fan_first_layers = 3
+end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n"
+extrusion_multiplier = 1
+fan_always_on = 0
+fan_below_layer_time = 60
+filament_colour = #29B2B2
+filament_cooling_final_speed = 3.4
+filament_cooling_initial_speed = 2.2
+filament_cooling_moves = 4
+filament_cost = 0
+filament_density = 1.25
+filament_deretract_speed = nil
+filament_diameter = 2.85
+filament_load_time = 0
+filament_loading_speed = 28
+filament_loading_speed_start = 3
+filament_max_volumetric_speed = 0
+filament_minimal_purge_on_wipe_tower = 15
+filament_notes = ""
+filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
+filament_retract_before_travel = nil
+filament_retract_before_wipe = nil
+filament_retract_layer_change = nil
+filament_retract_length = nil
+filament_retract_lift = nil
+filament_retract_lift_above = nil
+filament_retract_lift_below = nil
+filament_retract_restart_extra = nil
+filament_retract_speed = nil
+filament_soluble = 0
+filament_toolchange_delay = 0
+filament_type = PLA
+filament_unload_time = 0
+filament_unloading_speed = 90
+filament_unloading_speed_start = 100
+filament_wipe = nil
+first_layer_bed_temperature = 60
+first_layer_temperature = 200
+inherits =
+max_fan_speed = 100
+min_fan_speed = 35
+min_print_speed = 10
+slowdown_below_layer_time = 5
+start_filament_gcode = "; Filament gcode\n"
+temperature = 200
+
+[filament:PrintedSolid Jesse PLA @lulzbot]
+filament_vendor = PrintedSolid
+bed_temperature = 60
+bridge_fan_speed = 100
+compatible_printers =
+compatible_printers_condition =
+compatible_prints =
+compatible_prints_condition =
+cooling = 1
+disable_fan_first_layers = 3
+end_filament_gcode = "; Filament-specific end gcode \n;END gcode for filament\n"
+extrusion_multiplier = 1
+fan_always_on = 0
+fan_below_layer_time = 60
+filament_colour = #29B2B2
+filament_cooling_final_speed = 3.4
+filament_cooling_initial_speed = 2.2
+filament_cooling_moves = 4
+filament_cost = 27
+filament_density = 1.25
+filament_deretract_speed = nil
+filament_diameter = 2.85
+filament_load_time = 0
+filament_loading_speed = 28
+filament_loading_speed_start = 3
+filament_max_volumetric_speed = 0
+filament_minimal_purge_on_wipe_tower = 15
+filament_notes = ""
+filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
+filament_retract_before_travel = nil
+filament_retract_before_wipe = nil
+filament_retract_layer_change = nil
+filament_retract_length = nil
+filament_retract_lift = nil
+filament_retract_lift_above = nil
+filament_retract_lift_below = nil
+filament_retract_restart_extra = nil
+filament_retract_speed = nil
+filament_soluble = 0
+filament_toolchange_delay = 0
+filament_type = PLA
+filament_unload_time = 0
+filament_unloading_speed = 90
+filament_unloading_speed_start = 100
+filament_wipe = nil
+first_layer_bed_temperature = 60
+first_layer_temperature = 220
+inherits =
+max_fan_speed = 100
+min_fan_speed = 35
+min_print_speed = 10
+slowdown_below_layer_time = 5
+start_filament_gcode = "; Filament gcode\n"
+temperature = 220
+
+[printer:Mini Aero 0.5mm]
+printer_model = MINI_AERO
+printer_variant = 0.5
+default_print_profile = 0.3mm @lulzbot
+default_filament_profile = PrintedSolid Jesse PLA @lulzbot
+bed_shape = 0x0,154x0,154x154,0x154
+before_layer_gcode =
+between_objects_gcode =
+cooling_tube_length = 5
+cooling_tube_retraction = 91.5
+deretract_speed = 20
+end_gcode = M400 ; wait for moves to finish\nM140 S40 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E1 ; set extruder to 1mm for retract on print end (LulzBot Cura had 5mm, might be a contributing factor to between print Aerostruder jamming)\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z158 E0 F10000 ; move to cooling position\nG1 E1 ; re-prime extruder\nM190 R40 ; wait for bed to cool down to removal temp\nM77 ; Stop GLCD Timer\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0; cool downs\nM84 ; disable steppers\nG90 ; absolute positioning\nM117 Print Complete. ; print complete message\n
+extra_loading_move = -2
+extruder_colour = ""
+extruder_offset = 0x0
+gcode_flavor = marlin
+high_current_on_filament_swap = 0
+host_type = octoprint
+inherits =
+layer_gcode =
+machine_max_acceleration_e = 10000,5000
+machine_max_acceleration_extruding = 1500,1250
+machine_max_acceleration_retracting = 1500,1250
+machine_max_acceleration_x = 9000,1000
+machine_max_acceleration_y = 9000,1000
+machine_max_acceleration_z = 100,200
+machine_max_feedrate_e = 40,120
+machine_max_feedrate_x = 800,200
+machine_max_feedrate_y = 800,200
+machine_max_feedrate_z = 8,12
+machine_max_jerk_e = 2.5,2.5
+machine_max_jerk_x = 20,10
+machine_max_jerk_y = 20,10
+machine_max_jerk_z = 0.2,0.4
+machine_min_extruding_rate = 0,0
+machine_min_travel_rate = 0,0
+max_layer_height = 0
+max_print_height = 158
+min_layer_height = 0.07
+nozzle_diameter = 0.5
+parking_pos_retraction = 92
+print_host =
+printer_notes = LulzBot Mini w/ Aerostruder profile for Delaware Library System, Rt9 Library and Innovation Center.
+printhost_apikey =
+printhost_cafile =
+remaining_times = 0
+retract_before_travel = 2
+retract_before_wipe = 0%
+retract_layer_change = 1
+retract_length = 1
+retract_length_toolchange = 10
+retract_lift = 0
+retract_lift_above = 0
+retract_lift_below = 0
+retract_restart_extra = 0
+retract_restart_extra_toolchange = 0
+retract_speed = 40
+serial_port =
+serial_speed = 250000
+silent_mode = 0
+single_extruder_multi_material = 0
+start_gcode = ;This G-Code has been generated specifically for the LulzBot Mini with Aerosturder\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{first_layer_bed_temperature[0]} ; start bed heating up\nG28; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM109 R{first_layer_temperature[0] - 60} ; soften filament before retraction\n;G1 E-15 F75 ; retract filament (LulzBot Cura is apparently trying to cold pull, might be a contributing factor to hob gear filling with filament)\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach wiping temp\nG1 X45 Y173 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X42 Y173 Z-.5 F4000 ; wiping\nG1 X52 Y171 Z-.5 F4000 ; wiping\nG1 X42 Y173 Z0 F4000 ; wiping\nG1 X52 Y171 F4000 ; wiping\nG1 X42 Y173 F4000 ; wiping\nG1 X52 Y171 F4000 ; wiping\nG1 X42 Y173 F4000 ; wiping\nG1 X52 Y171 F4000 ; wiping\nG1 X57 Y173 F4000 ; wiping\nG1 X77 Y171 F4000 ; wiping\nG1 X57 Y173 F4000 ; wiping\nG1 X77 Y171 F4000 ; wiping\nG1 X57 Y173 F4000 ; wiping\nG1 X87 Y171 F4000 ; wiping\nG1 X77 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X77 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X77 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X107 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X107 Y173 F4000 ; wiping\nG1 X97 Y171 F4000 ; wiping\nG1 X107 Y173 F4000 ; wiping\nG1 X112 Y171 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nG0 X0 Y187 F200 ; move away from endstops\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach probe temp\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation. (if activated in the quality settings, this command will automatically be ignored)\nM204 S2000 ; restore standard acceleration\nG28 X0 Y0 ; re-home to account for build variance of earlier mini builds\nG0 X0 Y187 F200 ; move away from endstops\nG0 Y152 F4000 ; move in front of wiper pad\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{first_layer_temperature[0]} ; wait for extruder to reach printing temp\nM190 R{first_layer_bed_temperature[0]} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini Printing... ; progress indicator message on LCD\nM221 S74 ; Printer specific extrusion modifier.
+thumbnails =
+toolchange_gcode =
+use_firmware_retraction = 0
+use_relative_e_distances = 0
+use_volumetric_e = 0
+variable_layer_height = 1
+wipe = 1
+z_offset = 0
+
+[printer:Taz6 Aero 0.5mm]
+printer_model = TAZ6_AERO
+printer_variant = 0.5
+default_print_profile = 0.3mm @lulzbot
+default_filament_profile = PrintedSolid Jesse PLA @lulzbot
+bed_shape = 0x0,280x0,280x280,0x280
+before_layer_gcode =
+between_objects_gcode =
+cooling_tube_length = 5
+cooling_tube_retraction = 91.5
+deretract_speed = 20
+end_gcode = M400 ; wait for moves to finish\nM140 S40 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG91 ; relative positioning\nG1 E-1 F300 ; filament retraction to release pressure\nG1 Z20 E-5 X-20 Y-20 F3000 ; lift up and retract even more filament\nG1 E6 ; re-prime extruder\nM117 Cooling please wait ; progress indicator message on LCD\nG90 ; absolute positioning\nG1 Y0 F3000 ; move to cooling position\nM190 R40 ; wait for bed to cool down to removal temp\nG1 Y280 F3000 ; present finished print\nM140 S0; cool downs\nM77 ; stop GLCD timer\nM84 ; disable steppers\nG90 ; absolute positioning\nM117 Print Complete. ; print complete message\n
+extra_loading_move = -2
+extruder_colour = ""
+extruder_offset = 0x0
+gcode_flavor = marlin
+high_current_on_filament_swap = 0
+host_type = octoprint
+inherits =
+layer_gcode =
+machine_max_acceleration_e = 1000,5000
+machine_max_acceleration_extruding = 1000,1250
+machine_max_acceleration_retracting = 1000,1250
+machine_max_acceleration_x = 9000,1000
+machine_max_acceleration_y = 9000,1000
+machine_max_acceleration_z = 100,200
+machine_max_feedrate_e = 40,120
+machine_max_feedrate_x = 800,200
+machine_max_feedrate_y = 800,200
+machine_max_feedrate_z = 3,12
+machine_max_jerk_e = 2.5,2.5
+machine_max_jerk_x = 12,10
+machine_max_jerk_y = 12,10
+machine_max_jerk_z = 0.2,0.4
+machine_min_extruding_rate = 0,0
+machine_min_travel_rate = 0,0
+max_layer_height = 0
+max_print_height = 250
+min_layer_height = 0.07
+nozzle_diameter = 0.5
+parking_pos_retraction = 92
+print_host =
+printer_notes = LulzBot Taz 6 w/ Aerostruder profile for Delaware Library System, Rt9 Library and Innovation Center.
+printer_technology = FFF
+printhost_apikey =
+printhost_cafile =
+remaining_times = 0
+retract_before_travel = 2
+retract_before_wipe = 0%
+retract_layer_change = 0
+retract_length = 2
+retract_length_toolchange = 10
+retract_lift = 0
+retract_lift_above = 0
+retract_lift_below = 0
+retract_restart_extra = 0
+retract_restart_extra_toolchange = 0
+retract_speed = 40
+serial_port =
+serial_speed = 250000
+silent_mode = 0
+single_extruder_multi_material = 0
+start_gcode = ;This G-Code has been generated specifically for the LulzBot TAZ 6 with Aerosturder\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{first_layer_bed_temperature[0]} ; start bed heating up\nG28 XY ; home X and Y\nG1 X-19 Y258 F1000 ; move to safe homing position\nM109 R{first_layer_temperature[0] - 60} ; soften filament before homing Z\nG28 Z ; home Z\nG1 E-15 F100 ; retract filament\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach wiping temp\nG1 X-15 Y100 F3000 ; move above wiper pad\nG1 Z1 ; push nozzle into wiper\nG1 X-17 Y95 F1000 ; slow wipe\nG1 X-17 Y90 F1000 ; slow wipe\nG1 X-17 Y85 F1000 ; slow wipe\nG1 X-15 Y90 F1000 ; slow wipe\nG1 X-17 Y80 F1000 ; slow wipe\nG1 X-15 Y95 F1000 ; slow wipe\nG1 X-17 Y75 F2000 ; fast wipe\nG1 X-15 Y65 F2000 ; fast wipe\nG1 X-17 Y70 F2000 ; fast wipe\nG1 X-15 Y60 F2000 ; fast wipe\nG1 X-17 Y55 F2000 ; fast wipe\nG1 X-15 Y50 F2000 ; fast wipe\nG1 X-17 Y40 F2000 ; fast wipe\nG1 X-15 Y45 F2000 ; fast wipe\nG1 X-17 Y35 F2000 ; fast wipe\nG1 X-15 Y40 F2000 ; fast wipe\nG1 X-17 Y70 F2000 ; fast wipe\nG1 X-15 Y30 Z2 F2000 ; fast wipe\nG1 X-17 Y35 F2000 ; fast wipe\nG1 X-15 Y25 F2000 ; fast wipe\nG1 X-17 Y30 F2000 ; fast wipe\nG1 X-15 Y25 Z1.5 F1000 ; slow wipe\nG1 X-17 Y23 F1000 ; slow wipe\nG1 Z10 ; raise extruder\nM109 R{first_layer_temperature[0] - 60} ; wait for extruder to reach probe temp\nG1 X-9 Y-9 ; move above first probe point\nM204 S100 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation. (if activated in the quality settings, this command will automatically be ignored)\nM204 S500 ; restore standard acceleration\nG1 X0 Y0 Z15 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{first_layer_temperature[0]} ; wait for extruder to reach printing temp\nM190 R{first_layer_bed_temperature[0]} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 TAZ 6 Printing... ; progress indicator message on LCD\n
+thumbnails =
+toolchange_gcode =
+use_firmware_retraction = 0
+use_relative_e_distances = 0
+use_volumetric_e = 0
+variable_layer_height = 1
+wipe = 1
+z_offset = 0
diff --git a/resources/profiles/LulzBot/MINI_AERO_thumbnail.png b/resources/profiles/LulzBot/MINI_AERO_thumbnail.png
new file mode 100644
index 0000000000..ded4eb673d
Binary files /dev/null and b/resources/profiles/LulzBot/MINI_AERO_thumbnail.png differ
diff --git a/resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png b/resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png
new file mode 100644
index 0000000000..ac6d48a693
Binary files /dev/null and b/resources/profiles/LulzBot/TAZ6_AERO_thumbnail.png differ
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index 9fcc8c1add..3990bdd782 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,4 +1,5 @@
min_slic3r_version = 2.2.0-alpha3
+1.1.2 Added renamed_from fields for PETG filaments to indicate that they were renamed from PET.
1.1.1 Added Verbatim and Fiberlogy PETG filament profiles. Updated auto cooling settings for ABS.
1.1.1-beta Updated for PrusaSlicer 2.2.0-beta
1.1.1-alpha4 Extended list of default filaments to be installed, top/bottom_solid_min_thickness defined, infill_acceleration changed etc
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 1b22575c08..cc22d50939 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/resources/profiles/PrusaResearch.ini
@@ -5,7 +5,7 @@
name = Prusa Research
# Configuration version of this file. Config file will only be installed, if the config_version differs.
# This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 1.1.1
+config_version = 1.1.2
# Where to get the updates from?
config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -148,7 +148,7 @@ external_fill_pattern = rectilinear
external_perimeters_first = 0
external_perimeter_extrusion_width = 0.45
extra_perimeters = 0
-extruder_clearance_height = 25
+extruder_clearance_height = 20
extruder_clearance_radius = 45
extrusion_width = 0.45
fill_angle = 45
@@ -1874,6 +1874,7 @@ filament_density = 1.04
[filament:Generic PETG]
inherits = *PET*
+renamed_from = "Generic PET"
filament_vendor = Generic
filament_cost = 27.82
filament_density = 1.27
@@ -2076,6 +2077,7 @@ temperature = 230
[filament:Prusa PETG]
inherits = *PET*
+renamed_from = "Prusa PET"
filament_vendor = Made for Prusa
filament_cost = 27.82
filament_density = 1.27
@@ -2107,6 +2109,7 @@ compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2S
[filament:Prusa PETG @0.6 nozzle]
inherits = *PET06*
+renamed_from = "Prusa PET 0.6 nozzle"; "Prusa PETG 0.6 nozzle"
filament_vendor = Made for Prusa
filament_cost = 27.82
filament_density = 1.27
@@ -2172,6 +2175,7 @@ filament_max_volumetric_speed = 13
[filament:Generic PETG @MMU2]
inherits = *PET MMU2*
+renamed_from = "Generic PET MMU2"; "Generic PETG MMU2"
filament_vendor = Generic
[filament:Plasty Mladec PETG @MMU2]
@@ -2180,6 +2184,7 @@ filament_vendor = Plasty Mladec
[filament:Prusa PETG @MMU2]
inherits = *PET MMU2*
+renamed_from = "Prusa PET MMU2"; "Prusa PETG MMU2"
filament_vendor = Made for Prusa
[filament:Prusament PETG @MMU2]
@@ -2189,10 +2194,12 @@ filament_vendor = Prusa Polymers
[filament:Generic PETG @MMU2 0.6 nozzle]
inherits = *PET MMU2 06*
+renamed_from = "Generic PET MMU2 0.6 nozzle"; "Generic PETG MMU2 0.6 nozzle"
filament_vendor = Generic
[filament:Prusa PETG @MMU2 0.6 nozzle]
inherits = *PET MMU2 06*
+renamed_from = "Prusa PET MMU2 0.6 nozzle"; "Prusa PETG MMU2 0.6 nozzle"
filament_vendor = Made for Prusa
[filament:Prusament PETG @MMU2 0.6 nozzle]
@@ -2525,6 +2532,7 @@ temperature = 275
[filament:Generic PETG @MMU1]
inherits = *PETMMU1*
+renamed_from = "Generic PET MMU1"; "Generic PETG MMU1"
filament_vendor = Generic
filament_cost = 27.82
filament_density = 1.27
@@ -2549,6 +2557,7 @@ filament_density = 1.27
[filament:Prusa PETG @MMU1]
inherits = *PETMMU1*
+renamed_from = "Prusa PET MMU1"; "Prusa PETG MMU1"
filament_vendor = Made for Prusa
filament_cost = 27.82
filament_density = 1.27
@@ -2602,6 +2611,7 @@ compatible_printers_condition = printer_model=="MK2SMM"
[filament:Generic PETG @MINI]
inherits = Generic PETG; *PETMINI*
+renamed_from = "Generic PET MINI"; "Generic PETG MINI"
filament_vendor = Generic
filament_cost = 27.82
filament_density = 1.27
@@ -2702,6 +2712,7 @@ filament_cost = 24.99
[filament:Generic PETG @0.6 nozzle MINI]
inherits = Generic PETG; *PETMINI06*
+renamed_from = "Generic PET 0.6 nozzle MINI"; "Generic PETG 0.6 nozzle MINI"
[filament:Plasty Mladec PETG @0.6 nozzle MINI]
inherits = Generic PETG; *PETMINI06*
@@ -2983,6 +2994,7 @@ filament_type = EDGE
[filament:Prusa PETG @MINI]
inherits = *PETMINI*
+renamed_from = "Prusa PET MINI"; "Prusa PETG MINI"
filament_vendor = Made for Prusa
filament_cost = 27.82
filament_density = 1.27
@@ -2990,6 +3002,7 @@ compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.
[filament:Prusa PETG @0.6 nozzle MINI]
inherits = *PETMINI06*
+renamed_from = "Prusa PET 0.6 nozzle MINI"; "Prusa PETG 0.6 nozzle MINI"
filament_vendor = Made for Prusa
filament_cost = 27.82
filament_density = 1.27
diff --git a/resources/icons/printers/PrusaResearch_MINI.png b/resources/profiles/PrusaResearch/MINI_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MINI.png
rename to resources/profiles/PrusaResearch/MINI_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5MMU2.png b/resources/profiles/PrusaResearch/MK2.5MMU2_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5MMU2.png
rename to resources/profiles/PrusaResearch/MK2.5MMU2_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5SMMU2S.png b/resources/profiles/PrusaResearch/MK2.5SMMU2S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5SMMU2S.png
rename to resources/profiles/PrusaResearch/MK2.5SMMU2S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5.png b/resources/profiles/PrusaResearch/MK2.5S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5.png
rename to resources/profiles/PrusaResearch/MK2.5S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2.5S.png b/resources/profiles/PrusaResearch/MK2.5_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2.5S.png
rename to resources/profiles/PrusaResearch/MK2.5_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2SMM.png b/resources/profiles/PrusaResearch/MK2SMM_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2SMM.png
rename to resources/profiles/PrusaResearch/MK2SMM_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK2S.png b/resources/profiles/PrusaResearch/MK2S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK2S.png
rename to resources/profiles/PrusaResearch/MK2S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3MMU2.png b/resources/profiles/PrusaResearch/MK3MMU2_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3MMU2.png
rename to resources/profiles/PrusaResearch/MK3MMU2_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3SMMU2S.png b/resources/profiles/PrusaResearch/MK3SMMU2S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3SMMU2S.png
rename to resources/profiles/PrusaResearch/MK3SMMU2S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3.png b/resources/profiles/PrusaResearch/MK3S_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3.png
rename to resources/profiles/PrusaResearch/MK3S_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_MK3S.png b/resources/profiles/PrusaResearch/MK3_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_MK3S.png
rename to resources/profiles/PrusaResearch/MK3_thumbnail.png
diff --git a/resources/icons/printers/PrusaResearch_SL1.png b/resources/profiles/PrusaResearch/SL1_thumbnail.png
similarity index 100%
rename from resources/icons/printers/PrusaResearch_SL1.png
rename to resources/profiles/PrusaResearch/SL1_thumbnail.png
diff --git a/resources/shaders/gouraud.fs b/resources/shaders/gouraud.fs
index 09003f4079..853a5512c1 100644
--- a/resources/shaders/gouraud.fs
+++ b/resources/shaders/gouraud.fs
@@ -1,6 +1,21 @@
#version 110
const vec3 ZERO = vec3(0.0, 0.0, 0.0);
+const vec3 GREEN = vec3(0.0, 0.7, 0.0);
+const vec3 YELLOW = vec3(0.5, 0.7, 0.0);
+const vec3 RED = vec3(0.7, 0.0, 0.0);
+const float EPSILON = 0.0001;
+
+struct SlopeDetection
+{
+ bool actived;
+ // x = yellow, y = red
+ vec2 z_range;
+ mat3 volume_world_normal_matrix;
+};
+
+uniform vec4 uniform_color;
+uniform SlopeDetection slope;
varying vec3 clipping_planes_dots;
@@ -10,14 +25,20 @@ varying vec2 intensity;
varying vec3 delta_box_min;
varying vec3 delta_box_max;
-uniform vec4 uniform_color;
+varying float world_normal_z;
+vec3 slope_color()
+{
+ float gradient_range = slope.z_range.x - slope.z_range.y;
+ return (world_normal_z > slope.z_range.x - EPSILON) ? GREEN : ((gradient_range == 0.0) ? RED : mix(RED, YELLOW, clamp((world_normal_z - slope.z_range.y) / gradient_range, 0.0, 1.0)));
+}
void main()
{
if (any(lessThan(clipping_planes_dots, ZERO)))
discard;
+ vec3 color = slope.actived ? slope_color() : uniform_color.rgb;
// if the fragment is outside the print volume -> use darker color
- vec3 color = (any(lessThan(delta_box_min, ZERO)) || any(greaterThan(delta_box_max, ZERO))) ? mix(uniform_color.rgb, ZERO, 0.3333) : uniform_color.rgb;
+ color = (any(lessThan(delta_box_min, ZERO)) || any(greaterThan(delta_box_max, ZERO))) ? mix(color, ZERO, 0.3333) : color;
gl_FragColor = vec4(vec3(intensity.y, intensity.y, intensity.y) + color * intensity.x, uniform_color.a);
}
diff --git a/resources/shaders/gouraud.vs b/resources/shaders/gouraud.vs
index cc54c1c449..a9f3f6118e 100644
--- a/resources/shaders/gouraud.vs
+++ b/resources/shaders/gouraud.vs
@@ -20,13 +20,22 @@ const vec3 ZERO = vec3(0.0, 0.0, 0.0);
struct PrintBoxDetection
{
+ bool actived;
vec3 min;
vec3 max;
- bool volume_detection;
mat4 volume_world_matrix;
};
+struct SlopeDetection
+{
+ bool actived;
+ // x = yellow, y = red
+ vec2 z_range;
+ mat3 volume_world_normal_matrix;
+};
+
uniform PrintBoxDetection print_box;
+uniform SlopeDetection slope;
// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
uniform vec2 z_range;
@@ -41,6 +50,8 @@ varying vec3 delta_box_max;
varying vec3 clipping_planes_dots;
+varying float world_normal_z;
+
void main()
{
// First transform the normal into camera space and normalize the result.
@@ -61,7 +72,7 @@ void main()
intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
// compute deltas for out of print volume detection (world coordinates)
- if (print_box.volume_detection)
+ if (print_box.actived)
{
vec3 v = (print_box.volume_world_matrix * gl_Vertex).xyz;
delta_box_min = v - print_box.min;
@@ -73,6 +84,9 @@ void main()
delta_box_max = ZERO;
}
+ // z component of normal vector in world coordinate used for slope shading
+ world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * gl_Normal)).z : 0.0;
+
gl_Position = ftransform();
// Point in homogenous coordinates.
vec4 world_pos = print_box.volume_world_matrix * gl_Vertex;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11996af1a4..b0eab9bcc1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,33 +104,7 @@ endif ()
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
if (SLIC3R_GUI)
# target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
-target_link_libraries(PrusaSlicer libslic3r_gui ${wxWidgets_LIBRARIES})
-
- # Configure libcurl and its dependencies OpenSSL & zlib
- find_package(CURL REQUIRED)
- if (NOT WIN32)
- # Required by libcurl
- find_package(ZLIB REQUIRED)
- endif()
- target_include_directories(PrusaSlicer PRIVATE ${CURL_INCLUDE_DIRS})
- target_link_libraries(PrusaSlicer ${CURL_LIBRARIES} ${ZLIB_LIBRARIES})
- if (SLIC3R_STATIC)
- if (NOT APPLE)
- # libcurl is always linked dynamically to the system libcurl on OSX.
- # On other systems, libcurl is linked statically if SLIC3R_STATIC is set.
- target_compile_definitions(PrusaSlicer PRIVATE CURL_STATICLIB)
- endif()
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
- # As of now, our build system produces a statically linked libcurl,
- # which links the OpenSSL library dynamically.
- find_package(OpenSSL REQUIRED)
- message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
- message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
- target_include_directories(PrusaSlicer PRIVATE ${OPENSSL_INCLUDE_DIR})
- target_link_libraries(PrusaSlicer ${OPENSSL_LIBRARIES})
- endif()
- endif()
-
+target_link_libraries(PrusaSlicer libslic3r_gui)
if (MSVC)
# Generate debug symbols even in release mode.
target_link_options(PrusaSlicer PUBLIC "$<$:/DEBUG>")
diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp
index 048aea8869..9270d3887b 100644
--- a/src/PrusaSlicer.cpp
+++ b/src/PrusaSlicer.cpp
@@ -132,14 +132,18 @@ int CLI::run(int argc, char **argv)
Model model;
try {
// When loading an AMF or 3MF, config is imported as well, including the printer technology.
- model = Model::read_from_file(file, &m_print_config, true);
- PrinterTechnology other_printer_technology = get_printer_technology(m_print_config);
+ DynamicPrintConfig config;
+ model = Model::read_from_file(file, &config, true);
+ PrinterTechnology other_printer_technology = get_printer_technology(config);
if (printer_technology == ptUnknown) {
printer_technology = other_printer_technology;
} else if (printer_technology != other_printer_technology && other_printer_technology != ptUnknown) {
boost::nowide::cerr << "Mixing configurations for FFF and SLA technologies" << std::endl;
return 1;
}
+ // config is applied to m_print_config before the current m_config values.
+ config += std::move(m_print_config);
+ m_print_config = std::move(config);
} catch (std::exception &e) {
boost::nowide::cerr << file << ": " << e.what() << std::endl;
return 1;
@@ -527,8 +531,10 @@ int CLI::run(int argc, char **argv)
gui->mainframe->load_config(m_extra_config);
});
int result = wxEntry(argc, argv);
+#if !ENABLE_NON_STATIC_CANVAS_MANAGER
//FIXME this is a workaround for the PrusaSlicer 2.1 release.
_3DScene::destroy();
+#endif // !ENABLE_NON_STATIC_CANVAS_MANAGER
return result;
#else /* SLIC3R_GUI */
// No GUI support. Just print out a help.
@@ -640,6 +646,14 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
<< "Other options:" << std::endl;
cli_misc_config_def.print_cli_help(boost::nowide::cout, false);
+ boost::nowide::cout
+ << std::endl
+ << "Print options are processed in the following order:" << std::endl
+ << "\t1) Config keys from the command line, for example --fill-pattern=stars" << std::endl
+ << "\t (highest priority, overwrites everything below)" << std::endl
+ << "\t2) Config files loaded with --load" << std::endl
+ << "\t3) Config values loaded from amf or 3mf files" << std::endl;
+
if (include_print_options) {
boost::nowide::cout << std::endl;
print_config_def.print_cli_help(boost::nowide::cout, true, [printer_technology](const ConfigOptionDef &def)
diff --git a/src/hidapi/linux/hid.c b/src/hidapi/linux/hid.c
index a62bcffb6b..d68354fe1b 100644
--- a/src/hidapi/linux/hid.c
+++ b/src/hidapi/linux/hid.c
@@ -159,7 +159,7 @@ static int hid_wrapper_udev_init()
{
// Error, close the shared library handle and finish.
hid_wrapper_udev_close();
- return -1;
+ return -2;
}
// Success.
diff --git a/src/imgui/README.md b/src/imgui/README.md
new file mode 100644
index 0000000000..00d78ed013
--- /dev/null
+++ b/src/imgui/README.md
@@ -0,0 +1,5 @@
+** Dear ImGui is a bloat-free graphical user interface library for C++.**
+
+For more information go to https://github.com/ocornut/imgui
+
+THIS DIRECTORY CONTAINS THE imgui-1.75 58b3e02 SOURCE DISTRIBUTION.
diff --git a/src/imgui/imconfig.h b/src/imgui/imconfig.h
index 50b7f471ce..09bfd16c99 100644
--- a/src/imgui/imconfig.h
+++ b/src/imgui/imconfig.h
@@ -3,10 +3,10 @@
// Runtime options (clipboard callbacks, enabling various features, etc.) can generally be set via the ImGuiIO structure.
// You can use ImGui::SetAllocatorFunctions() before calling ImGui::CreateContext() to rewire memory allocation functions.
//-----------------------------------------------------------------------------
-// A) You may edit imconfig.h (and not overwrite it when updating imgui, or maintain a patch/branch with your modifications to imconfig.h)
+// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/branch with your modifications to imconfig.h)
// B) or add configuration directives in your own file and compile with #define IMGUI_USER_CONFIG "myfilename.h"
-// If you do so you need to make sure that configuration settings are defined consistently _everywhere_ dear imgui is used, which include
-// the imgui*.cpp files but also _any_ of your code that uses imgui. This is because some compile-time options have an affect on data structures.
+// If you do so you need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include
+// the imgui*.cpp files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures.
// Defining those options in imconfig.h will ensure every compilation unit gets to see the same data structure layouts.
// Call IMGUI_CHECKVERSION() from your .cpp files to verify that the data structures your files are using are matching the ones imgui.cpp is using.
//-----------------------------------------------------------------------------
@@ -14,25 +14,32 @@
#pragma once
//---- Define assertion handler. Defaults to calling assert().
+// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
//#define IM_ASSERT(_EXPR) MyAssert(_EXPR)
//#define IM_ASSERT(_EXPR) ((void)(_EXPR)) // Disable asserts
-//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows.
+//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
+// Using dear imgui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
//#define IMGUI_API __declspec( dllexport )
//#define IMGUI_API __declspec( dllimport )
-//---- Don't define obsolete functions/enums names. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
+//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-//---- Don't implement demo windows functionality (ShowDemoWindow()/ShowStyleEditor()/ShowUserGuide() methods will be empty)
-//---- It is very strongly recommended to NOT disable the demo windows during development. Please read the comments in imgui_demo.cpp.
-//#define IMGUI_DISABLE_DEMO_WINDOWS
+//---- Disable all of Dear ImGui or don't implement standard windows.
+// It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.
+//#define IMGUI_DISABLE // Disable everything: all headers and source files will be empty.
+//#define IMGUI_DISABLE_DEMO_WINDOWS // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty. Not recommended.
+//#define IMGUI_DISABLE_METRICS_WINDOW // Disable debug/metrics window: ShowMetricsWindow() will be empty.
//---- Don't implement some functions to reduce linkage requirements.
//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc.
//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] Don't implement default IME handler. Won't use and link with ImmGetContext/ImmSetCompositionWindow.
-//#define IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself if you don't want to link with vsnprintf.
-//#define IMGUI_DISABLE_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 wrapper so you can implement them yourself. Declare your prototypes in imconfig.h.
+//#define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use and link with any Win32 function (clipboard, ime).
+//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
+//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
+//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
+//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
//#define IMGUI_DISABLE_DEFAULT_ALLOCATORS // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
//---- Include imgui_user.h at the end of imgui.h as a convenience
@@ -48,6 +55,10 @@
//#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
//#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
+//---- Unless IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined, use the much faster STB sprintf library implementation of vsnprintf instead of the one from the default C library.
+// Note that stb_sprintf.h is meant to be provided by the user and available in the include path at compile time. Also, the compatibility checks of the arguments and formats done by clang and GCC will be disabled in order to support the extra formats provided by STB sprintf.
+// #define IMGUI_USE_STB_SPRINTF
+
//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
// This will be inlined as part of ImVec2 and ImVec4 class declarations.
/*
@@ -60,9 +71,31 @@
operator MyVec4() const { return MyVec4(x,y,z,w); }
*/
-//---- Use 32-bit vertex indices (default is 16-bit) to allow meshes with more than 64K vertices. Render function needs to support it.
+//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
+// Your renderer back-end will need to support it (most example renderer back-ends support both 16/32-bit indices).
+// Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer.
+// Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
//#define ImDrawIdx unsigned int
+//---- Override ImDrawCallback signature (will need to modify renderer back-ends accordingly)
+//struct ImDrawList;
+//struct ImDrawCmd;
+//typedef void (*MyImDrawCallback)(const ImDrawList* draw_list, const ImDrawCmd* cmd, void* my_renderer_user_data);
+//#define ImDrawCallback MyImDrawCallback
+
+//---- Debug Tools: Macro to break in Debugger
+// (use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging.)
+//#define IM_DEBUG_BREAK IM_ASSERT(0)
+//#define IM_DEBUG_BREAK __debugbreak()
+
+//---- Debug Tools: Have the Item Picker break in the ItemAdd() function instead of ItemHoverable(),
+// (which comes earlier in the code, will catch a few extra items, allow picking items other than Hovered one.)
+// This adds a small runtime cost which is why it is not enabled by default.
+//#define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
+
+//---- Debug Tools: Enable slower asserts
+//#define IMGUI_DEBUG_PARANOID
+
//---- Tip: You can add extra functions within the ImGui:: namespace, here or in your own headers files.
/*
namespace ImGui
diff --git a/src/imgui/imgui.cpp b/src/imgui/imgui.cpp
index 2822e3e236..1b78dd83c1 100644
--- a/src/imgui/imgui.cpp
+++ b/src/imgui/imgui.cpp
@@ -1,15 +1,25 @@
-// dear imgui, v1.66 WIP
+// dear imgui, v1.75
// (main code and documentation)
-// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.
-// Newcomers, read 'Programmer guide' below for notes on how to setup Dear ImGui in your codebase.
-// Get latest version at https://github.com/ocornut/imgui
-// Releases change-log at https://github.com/ocornut/imgui/releases
-// Technical Support for Getting Started https://discourse.dearimgui.org/c/getting-started
-// Gallery (please post your screenshots/video there!): https://github.com/ocornut/imgui/issues/1269
+// Help:
+// - Read FAQ at http://dearimgui.org/faq
+// - Newcomers, read 'Programmer guide' below for notes on how to setup Dear ImGui in your codebase.
+// - Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. All applications in examples/ are doing that.
+
+// Resources:
+// - FAQ http://dearimgui.org/faq
+// - Homepage & latest https://github.com/ocornut/imgui
+// - Releases & changelog https://github.com/ocornut/imgui/releases
+// - Gallery https://github.com/ocornut/imgui/issues/2847 (please post your screenshots/video there!)
+// - Glossary https://github.com/ocornut/imgui/wiki/Glossary
+// - Wiki https://github.com/ocornut/imgui/wiki
+// - Issues & support https://github.com/ocornut/imgui/issues
+
// Developed by Omar Cornut and every direct or indirect contributors to the GitHub.
+// See LICENSE.txt for copyright and licensing details (standard MIT License).
// This library is free but I need your support to sustain development and maintenance.
-// If you work for a company, please consider financial support, see README. For individuals: https://www.patreon.com/imgui
+// Businesses: you can support continued development via invoiced technical support, maintenance and sponsoring contracts. Please reach out to "contact AT dearimgui.org".
+// Individuals: you can support continued development via donations. See docs/README or web page.
// It is recommended that you don't modify imgui.cpp! It will become difficult for you to update the library.
// Note that 'ImGui::' being a namespace, you can add functions into the namespace from your own source files, without
@@ -25,47 +35,39 @@ DOCUMENTATION
- MISSION STATEMENT
- END-USER GUIDE
-- PROGRAMMER GUIDE (read me!)
- - Read first
- - How to update to a newer version of Dear ImGui
- - Getting started with integrating Dear ImGui in your code/engine
- - This is how a simple application may look like (2 variations)
- - This is how a simple rendering function may look like
- - Using gamepad/keyboard navigation controls
+- PROGRAMMER GUIDE
+ - READ FIRST
+ - HOW TO UPDATE TO A NEWER VERSION OF DEAR IMGUI
+ - GETTING STARTED WITH INTEGRATING DEAR IMGUI IN YOUR CODE/ENGINE
+ - HOW A SIMPLE APPLICATION MAY LOOK LIKE (2 variations)
+ - HOW A SIMPLE RENDERING FUNCTION MAY LOOK LIKE
+ - USING GAMEPAD/KEYBOARD NAVIGATION CONTROLS
- API BREAKING CHANGES (read me when you update!)
-- FREQUENTLY ASKED QUESTIONS (FAQ), TIPS
- - How can I tell whether to dispatch mouse/keyboard to imgui or to my application?
- - How can I display an image? What is ImTextureID, how does it works?
- - How can I have multiple widgets with the same label or without a label? A primer on labels and the ID Stack.
- - How can I use my own math types instead of ImVec2/ImVec4?
- - How can I load a different font than the default?
- - How can I easily use icons in my application?
- - How can I load multiple fonts?
- - How can I display and input non-latin characters such as Chinese, Japanese, Korean, Cyrillic?
- - How can I use the drawing facilities without an ImGui window? (using ImDrawList API)
- - I integrated Dear ImGui in my engine and the text or lines are blurry..
- - I integrated Dear ImGui in my engine and some elements are clipping or disappearing when I move windows around..
- - How can I help?
+- FREQUENTLY ASKED QUESTIONS (FAQ)
+ - Read all answers online: https://www.dearimgui.org/faq, or in docs/FAQ.md (with a Markdown viewer)
-CODE
+CODE
(search for "[SECTION]" in the code to find them)
// [SECTION] FORWARD DECLARATIONS
// [SECTION] CONTEXT AND MEMORY ALLOCATORS
// [SECTION] MAIN USER FACING STRUCTURES (ImGuiStyle, ImGuiIO)
-// [SECTION] MISC HELPER/UTILITIES (Maths, String, Format, Hash, File functions)
-// [SECTION] MISC HELPER/UTILITIES (ImText* functions)
-// [SECTION] MISC HELPER/UTILITIES (Color functions)
+// [SECTION] MISC HELPERS/UTILITIES (Geometry functions)
+// [SECTION] MISC HELPERS/UTILITIES (String, Format, Hash functions)
+// [SECTION] MISC HELPERS/UTILITIES (File functions)
+// [SECTION] MISC HELPERS/UTILITIES (ImText* functions)
+// [SECTION] MISC HELPERS/UTILITIES (Color functions)
// [SECTION] ImGuiStorage
// [SECTION] ImGuiTextFilter
// [SECTION] ImGuiTextBuffer
// [SECTION] ImGuiListClipper
// [SECTION] RENDER HELPERS
// [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!)
+// [SECTION] ERROR CHECKING
+// [SECTION] SCROLLING
// [SECTION] TOOLTIPS
// [SECTION] POPUPS
// [SECTION] KEYBOARD/GAMEPAD NAVIGATION
-// [SECTION] COLUMNS
// [SECTION] DRAG AND DROP
// [SECTION] LOGGING/CAPTURING
// [SECTION] SETTINGS
@@ -83,19 +85,19 @@ CODE
MISSION STATEMENT
=================
- - Easy to use to create code-driven and data-driven tools
- - Easy to use to create ad hoc short-lived tools and long-lived, more elaborate tools
- - Easy to hack and improve
- - Minimize screen real-estate usage
- - Minimize setup and maintenance
- - Minimize state storage on user side
- - Portable, minimize dependencies, run on target (consoles, phones, etc.)
- - Efficient runtime and memory consumption (NB- we do allocate when "growing" content e.g. creating a window,
- opening a tree node for the first time, etc. but a typical frame should not allocate anything)
+ - Easy to use to create code-driven and data-driven tools.
+ - Easy to use to create ad hoc short-lived tools and long-lived, more elaborate tools.
+ - Easy to hack and improve.
+ - Minimize screen real-estate usage.
+ - Minimize setup and maintenance.
+ - Minimize state storage on user side.
+ - Portable, minimize dependencies, run on target (consoles, phones, etc.).
+ - Efficient runtime and memory consumption (NB- we do allocate when "growing" content e.g. creating a window,.
+ opening a tree node for the first time, etc. but a typical frame should not allocate anything).
Designed for developers and content-creators, not the typical end-user! Some of the weaknesses includes:
- - Doesn't look fancy, doesn't animate
- - Limited layout features, intricate layouts are typically crafted in code
+ - Doesn't look fancy, doesn't animate.
+ - Limited layout features, intricate layouts are typically crafted in code.
END-USER GUIDE
@@ -126,16 +128,29 @@ CODE
================
READ FIRST
-
- - Read the FAQ below this section!
+ ----------
+ - Remember to read the FAQ (https://www.dearimgui.org/faq)
- Your code creates the UI, if your code doesn't run the UI is gone! The UI can be highly dynamic, there are no construction
or destruction steps, less superfluous data retention on your side, less state duplication, less state synchronization, less bugs.
- Call and read ImGui::ShowDemoWindow() for demo code demonstrating most features.
- - You can learn about immediate-mode GUI principles at http://www.johno.se/book/imgui.html or watch http://mollyrocket.com/861
- See README.md for more links describing the IMGUI paradigm. Dear ImGui is an implementation of the IMGUI paradigm.
+ - The library is designed to be built from sources. Avoid pre-compiled binaries and packaged versions. See imconfig.h to configure your build.
+ - Dear ImGui is an implementation of the IMGUI paradigm (immediate-mode graphical user interface, a term coined by Casey Muratori).
+ You can learn about IMGUI principles at http://www.johno.se/book/imgui.html, http://mollyrocket.com/861 & more links docs/README.md.
+ - Dear ImGui is a "single pass" rasterizing implementation of the IMGUI paradigm, aimed at ease of use and high-performances.
+ For every application frame your UI code will be called only once. This is in contrast to e.g. Unity's own implementation of an IMGUI,
+ where the UI code is called multiple times ("multiple passes") from a single entry point. There are pros and cons to both approaches.
+ - Our origin are on the top-left. In axis aligned bounding boxes, Min = top-left, Max = bottom-right.
+ - This codebase is also optimized to yield decent performances with typical "Debug" builds settings.
+ - Please make sure you have asserts enabled (IM_ASSERT redirects to assert() by default, but can be redirected).
+ If you get an assert, read the messages and comments around the assert.
+ - C++: this is a very C-ish codebase: we don't rely on C++11, we don't include any C++ headers, and ImGui:: is a namespace.
+ - C++: ImVec2/ImVec4 do not expose math operators by default, because it is expected that you use your own math types.
+ See FAQ "How can I use my own math types instead of ImVec2/ImVec4?" for details about setting up imconfig.h for that.
+ However, imgui_internal.h can optionally export math operators for ImVec2/ImVec4, which we use in this codebase.
+ - C++: pay attention that ImVector<> manipulates plain-old-data and does not honor construction/destruction (avoid using it in your code!).
HOW TO UPDATE TO A NEWER VERSION OF DEAR IMGUI
-
+ ----------------------------------------------
- Overwrite all the sources files except for imconfig.h (if you have made modification to your copy of imconfig.h)
- Or maintain your own branch where you have imconfig.h modified.
- Read the "API BREAKING CHANGES" section (below). This is where we list occasional API breaking changes.
@@ -145,20 +160,22 @@ CODE
- Try to keep your copy of dear imgui reasonably up to date.
GETTING STARTED WITH INTEGRATING DEAR IMGUI IN YOUR CODE/ENGINE
-
+ ---------------------------------------------------------------
- Run and study the examples and demo in imgui_demo.cpp to get acquainted with the library.
+ - In the majority of cases you should be able to use unmodified back-ends files available in the examples/ folder.
- Add the Dear ImGui source files to your projects or using your preferred build system.
- It is recommended you build and statically link the .cpp files as part of your project and not as shared library (DLL).
- - You can later customize the imconfig.h file to tweak some compile-time behavior, such as integrating imgui types with your own maths types.
+ It is recommended you build and statically link the .cpp files as part of your project and NOT as shared library (DLL).
+ - You can later customize the imconfig.h file to tweak some compile-time behavior, such as integrating Dear ImGui types with your own maths types.
- When using Dear ImGui, your programming IDE is your friend: follow the declaration of variables, functions and types to find comments about them.
- Dear ImGui never touches or knows about your GPU state. The only function that knows about GPU is the draw function that you provide.
Effectively it means you can create widgets at any time in your code, regardless of considerations of being in "update" vs "render"
- phases of your own application. All rendering informatioe are stored into command-lists that you will retrieve after calling ImGui::Render().
+ phases of your own application. All rendering information are stored into command-lists that you will retrieve after calling ImGui::Render().
- Refer to the bindings and demo applications in the examples/ folder for instruction on how to setup your code.
- If you are running over a standard OS with a common graphics API, you should be able to use unmodified imgui_impl_*** files from the examples/ folder.
HOW A SIMPLE APPLICATION MAY LOOK LIKE
- EXHIBIT 1: USING THE EXAMPLE BINDINGS (imgui_impl_XXX.cpp files from the examples/ folder)
+ --------------------------------------
+ EXHIBIT 1: USING THE EXAMPLE BINDINGS (imgui_impl_XXX.cpp files from the examples/ folder).
// Application init: create a dear imgui context, setup some options, load fonts
ImGui::CreateContext();
@@ -167,7 +184,7 @@ CODE
// TODO: Fill optional fields of the io structure later.
// TODO: Load TTF/OTF fonts if you don't want to use the default font.
- // Initialize helper Platform and Renderer bindings (here we are using imgui_impl_win32 and imgui_impl_dx11)
+ // Initialize helper Platform and Renderer bindings (here we are using imgui_impl_win32.cpp and imgui_impl_dx11.cpp)
ImGui_ImplWin32_Init(hwnd);
ImGui_ImplDX11_Init(g_pd3dDevice, g_pd3dDeviceContext);
@@ -187,13 +204,12 @@ CODE
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
g_pSwapChain->Present(1, 0);
}
-
+
// Shutdown
ImGui_ImplDX11_Shutdown();
ImGui_ImplWin32_Shutdown();
ImGui::DestroyContext();
- HOW A SIMPLE APPLICATION MAY LOOK LIKE
EXHIBIT 2: IMPLEMENTING CUSTOM BINDING / CUSTOM ENGINE
// Application init: create a dear imgui context, setup some options, load fonts
@@ -211,7 +227,7 @@ CODE
// At this point you've got the texture data and you need to upload that your your graphic system:
// After we have created the texture, store its pointer/identifier (_in whichever format your engine uses_) in 'io.Fonts->TexID'.
- // This will be passed back to your via the renderer. Basically ImTextureID == void*. Read FAQ below for details about ImTextureID.
+ // This will be passed back to your via the renderer. Basically ImTextureID == void*. Read FAQ for details about ImTextureID.
MyTexture* texture = MyEngine::CreateTextureFromMemoryPixels(pixels, width, height, TEXTURE_TYPE_RGBA32)
io.Fonts->TexID = (void*)texture;
@@ -228,16 +244,16 @@ CODE
io.MouseDown[1] = my_mouse_buttons[1];
// Call NewFrame(), after this point you can use ImGui::* functions anytime
- // (So you want to try calling NewFrame() as early as you can in your mainloop to be able to use imgui everywhere)
+ // (So you want to try calling NewFrame() as early as you can in your mainloop to be able to use Dear ImGui everywhere)
ImGui::NewFrame();
// Most of your application code here
ImGui::Text("Hello, world!");
- MyGameUpdate(); // may use any ImGui functions, e.g. ImGui::Begin("My window"); ImGui::Text("Hello, world!"); ImGui::End();
- MyGameRender(); // may use any ImGui functions as well!
+ MyGameUpdate(); // may use any Dear ImGui functions, e.g. ImGui::Begin("My window"); ImGui::Text("Hello, world!"); ImGui::End();
+ MyGameRender(); // may use any Dear ImGui functions as well!
- // Render imgui, swap buffers
- // (You want to try calling EndFrame/Render as late as you can, to be able to use imgui in your own game rendering code)
+ // Render dear imgui, swap buffers
+ // (You want to try calling EndFrame/Render as late as you can, to be able to use Dear ImGui in your own game rendering code)
ImGui::EndFrame();
ImGui::Render();
ImDrawData* draw_data = ImGui::GetDrawData();
@@ -249,17 +265,18 @@ CODE
ImGui::DestroyContext();
HOW A SIMPLE RENDERING FUNCTION MAY LOOK LIKE
-
+ ---------------------------------------------
void void MyImGuiRenderFunction(ImDrawData* draw_data)
{
// TODO: Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled
- // TODO: Setup viewport using draw_data->DisplaySize
+ // TODO: Setup viewport covering draw_data->DisplayPos to draw_data->DisplayPos + draw_data->DisplaySize
// TODO: Setup orthographic projection matrix cover draw_data->DisplayPos to draw_data->DisplayPos + draw_data->DisplaySize
// TODO: Setup shader: vertex { float2 pos, float2 uv, u32 color }, fragment shader sample color from 1 texture, multiply by vertex color.
for (int n = 0; n < draw_data->CmdListsCount; n++)
{
- const ImDrawVert* vtx_buffer = cmd_list->VtxBuffer.Data; // vertex buffer generated by ImGui
- const ImDrawIdx* idx_buffer = cmd_list->IdxBuffer.Data; // index buffer generated by ImGui
+ const ImDrawList* cmd_list = draw_data->CmdLists[n];
+ const ImDrawVert* vtx_buffer = cmd_list->VtxBuffer.Data; // vertex buffer generated by Dear ImGui
+ const ImDrawIdx* idx_buffer = cmd_list->IdxBuffer.Data; // index buffer generated by Dear ImGui
for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
{
const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
@@ -270,7 +287,7 @@ CODE
else
{
// The texture for the draw call is specified by pcmd->TextureId.
- // The vast majority of draw calls will use the imgui texture atlas, which value you have set yourself during initialization.
+ // The vast majority of draw calls will use the Dear ImGui texture atlas, which value you have set yourself during initialization.
MyEngineBindTexture((MyTexture*)pcmd->TextureId);
// We are using scissoring to clip some objects. All low-level graphics API should supports it.
@@ -278,14 +295,14 @@ CODE
// (some elements visible outside their bounds) but you can fix that once everything else works!
// - Clipping coordinates are provided in imgui coordinates space (from draw_data->DisplayPos to draw_data->DisplayPos + draw_data->DisplaySize)
// In a single viewport application, draw_data->DisplayPos will always be (0,0) and draw_data->DisplaySize will always be == io.DisplaySize.
- // However, in the interest of supporting multi-viewport applications in the future (see 'viewport' branch on github),
+ // However, in the interest of supporting multi-viewport applications in the future (see 'viewport' branch on github),
// always subtract draw_data->DisplayPos from clipping bounds to convert them to your viewport space.
// - Note that pcmd->ClipRect contains Min+Max bounds. Some graphics API may use Min+Max, other may use Min+Size (size being Max-Min)
ImVec2 pos = draw_data->DisplayPos;
MyEngineScissor((int)(pcmd->ClipRect.x - pos.x), (int)(pcmd->ClipRect.y - pos.y), (int)(pcmd->ClipRect.z - pos.x), (int)(pcmd->ClipRect.w - pos.y));
// Render 'pcmd->ElemCount/3' indexed triangles.
- // By default the indices ImDrawIdx are 16-bits, you can change them to 32-bits in imconfig.h if your engine doesn't support 16-bits indices.
+ // By default the indices ImDrawIdx are 16-bit, you can change them to 32-bit in imconfig.h if your engine doesn't support 16-bit indices.
MyEngineDrawIndexedTriangles(pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer, vtx_buffer);
}
idx_buffer += pcmd->ElemCount;
@@ -295,16 +312,25 @@ CODE
- The examples/ folders contains many actual implementation of the pseudo-codes above.
- When calling NewFrame(), the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags are updated.
- They tell you if Dear ImGui intends to use your inputs. When a flag is set you want to hide the corresponding inputs
- from the rest of your application. In every cases you need to pass on the inputs to imgui. Refer to the FAQ for more information.
- - Please read the FAQ below!. Amusingly, it is called a FAQ because people frequently run into the same issues!
+ They tell you if Dear ImGui intends to use your inputs. When a flag is set you want to hide the corresponding inputs from the
+ rest of your application. In every cases you need to pass on the inputs to Dear ImGui.
+ - Refer to the FAQ for more information. Amusingly, it is called a FAQ because people frequently run into the same issues!
USING GAMEPAD/KEYBOARD NAVIGATION CONTROLS
-
- - The gamepad/keyboard navigation is fairly functional and keeps being improved.
- - Gamepad support is particularly useful to use dear imgui on a console system (e.g. PS4, Switch, XB1) without a mouse!
+ ------------------------------------------
+ - The gamepad/keyboard navigation is fairly functional and keeps being improved.
+ - Gamepad support is particularly useful to use Dear ImGui on a console system (e.g. PS4, Switch, XB1) without a mouse!
- You can ask questions and report issues at https://github.com/ocornut/imgui/issues/787
- The initial focus was to support game controllers, but keyboard is becoming increasingly and decently usable.
+ - Keyboard:
+ - Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard to enable.
+ NewFrame() will automatically fill io.NavInputs[] based on your io.KeysDown[] + io.KeyMap[] arrays.
+ - When keyboard navigation is active (io.NavActive + ImGuiConfigFlags_NavEnableKeyboard), the io.WantCaptureKeyboard flag
+ will be set. For more advanced uses, you may want to read from:
+ - io.NavActive: true when a window is focused and it doesn't have the ImGuiWindowFlags_NoNavInputs flag set.
+ - io.NavVisible: true when the navigation cursor is visible (and usually goes false when mouse is used).
+ - or query focus information with e.g. IsWindowFocused(ImGuiFocusedFlags_AnyWindow), IsItemFocused() etc. functions.
+ Please reach out if you think the game vs navigation input sharing could be improved.
- Gamepad:
- Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad to enable.
- Backend: Set io.BackendFlags |= ImGuiBackendFlags_HasGamepad + fill the io.NavInputs[] fields before calling NewFrame().
@@ -316,15 +342,6 @@ CODE
- You can download PNG/PSD files depicting the gamepad controls for common controllers at: http://goo.gl/9LgVZW.
- If you need to share inputs between your game and the imgui parts, the easiest approach is to go all-or-nothing, with a buttons combo
to toggle the target. Please reach out if you think the game vs navigation input sharing could be improved.
- - Keyboard:
- - Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard to enable.
- NewFrame() will automatically fill io.NavInputs[] based on your io.KeysDown[] + io.KeyMap[] arrays.
- - When keyboard navigation is active (io.NavActive + ImGuiConfigFlags_NavEnableKeyboard), the io.WantCaptureKeyboard flag
- will be set. For more advanced uses, you may want to read from:
- - io.NavActive: true when a window is focused and it doesn't have the ImGuiWindowFlags_NoNavInputs flag set.
- - io.NavVisible: true when the navigation cursor is visible (and usually goes false when mouse is used).
- - or query focus information with e.g. IsWindowFocused(ImGuiFocusedFlags_AnyWindow), IsItemFocused() etc. functions.
- Please reach out if you think the game vs navigation input sharing could be improved.
- Mouse:
- PS4 users: Consider emulating a mouse cursor with DualShock4 touch pad or a spare analog stick as a mouse-emulation fallback.
- Consoles/Tablet/Phone users: Consider using a Synergy 1.x server (on your PC) + uSynergy.c (on your console/tablet/phone app) to share your PC mouse/keyboard.
@@ -345,9 +362,56 @@ CODE
When you are not sure about a old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all imgui files.
You can read releases logs https://github.com/ocornut/imgui/releases for more details.
- - 2018/10/12 (1.66) - Renamed misc/stl/imgui_stl.* to misc/cpp/imgui_stdlib.* in prevision for other C++ helper files.
+ - 2020/01/22 (1.75) - ImDrawList::AddCircle()/AddCircleFilled() functions don't accept negative radius any more.
+ - 2019/12/17 (1.75) - made Columns() limited to 64 columns by asserting above that limit. While the current code technically supports it, future code may not so we're putting the restriction ahead.
+ - 2019/12/13 (1.75) - [imgui_internal.h] changed ImRect() default constructor initializes all fields to 0.0f instead of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). If you used ImRect::Add() to create bounding boxes by adding multiple points into it, you may need to fix your initial value.
+ - 2019/12/08 (1.75) - removed redirecting functions/enums that were marked obsolete in 1.53 (December 2017):
+ - ShowTestWindow() -> use ShowDemoWindow()
+ - IsRootWindowFocused() -> use IsWindowFocused(ImGuiFocusedFlags_RootWindow)
+ - IsRootWindowOrAnyChildFocused() -> use IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows)
+ - SetNextWindowContentWidth(w) -> use SetNextWindowContentSize(ImVec2(w, 0.0f)
+ - GetItemsLineHeightWithSpacing() -> use GetFrameHeightWithSpacing()
+ - ImGuiCol_ChildWindowBg -> use ImGuiCol_ChildBg
+ - ImGuiStyleVar_ChildWindowRounding -> use ImGuiStyleVar_ChildRounding
+ - ImGuiTreeNodeFlags_AllowOverlapMode -> use ImGuiTreeNodeFlags_AllowItemOverlap
+ - IMGUI_DISABLE_TEST_WINDOWS -> use IMGUI_DISABLE_DEMO_WINDOWS
+ - 2019/12/08 (1.75) - obsoleted calling ImDrawList::PrimReserve() with a negative count (which was the vaguely documented and rarely if ever used). Instead we added an explicit PrimUnreserve() API.
+ - 2019/12/06 (1.75) - removed implicit default parameter to IsMouseDragging(int button = 0) to be consistent with other mouse functions (none of the other functions have it).
+ - 2019/11/21 (1.74) - ImFontAtlas::AddCustomRectRegular() now requires an ID larger than 0x110000 (instead of 0x10000) to conform with supporting Unicode planes 1-16 in a future update. ID below 0x110000 will now assert.
+ - 2019/11/19 (1.74) - renamed IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS to IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS for consistency.
+ - 2019/11/19 (1.74) - renamed IMGUI_DISABLE_MATH_FUNCTIONS to IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS for consistency.
+ - 2019/10/22 (1.74) - removed redirecting functions/enums that were marked obsolete in 1.52 (October 2017):
+ - Begin() [old 5 args version] -> use Begin() [3 args], use SetNextWindowSize() SetNextWindowBgAlpha() if needed
+ - IsRootWindowOrAnyChildHovered() -> use IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows)
+ - AlignFirstTextHeightToWidgets() -> use AlignTextToFramePadding()
+ - SetNextWindowPosCenter() -> use SetNextWindowPos() with a pivot of (0.5f, 0.5f)
+ - ImFont::Glyph -> use ImFontGlyph
+ - 2019/10/14 (1.74) - inputs: Fixed a miscalculation in the keyboard/mouse "typematic" repeat delay/rate calculation, used by keys and e.g. repeating mouse buttons as well as the GetKeyPressedAmount() function.
+ if you were using a non-default value for io.KeyRepeatRate (previous default was 0.250), you can add +io.KeyRepeatDelay to it to compensate for the fix.
+ The function was triggering on: 0.0 and (delay+rate*N) where (N>=1). Fixed formula responds to (N>=0). Effectively it made io.KeyRepeatRate behave like it was set to (io.KeyRepeatRate + io.KeyRepeatDelay).
+ If you never altered io.KeyRepeatRate nor used GetKeyPressedAmount() this won't affect you.
+ - 2019/07/15 (1.72) - removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete).
+ - 2019/07/12 (1.72) - renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Kept redirection typedef (will obsolete).
+ - 2019/06/14 (1.72) - removed redirecting functions/enums names that were marked obsolete in 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME. Grep this log for details and new names, or see how they were implemented until 1.71.
+ - 2019/06/07 (1.71) - rendering of child window outer decorations (bg color, border, scrollbars) is now performed as part of the parent window. If you have
+ overlapping child windows in a same parent, and relied on their relative z-order to be mapped to their submission order, this will affect your rendering.
+ This optimization is disabled if the parent window has no visual output, because it appears to be the most common situation leading to the creation of overlapping child windows.
+ Please reach out if you are affected.
+ - 2019/05/13 (1.71) - renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Kept inline redirection function (will obsolete).
+ - 2019/05/11 (1.71) - changed io.AddInputCharacter(unsigned short c) signature to io.AddInputCharacter(unsigned int c).
+ - 2019/04/29 (1.70) - improved ImDrawList thick strokes (>1.0f) preserving correct thickness up to 90 degrees angles (e.g. rectangles). If you have custom rendering using thick lines, they will appear thicker now.
+ - 2019/04/29 (1.70) - removed GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function (will obsolete).
+ - 2019/03/04 (1.69) - renamed GetOverlayDrawList() to GetForegroundDrawList(). Kept redirection function (will obsolete).
+ - 2019/02/26 (1.69) - renamed ImGuiColorEditFlags_RGB/ImGuiColorEditFlags_HSV/ImGuiColorEditFlags_HEX to ImGuiColorEditFlags_DisplayRGB/ImGuiColorEditFlags_DisplayHSV/ImGuiColorEditFlags_DisplayHex. Kept redirection enums (will obsolete).
+ - 2019/02/14 (1.68) - made it illegal/assert when io.DisplayTime == 0.0f (with an exception for the first frame). If for some reason your time step calculation gives you a zero value, replace it with a dummy small value!
+ - 2019/02/01 (1.68) - removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).
+ - 2019/01/06 (1.67) - renamed io.InputCharacters[], marked internal as was always intended. Please don't access directly, and use AddInputCharacter() instead!
+ - 2019/01/06 (1.67) - renamed ImFontAtlas::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Kept redirection typedef (will obsolete).
+ - 2018/12/20 (1.67) - made it illegal to call Begin("") with an empty string. This somehow half-worked before but had various undesirable side-effects.
+ - 2018/12/10 (1.67) - renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges as we are doing a large pass on configuration flags.
+ - 2018/10/12 (1.66) - renamed misc/stl/imgui_stl.* to misc/cpp/imgui_stdlib.* in prevision for other C++ helper files.
- 2018/09/28 (1.66) - renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
- - 2018/09/06 (1.65) - renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h.
+ - 2018/09/06 (1.65) - renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h.
If you were conveniently using the imgui copy of those STB headers in your project you will have to update your include paths.
- 2018/09/05 (1.65) - renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
- 2018/08/31 (1.64) - added imgui_widgets.cpp file, extracted and moved widgets code out of imgui.cpp into imgui_widgets.cpp. Re-ordered some of the code remaining in imgui.cpp.
@@ -356,12 +420,16 @@ CODE
- 2018/08/22 (1.63) - renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete soonish as IsItemDeactivatedAfterChange() is very recent).
- 2018/08/21 (1.63) - renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
- 2018/08/21 (1.63) - removed ImGuiInputTextCallbackData::ReadOnly since it is a duplication of (ImGuiInputTextCallbackData::Flags & ImGuiInputTextFlags_ReadOnly).
- - 2018/08/01 (1.63) - removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor of a global io.ConfigResizeWindowsFromEdges to enable the feature.
+ - 2018/08/01 (1.63) - removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor of a global io.ConfigResizeWindowsFromEdges [update 1.67 renamed to ConfigWindowsResizeFromEdges] to enable the feature.
- 2018/08/01 (1.63) - renamed io.OptCursorBlink to io.ConfigCursorBlink [-> io.ConfigInputTextCursorBlink in 1.65], io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency.
- 2018/07/22 (1.63) - changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
- 2018/07/08 (1.63) - style: renamed ImGuiCol_ModalWindowDarkening to ImGuiCol_ModalWindowDimBg for consistency with other features. Kept redirection enum (will obsolete).
+ - 2018/06/08 (1.62) - examples: the imgui_impl_xxx files have been split to separate platform (Win32, Glfw, SDL2, etc.) from renderer (DX11, OpenGL, Vulkan, etc.).
+ old bindings will still work as is, however prefer using the separated bindings as they will be updated to support multi-viewports.
+ when adopting new bindings follow the main.cpp code of your preferred examples/ folder to know which functions to call.
+ in particular, note that old bindings called ImGui::NewFrame() at the end of their ImGui_ImplXXXX_NewFrame() function.
- 2018/06/06 (1.62) - renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set.
- - 2018/06/06 (1.62) - TreeNodeEx()/TreeNodeBehavior(): the ImGuiTreeNodeFlags_CollapsingHeader helper now include the ImGuiTreeNodeFlags_NoTreePushOnOpen flag. See Changelog for details.
+ - 2018/06/06 (1.62) - TreeNodeEx()/TreeNodeBehavior(): the ImGuiTreeNodeFlags_CollapsingHeader helper now include the ImGuiTreeNodeFlags_NoTreePushOnOpen flag. See Changelog for details.
- 2018/05/03 (1.61) - DragInt(): the default compile-time format string has been changed from "%.0f" to "%d", as we are not using integers internally any more.
If you used DragInt() with custom format strings, make sure you change them to use %d or an integer-compatible format.
To honor backward-compatibility, the DragInt() code will currently parse and modify format strings to replace %*f with %d, giving time to users to upgrade their code.
@@ -406,8 +474,12 @@ CODE
- 2017/10/20 (1.52) - changed IsWindowHovered() default parameters behavior to return false if an item is active in another window (e.g. click-dragging item from another window to this window). You can use the newly introduced IsWindowHovered() flags to requests this specific behavior if you need it.
- 2017/10/20 (1.52) - marked IsItemHoveredRect()/IsMouseHoveringWindow() as obsolete, in favor of using the newly introduced flags for IsItemHovered() and IsWindowHovered(). See https://github.com/ocornut/imgui/issues/1382 for details.
removed the IsItemRectHovered()/IsWindowRectHovered() names introduced in 1.51 since they were merely more consistent names for the two functions we are now obsoleting.
+ IsItemHoveredRect() --> IsItemHovered(ImGuiHoveredFlags_RectOnly)
+ IsMouseHoveringAnyWindow() --> IsWindowHovered(ImGuiHoveredFlags_AnyWindow)
+ IsMouseHoveringWindow() --> IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) [weird, old behavior]
- 2017/10/17 (1.52) - marked the old 5-parameters version of Begin() as obsolete (still available). Use SetNextWindowSize()+Begin() instead!
- 2017/10/11 (1.52) - renamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
+ - 2017/09/26 (1.52) - renamed ImFont::Glyph to ImFontGlyph. Kept redirection typedef (will obsolete).
- 2017/09/25 (1.52) - removed SetNextWindowPosCenter() because SetNextWindowPos() now has the optional pivot information to do the same and more. Kept redirection function (will obsolete).
- 2017/08/25 (1.52) - io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we now accept negative mouse coordinates. In your binding if you need to support unavailable mouse, make sure to replace "io.MousePos = ImVec2(-1,-1)" with "io.MousePos = ImVec2(-FLT_MAX,-FLT_MAX)".
- 2017/08/22 (1.51) - renamed IsItemHoveredRect() to IsItemRectHovered(). Kept inline redirection function (will obsolete). -> (1.52) use IsItemHovered(ImGuiHoveredFlags_RectOnly)!
@@ -415,10 +487,10 @@ CODE
- renamed IsMouseHoveringWindow() to IsWindowRectHovered() for consistency. Kept inline redirection function (will obsolete).
- 2017/08/20 (1.51) - renamed GetStyleColName() to GetStyleColorName() for consistency.
- 2017/08/20 (1.51) - added PushStyleColor(ImGuiCol idx, ImU32 col) overload, which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.
- - 2017/08/15 (1.51) - marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame.
+ - 2017/08/15 (1.51) - marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame type.
- 2017/08/15 (1.51) - changed parameter order for BeginPopupContextWindow() from (const char*,int buttons,bool also_over_items) to (const char*,int buttons,bool also_over_items). Note that most calls relied on default parameters completely.
- - 2017/08/13 (1.51) - renamed ImGuiCol_Columns*** to ImGuiCol_Separator***. Kept redirection enums (will obsolete).
- - 2017/08/11 (1.51) - renamed ImGuiSetCond_*** types and flags to ImGuiCond_***. Kept redirection enums (will obsolete).
+ - 2017/08/13 (1.51) - renamed ImGuiCol_Column to ImGuiCol_Separator, ImGuiCol_ColumnHovered to ImGuiCol_SeparatorHovered, ImGuiCol_ColumnActive to ImGuiCol_SeparatorActive. Kept redirection enums (will obsolete).
+ - 2017/08/11 (1.51) - renamed ImGuiSetCond_Always to ImGuiCond_Always, ImGuiSetCond_Once to ImGuiCond_Once, ImGuiSetCond_FirstUseEver to ImGuiCond_FirstUseEver, ImGuiSetCond_Appearing to ImGuiCond_Appearing. Kept redirection enums (will obsolete).
- 2017/08/09 (1.51) - removed ValueColor() helpers, they are equivalent to calling Text(label) + SameLine() + ColorButton().
- 2017/08/08 (1.51) - removed ColorEditMode() and ImGuiColorEditMode in favor of ImGuiColorEditFlags and parameters to the various Color*() functions. The SetColorEditOptions() allows to initialize default but the user can still change them with right-click context menu.
- changed prototype of 'ColorEdit4(const char* label, float col[4], bool show_alpha = true)' to 'ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags = 0)', where passing flags = 0x01 is a safe no-op (hello dodgy backward compatibility!). - check and run the demo window, under "Color/Picker Widgets", to understand the various new options.
@@ -431,14 +503,9 @@ CODE
- 2016/09/25 (1.50) - style.WindowTitleAlign is now a ImVec2 (ImGuiAlign enum was removed). set to (0.5f,0.5f) for horizontal+vertical centering, (0.0f,0.0f) for upper-left, etc.
- 2016/07/30 (1.50) - SameLine(x) with x>0.0f is now relative to left of column/group if any, and not always to left of window. This was sort of always the intent and hopefully breakage should be minimal.
- 2016/05/12 (1.49) - title bar (using ImGuiCol_TitleBg/ImGuiCol_TitleBgActive colors) isn't rendered over a window background (ImGuiCol_WindowBg color) anymore.
- If your TitleBg/TitleBgActive alpha was 1.0f or you are using the default theme it will not affect you.
- If your TitleBg/TitleBgActive alpha was <1.0f you need to tweak your custom theme to readjust for the fact that we don't draw a WindowBg background behind the title bar.
- This helper function will convert an old TitleBg/TitleBgActive color into a new one with the same visual output, given the OLD color and the OLD WindowBg color.
- ImVec4 ConvertTitleBgCol(const ImVec4& win_bg_col, const ImVec4& title_bg_col)
- {
- float new_a = 1.0f - ((1.0f - win_bg_col.w) * (1.0f - title_bg_col.w)), k = title_bg_col.w / new_a;
- return ImVec4((win_bg_col.x * win_bg_col.w + title_bg_col.x) * k, (win_bg_col.y * win_bg_col.w + title_bg_col.y) * k, (win_bg_col.z * win_bg_col.w + title_bg_col.z) * k, new_a);
- }
+ If your TitleBg/TitleBgActive alpha was 1.0f or you are using the default theme it will not affect you, otherwise if <1.0f you need tweak your custom theme to readjust for the fact that we don't draw a WindowBg background behind the title bar.
+ This helper function will convert an old TitleBg/TitleBgActive color into a new one with the same visual output, given the OLD color and the OLD WindowBg color:
+ ImVec4 ConvertTitleBgCol(const ImVec4& win_bg_col, const ImVec4& title_bg_col) { float new_a = 1.0f - ((1.0f - win_bg_col.w) * (1.0f - title_bg_col.w)), k = title_bg_col.w / new_a; return ImVec4((win_bg_col.x * win_bg_col.w + title_bg_col.x) * k, (win_bg_col.y * win_bg_col.w + title_bg_col.y) * k, (win_bg_col.z * win_bg_col.w + title_bg_col.z) * k, new_a); }
If this is confusing, pick the RGB value from title bar from an old screenshot and apply this as TitleBg/TitleBgActive. Or you may just create TitleBgActive from a tweaked TitleBg color.
- 2016/05/07 (1.49) - removed confusing set of GetInternalState(), GetInternalStateSize(), SetInternalState() functions. Now using CreateContext(), DestroyContext(), GetCurrentContext(), SetCurrentContext().
- 2016/05/02 (1.49) - renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(), no redirection.
@@ -465,7 +532,7 @@ CODE
- the signature of the io.RenderDrawListsFn handler has changed!
old: ImGui_XXXX_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count)
new: ImGui_XXXX_RenderDrawLists(ImDrawData* draw_data).
- argument: 'cmd_lists' becomes 'draw_data->CmdLists', 'cmd_lists_count' becomes 'draw_data->CmdListsCount'
+ parameters: 'cmd_lists' becomes 'draw_data->CmdLists', 'cmd_lists_count' becomes 'draw_data->CmdListsCount'
ImDrawList: 'commands' becomes 'CmdBuffer', 'vtx_buffer' becomes 'VtxBuffer', 'IdxBuffer' is new.
ImDrawCmd: 'vtx_count' becomes 'ElemCount', 'clip_rect' becomes 'ClipRect', 'user_callback' becomes 'UserCallback', 'texture_id' becomes 'TextureId'.
- each ImDrawList now contains both a vertex buffer and an index buffer. For each command, render ElemCount/3 triangles using indices from the index buffer.
@@ -497,14 +564,13 @@ CODE
- 2015/02/01 (1.31) - removed IO.MemReallocFn (unused)
- 2015/01/19 (1.30) - renamed ImGuiStorage::GetIntPtr()/GetFloatPtr() to GetIntRef()/GetIntRef() because Ptr was conflicting with actual pointer storage functions.
- 2015/01/11 (1.30) - big font/image API change! now loads TTF file. allow for multiple fonts. no need for a PNG loader.
- (1.30) - removed GetDefaultFontData(). uses io.Fonts->GetTextureData*() API to retrieve uncompressed pixels.
- font init: const void* png_data; unsigned int png_size; ImGui::GetDefaultFontData(NULL, NULL, &png_data, &png_size); <..Upload texture to GPU..>
- became: unsigned char* pixels; int width, height; io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); <..Upload texture to GPU>; io.Fonts->TexId = YourTextureIdentifier;
- you now more flexibility to load multiple TTF fonts and manage the texture buffer for internal needs.
- it is now recommended that you sample the font texture with bilinear interpolation.
- (1.30) - added texture identifier in ImDrawCmd passed to your render function (we can now render images). make sure to set io.Fonts->TexID.
- (1.30) - removed IO.PixelCenterOffset (unnecessary, can be handled in user projection matrix)
- (1.30) - removed ImGui::IsItemFocused() in favor of ImGui::IsItemActive() which handles all widgets
+ - 2015/01/11 (1.30) - removed GetDefaultFontData(). uses io.Fonts->GetTextureData*() API to retrieve uncompressed pixels.
+ - old: const void* png_data; unsigned int png_size; ImGui::GetDefaultFontData(NULL, NULL, &png_data, &png_size); [..Upload texture to GPU..];
+ - new: unsigned char* pixels; int width, height; io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); [..Upload texture to GPU..]; io.Fonts->TexId = YourTexIdentifier;
+ you now have more flexibility to load multiple TTF fonts and manage the texture buffer for internal needs. It is now recommended that you sample the font texture with bilinear interpolation.
+ - 2015/01/11 (1.30) - added texture identifier in ImDrawCmd passed to your render function (we can now render images). make sure to set io.Fonts->TexID.
+ - 2015/01/11 (1.30) - removed IO.PixelCenterOffset (unnecessary, can be handled in user projection matrix)
+ - 2015/01/11 (1.30) - removed ImGui::IsItemFocused() in favor of ImGui::IsItemActive() which handles all widgets
- 2014/12/10 (1.18) - removed SetNewWindowDefaultPos() in favor of new generic API SetNextWindowPos(pos, ImGuiSetCondition_FirstUseEver)
- 2014/11/28 (1.17) - moved IO.Font*** options to inside the IO.Font-> structure (FontYOffset, FontTexUvForWhite, FontBaseScale, FontFallbackGlyph)
- 2014/11/26 (1.17) - reworked syntax of IMGUI_ONCE_UPON_A_FRAME helper macro to increase compiler compatibility
@@ -518,117 +584,56 @@ CODE
- 2014/08/28 (1.09) - changed the behavior of IO.PixelCenterOffset following various rendering fixes
- FREQUENTLY ASKED QUESTIONS (FAQ), TIPS
- ======================================
+ FREQUENTLY ASKED QUESTIONS (FAQ)
+ ================================
- Q: How can I tell whether to dispatch mouse/keyboard to imgui or to my application?
- A: You can read the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags from the ImGuiIO structure (e.g. if (ImGui::GetIO().WantCaptureMouse) { ... } )
- - When 'io.WantCaptureMouse' is set, imgui wants to use your mouse state, and you may want to discard/hide the inputs from the rest of your application.
- - When 'io.WantCaptureKeyboard' is set, imgui wants to use your keyboard state, and you may want to discard/hide the inputs from the rest of your application.
- - When 'io.WantTextInput' is set to may want to notify your OS to popup an on-screen keyboard, if available (e.g. on a mobile phone, or console OS).
- Note: you should always pass your mouse/keyboard inputs to imgui, even when the io.WantCaptureXXX flag are set false.
- This is because imgui needs to detect that you clicked in the void to unfocus its own windows.
- Note: The 'io.WantCaptureMouse' is more accurate that any attempt to "check if the mouse is hovering a window" (don't do that!).
- It handle mouse dragging correctly (both dragging that started over your application or over an imgui window) and handle e.g. modal windows blocking inputs.
- Those flags are updated by ImGui::NewFrame(). Preferably read the flags after calling NewFrame() if you can afford it, but reading them before is also
- perfectly fine, as the bool toggle fairly rarely. If you have on a touch device, you might find use for an early call to UpdateHoveredWindowAndCaptureFlags().
- Note: Text input widget releases focus on "Return KeyDown", so the subsequent "Return KeyUp" event that your application receive will typically
- have 'io.WantCaptureKeyboard=false'. Depending on your application logic it may or not be inconvenient. You might want to track which key-downs
- were targeted for Dear ImGui, e.g. with an array of bool, and filter out the corresponding key-ups.)
+ Read all answers online: https://www.dearimgui.org/faq, or in docs/FAQ.md (with a Markdown viewer)
+ Some answers are copied down here to facilitate searching in code.
- Q: How can I display an image? What is ImTextureID, how does it works?
- A: Short explanation:
- - You may use functions such as ImGui::Image(), ImGui::ImageButton() or lower-level ImDrawList::AddImage() to emit draw calls that will use your own textures.
- - Actual textures are identified in a way that is up to the user/engine. Those identifiers are stored and passed as ImTextureID (void*) value.
- - Loading image files from the disk and turning them into a texture is not within the scope of Dear ImGui (for a good reason).
- Please read documentations or tutorials on your graphics API to understand how to display textures on the screen before moving onward.
+ Q&A: Basics
+ ===========
- Long explanation:
- - Dear ImGui's job is to create "meshes", defined in a renderer-agnostic format made of draw commands and vertices.
- At the end of the frame those meshes (ImDrawList) will be displayed by your rendering function. They are made up of textured polygons and the code
- to render them is generally fairly short (a few dozen lines). In the examples/ folder we provide functions for popular graphics API (OpenGL, DirectX, etc.).
- - Each rendering function decides on a data type to represent "textures". The concept of what is a "texture" is entirely tied to your underlying engine/graphics API.
- We carry the information to identify a "texture" in the ImTextureID type.
- ImTextureID is nothing more that a void*, aka 4/8 bytes worth of data: just enough to store 1 pointer or 1 integer of your choice.
- Dear ImGui doesn't know or understand what you are storing in ImTextureID, it merely pass ImTextureID values until they reach your rendering function.
- - In the examples/ bindings, for each graphics API binding we decided on a type that is likely to be a good representation for specifying
- an image from the end-user perspective. This is what the _examples_ rendering functions are using:
+ Q: Where is the documentation?
+ A: This library is poorly documented at the moment and expects of the user to be acquainted with C/C++.
+ - Run the examples/ and explore them.
+ - See demo code in imgui_demo.cpp and particularly the ImGui::ShowDemoWindow() function.
+ - The demo covers most features of Dear ImGui, so you can read the code and see its output.
+ - See documentation and comments at the top of imgui.cpp + effectively imgui.h.
+ - Dozens of standalone example applications using e.g. OpenGL/DirectX are provided in the
+ examples/ folder to explain how to integrate Dear ImGui with your own engine/application.
+ - The Wiki (https://github.com/ocornut/imgui/wiki) has many resources and links.
+ - The Glossary (https://github.com/ocornut/imgui/wiki/Glossary) page also may be useful.
+ - Your programming IDE is your friend, find the type or function declaration to find comments
+ associated to it.
- OpenGL: ImTextureID = GLuint (see ImGui_ImplGlfwGL3_RenderDrawData() function in imgui_impl_glfw_gl3.cpp)
- DirectX9: ImTextureID = LPDIRECT3DTEXTURE9 (see ImGui_ImplDX9_RenderDrawData() function in imgui_impl_dx9.cpp)
- DirectX11: ImTextureID = ID3D11ShaderResourceView* (see ImGui_ImplDX11_RenderDrawData() function in imgui_impl_dx11.cpp)
- DirectX12: ImTextureID = D3D12_GPU_DESCRIPTOR_HANDLE (see ImGui_ImplDX12_RenderDrawData() function in imgui_impl_dx12.cpp)
+ Q: What is this library called?
+ Q: Which version should I get?
+ >> This library is called "Dear ImGui", please don't call it "ImGui" :)
+ >> See https://www.dearimgui.org/faq
- For example, in the OpenGL example binding we store raw OpenGL texture identifier (GLuint) inside ImTextureID.
- Whereas in the DirectX11 example binding we store a pointer to ID3D11ShaderResourceView inside ImTextureID, which is a higher-level structure
- tying together both the texture and information about its format and how to read it.
- - If you have a custom engine built over e.g. OpenGL, instead of passing GLuint around you may decide to use a high-level data type to carry information about
- the texture as well as how to display it (shaders, etc.). The decision of what to use as ImTextureID can always be made better knowing how your codebase
- is designed. If your engine has high-level data types for "textures" and "material" then you may want to use them.
- If you are starting with OpenGL or DirectX or Vulkan and haven't built much of a rendering engine over them, keeping the default ImTextureID
- representation suggested by the example bindings is probably the best choice.
- (Advanced users may also decide to keep a low-level type in ImTextureID, and use ImDrawList callback and pass information to their renderer)
+ Q&A: Integration
+ ================
- User code may do:
+ Q: How can I tell whether to dispatch mouse/keyboard to Dear ImGui or to my application?
+ A: You should read the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags!
+ >> See https://www.dearimgui.org/faq for fully detailed answer. You really want to read this.
- // Cast our texture type to ImTextureID / void*
- MyTexture* texture = g_CoffeeTableTexture;
- ImGui::Image((void*)texture, ImVec2(texture->Width, texture->Height));
+ Q. How can I enable keyboard controls?
+ Q: How can I use this without a mouse, without a keyboard or without a screen? (gamepad, input share, remote display)
+ Q: I integrated Dear ImGui in my engine and the text or lines are blurry..
+ Q: I integrated Dear ImGui in my engine and some elements are clipping or disappearing when I move windows around..
+ >> See https://www.dearimgui.org/faq
- The renderer function called after ImGui::Render() will receive that same value that the user code passed:
+ Q&A: Usage
+ ----------
- // Cast ImTextureID / void* stored in the draw command as our texture type
- MyTexture* texture = (MyTexture*)pcmd->TextureId;
- MyEngineBindTexture2D(texture);
-
- Once you understand this design you will understand that loading image files and turning them into displayable textures is not within the scope of Dear ImGui.
- This is by design and is actually a good thing, because it means your code has full control over your data types and how you display them.
- If you want to display an image file (e.g. PNG file) into the screen, please refer to documentation and tutorials for the graphics API you are using.
-
- Here's a simplified OpenGL example using stb_image.h:
-
- // Use stb_image.h to load a PNG from disk and turn it into raw RGBA pixel data:
- #define STB_IMAGE_IMPLEMENTATION
- #include
- [...]
- int my_image_width, my_image_height;
- unsigned char* my_image_data = stbi_load("my_image.png", &my_image_width, &my_image_height, NULL, 4);
-
- // Turn the RGBA pixel data into an OpenGL texture:
- GLuint my_opengl_texture;
- glGenTextures(1, &my_opengl_texture);
- glBindTexture(GL_TEXTURE_2D, my_opengl_texture);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image_width, image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, image_data);
-
- // Now that we have an OpenGL texture, assuming our imgui rendering function (imgui_impl_xxx.cpp file) takes GLuint as ImTextureID, we can display it:
- ImGui::Image((void*)(intptr_t)my_opengl_texture, ImVec2(my_image_width, my_image_height));
-
- C/C++ tip: a void* is pointer-sized storage. You may safely store any pointer or integer into it by casting your value to ImTexture / void*, and vice-versa.
- Because both end-points (user code and rendering function) are under your control, you know exactly what is stored inside the ImTexture / void*.
- Examples:
-
- GLuint my_tex = XXX;
- void* my_void_ptr;
- my_void_ptr = (void*)(intptr_t)my_tex; // cast a GLuint into a void* (we don't take its address! we literally store the value inside the pointer)
- my_tex = (GLuint)(intptr_t)my_void_ptr; // cast a void* into a GLuint
-
- ID3D11ShaderResourceView* my_dx11_srv = XXX;
- void* my_void_ptr;
- my_void_ptr = (void*)my_dx11_srv; // cast a ID3D11ShaderResourceView* into an opaque void*
- my_dx11_srv = (ID3D11ShaderResourceView*)my_void_ptr; // cast a void* into a ID3D11ShaderResourceView*
-
- Finally, you may call ImGui::ShowMetricsWindow() to explore/visualize/understand how the ImDrawList are generated.
-
- Q: How can I have multiple widgets with the same label or without a label?
- Q: I have multiple widgets with the same label, and only the first one works. Why is that?
+ Q: Why are multiple widgets reacting when I interact with a single one?
+ Q: How can I have multiple widgets with the same label or with an empty label?
A: A primer on labels and the ID Stack...
Dear ImGui internally need to uniquely identify UI elements.
Elements that are typically not clickable (such as calls to the Text functions) don't need an ID.
- Interactive widgets (such as calls to Button buttons) need a unique ID.
+ Interactive widgets (such as calls to Button buttons) need a unique ID.
Unique ID are used internally to track active widgets and occasionally associate state to widgets.
Unique ID are implicitly built from the hash of multiple elements that identify the "path" to the UI element.
@@ -644,6 +649,9 @@ CODE
Begin("MyWindow");
Button("OK"); // Label = "OK", ID = hash of ("MyWindow", "OK")
End();
+ Begin("MyOtherWindow");
+ Button("OK"); // Label = "OK", ID = hash of ("MyOtherWindow", "OK")
+ End();
- If you have a same ID twice in the same location, you'll have a conflict:
@@ -672,8 +680,8 @@ CODE
you to animate labels. For example you may want to include varying information in a window title bar,
but windows are uniquely identified by their ID. Use "###" to pass a label that isn't part of ID:
- Button("Hello###ID"; // Label = "Hello", ID = hash of (..., "ID")
- Button("World###ID"; // Label = "World", ID = hash of (..., "ID") // Same as above, even though the label looks different
+ Button("Hello###ID"); // Label = "Hello", ID = hash of (..., "###ID")
+ Button("World###ID"); // Label = "World", ID = hash of (..., "###ID") // Same as above, even though the label looks different
sprintf(buf, "My game (%f FPS)###MyGame", fps);
Begin(buf); // Variable title, ID = hash of "MyGame"
@@ -683,47 +691,48 @@ CODE
within the same window. This is the most convenient way of distinguishing ID when iterating and
creating many UI elements programmatically.
You can push a pointer, a string or an integer value into the ID stack.
- Remember that ID are formed from the concatenation of _everything_ in the ID stack!
+ Remember that ID are formed from the concatenation of _everything_ pushed into the ID stack.
+ At each level of the stack we store the seed used for items at this level of the ID stack.
- Begin("Window");
+ Begin("Window");
for (int i = 0; i < 100; i++)
{
- PushID(i); // Push i to the id tack
- Button("Click"); // Label = "Click", ID = Hash of ("Window", i, "Click")
+ PushID(i); // Push i to the id tack
+ Button("Click"); // Label = "Click", ID = hash of ("Window", i, "Click")
PopID();
}
for (int i = 0; i < 100; i++)
{
MyObject* obj = Objects[i];
PushID(obj);
- Button("Click"); // Label = "Click", ID = Hash of ("Window", obj pointer, "Click")
+ Button("Click"); // Label = "Click", ID = hash of ("Window", obj pointer, "Click")
PopID();
}
for (int i = 0; i < 100; i++)
{
MyObject* obj = Objects[i];
PushID(obj->Name);
- Button("Click"); // Label = "Click", ID = Hash of ("Window", obj->Name, "Click")
+ Button("Click"); // Label = "Click", ID = hash of ("Window", obj->Name, "Click")
PopID();
}
End();
- - More example showing that you can stack multiple prefixes into the ID stack:
+ - You can stack multiple prefixes into the ID stack:
- Button("Click"); // Label = "Click", ID = hash of (..., "Click")
+ Button("Click"); // Label = "Click", ID = hash of (..., "Click")
PushID("node");
- Button("Click"); // Label = "Click", ID = hash of (..., "node", "Click")
+ Button("Click"); // Label = "Click", ID = hash of (..., "node", "Click")
PushID(my_ptr);
- Button("Click"); // Label = "Click", ID = hash of (..., "node", my_ptr, "Click")
+ Button("Click"); // Label = "Click", ID = hash of (..., "node", my_ptr, "Click")
PopID();
PopID();
- Tree nodes implicitly creates a scope for you by calling PushID().
- Button("Click"); // Label = "Click", ID = hash of (..., "Click")
- if (TreeNode("node"))
+ Button("Click"); // Label = "Click", ID = hash of (..., "Click")
+ if (TreeNode("node")) // <-- this function call will do a PushID() for you (unless instructed not to, with a special flag)
{
- Button("Click"); // Label = "Click", ID = hash of (..., "node", "Click")
+ Button("Click"); // Label = "Click", ID = hash of (..., "node", "Click")
TreePop();
}
@@ -734,116 +743,47 @@ CODE
e.g. when displaying a list of objects, using indices or pointers as ID will preserve the
node open/closed state differently. See what makes more sense in your situation!
- Q: How can I use my own math types instead of ImVec2/ImVec4?
- A: You can edit imconfig.h and setup the IM_VEC2_CLASS_EXTRA/IM_VEC4_CLASS_EXTRA macros to add implicit type conversions.
- This way you'll be able to use your own types everywhere, e.g. passsing glm::vec2 to ImGui functions instead of ImVec2.
+ Q: How can I display an image? What is ImTextureID, how does it works?
+ >> See https://www.dearimgui.org/faq and https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples
+
+ Q: How can I use my own math types instead of ImVec2/ImVec4?
+ Q: How can I interact with standard C++ types (such as std::string and std::vector)?
+ Q: How can I display custom shapes? (using low-level ImDrawList API)
+ >> See https://www.dearimgui.org/faq
+
+ Q&A: Fonts, Text
+ ================
Q: How can I load a different font than the default?
- A: Use the font atlas to load the TTF/OTF file you want:
- ImGuiIO& io = ImGui::GetIO();
- io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels);
- io.Fonts->GetTexDataAsRGBA32() or GetTexDataAsAlpha8()
- Default is ProggyClean.ttf, rendered at size 13, embedded in dear imgui's source code.
- (Read the 'misc/fonts/README.txt' file for more details about font loading.)
-
- New programmers: remember that in C/C++ and most programming languages if you want to use a
- backslash \ within a string literal, you need to write it double backslash "\\":
- io.Fonts->AddFontFromFileTTF("MyDataFolder\MyFontFile.ttf", size_in_pixels); // WRONG (you are escape the M here!)
- io.Fonts->AddFontFromFileTTF("MyDataFolder\\MyFontFile.ttf", size_in_pixels); // CORRECT
- io.Fonts->AddFontFromFileTTF("MyDataFolder/MyFontFile.ttf", size_in_pixels); // ALSO CORRECT
-
Q: How can I easily use icons in my application?
- A: The most convenient and practical way is to merge an icon font such as FontAwesome inside you
- main font. Then you can refer to icons within your strings.
- (Read the 'misc/fonts/README.txt' file for more details about icons font loading.)
-
Q: How can I load multiple fonts?
- A: Use the font atlas to pack them into a single texture:
- (Read the 'misc/fonts/README.txt' file and the code in ImFontAtlas for more details.)
-
- ImGuiIO& io = ImGui::GetIO();
- ImFont* font0 = io.Fonts->AddFontDefault();
- ImFont* font1 = io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels);
- ImFont* font2 = io.Fonts->AddFontFromFileTTF("myfontfile2.ttf", size_in_pixels);
- io.Fonts->GetTexDataAsRGBA32() or GetTexDataAsAlpha8()
- // the first loaded font gets used by default
- // use ImGui::PushFont()/ImGui::PopFont() to change the font at runtime
-
- // Options
- ImFontConfig config;
- config.OversampleH = 3;
- config.OversampleV = 1;
- config.GlyphOffset.y -= 2.0f; // Move everything by 2 pixels up
- config.GlyphExtraSpacing.x = 1.0f; // Increase spacing between characters
- io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, &config);
-
- // Combine multiple fonts into one (e.g. for icon fonts)
- static ImWchar ranges[] = { 0xf000, 0xf3ff, 0 };
- ImFontConfig config;
- config.MergeMode = true;
- io.Fonts->AddFontDefault();
- io.Fonts->LoadFromFileTTF("fontawesome-webfont.ttf", 16.0f, &config, ranges); // Merge icon font
- io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, NULL, &config, io.Fonts->GetGlyphRangesJapanese()); // Merge japanese glyphs
-
Q: How can I display and input non-Latin characters such as Chinese, Japanese, Korean, Cyrillic?
- A: When loading a font, pass custom Unicode ranges to specify the glyphs to load.
+ >> See https://www.dearimgui.org/faq and docs/FONTS.txt
- // Add default Japanese ranges
- io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels, NULL, io.Fonts->GetGlyphRangesJapanese());
+ Q&A: Concerns
+ =============
- // Or create your own custom ranges (e.g. for a game you can feed your entire game script and only build the characters the game need)
- ImVector ranges;
- ImFontAtlas::GlyphRangesBuilder builder;
- builder.AddText("Hello world"); // Add a string (here "Hello world" contains 7 unique characters)
- builder.AddChar(0x7262); // Add a specific character
- builder.AddRanges(io.Fonts->GetGlyphRangesJapanese()); // Add one of the default ranges
- builder.BuildRanges(&ranges); // Build the final result (ordered ranges with all the unique characters submitted)
- io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels, NULL, ranges.Data);
+ Q: Who uses Dear ImGui?
+ Q: Can you create elaborate/serious tools with Dear ImGui?
+ Q: Can you reskin the look of Dear ImGui?
+ Q: Why using C++ (as opposed to C)?
+ >> See https://www.dearimgui.org/faq
- All your strings needs to use UTF-8 encoding. In C++11 you can encode a string literal in UTF-8
- by using the u8"hello" syntax. Specifying literal in your source code using a local code page
- (such as CP-923 for Japanese or CP-1251 for Cyrillic) will NOT work!
- Otherwise you can convert yourself to UTF-8 or load text data from file already saved as UTF-8.
-
- Text input: it is up to your application to pass the right character code by calling io.AddInputCharacter().
- The applications in examples/ are doing that.
- Windows: you can use the WM_CHAR or WM_UNICHAR or WM_IME_CHAR message (depending if your app is built using Unicode or MultiByte mode).
- You may also use MultiByteToWideChar() or ToUnicode() to retrieve Unicode codepoints from MultiByte characters or keyboard state.
- Windows: if your language is relying on an Input Method Editor (IME), you copy the HWND of your window to io.ImeWindowHandle in order for
- the default implementation of io.ImeSetInputScreenPosFn() to set your Microsoft IME position correctly.
-
- Q: How can I use the drawing facilities without an ImGui window? (using ImDrawList API)
- A: - You can create a dummy window. Call Begin() with the NoBackground | NoDecoration | NoSavedSettings | NoInputs flags.
- (The ImGuiWindowFlags_NoDecoration flag itself is a shortcut for NoTitleBar | NoResize | NoScrollbar | NoCollapse)
- Then you can retrieve the ImDrawList* via GetWindowDrawList() and draw to it in any way you like.
- - You can call ImGui::GetOverlayDrawList() and use this draw list to display contents over every other imgui windows.
- - You can create your own ImDrawList instance. You'll need to initialize them ImGui::GetDrawListSharedData(), or create your own ImDrawListSharedData,
- and then call your rendered code with your own ImDrawList or ImDrawData data.
-
- Q: I integrated Dear ImGui in my engine and the text or lines are blurry..
- A: In your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f).
- Also make sure your orthographic projection matrix and io.DisplaySize matches your actual framebuffer dimension.
-
- Q: I integrated Dear ImGui in my engine and some elements are clipping or disappearing when I move windows around..
- A: You are probably mishandling the clipping rectangles in your render function.
- Rectangles provided by ImGui are defined as (x1=left,y1=top,x2=right,y2=bottom) and NOT as (x1,y1,width,height).
+ Q&A: Community
+ ==============
Q: How can I help?
- A: - If you are experienced with Dear ImGui and C++, look at the github issues, or docs/TODO.txt and see how you want/can help!
- - Convince your company to sponsor/fund development! Individual users: you can also become a Patron (patreon.com/imgui) or donate on PayPal! See README.
- - Disclose your usage of dear imgui via a dev blog post, a tweet, a screenshot, a mention somewhere etc.
- You may post screenshot or links in the gallery threads (github.com/ocornut/imgui/issues/1269). Visuals are ideal as they inspire other programmers.
+ A: - Businesses: please reach out to "contact AT dearimgui.org" if you work in a place using Dear ImGui!
+ We can discuss ways for your company to fund development via invoiced technical support, maintenance or sponsoring contacts.
+ This is among the most useful thing you can do for Dear ImGui. With increased funding we can hire more people working on this project.
+ - Individuals: you can support continued development via PayPal donations. See README.
+ - If you are experienced with Dear ImGui and C++, look at the github issues, look at the Wiki, read docs/TODO.txt
+ and see how you want to help and can help!
+ - Disclose your usage of Dear ImGui via a dev blog post, a tweet, a screenshot, a mention somewhere etc.
+ You may post screenshot or links in the gallery threads (github.com/ocornut/imgui/issues/2847). Visuals are ideal as they inspire other programmers.
But even without visuals, disclosing your use of dear imgui help the library grow credibility, and help other teams and programmers with taking decisions.
- If you have issues or if you need to hack into the library, even if you don't expect any support it is useful that you share your issues (on github or privately).
- - tip: you can call Begin() multiple times with the same name during the same frame, it will keep appending to the same window.
- this is also useful to set yourself in the context of another window (to get/set other settings)
- - tip: you can create widgets without a Begin()/End() block, they will go in an implicit window called "Debug".
- - tip: the ImGuiOnceUponAFrame helper will allow run the block of code only once a frame. You can use it to quickly add custom UI in the middle
- of a deep nested inner loop in your code.
- - tip: you can call Render() multiple times (e.g for VR renders).
- - tip: call and read the ShowDemoWindow() code in imgui_demo.cpp for more example of how to use ImGui!
-
*/
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
@@ -851,12 +791,14 @@ CODE
#endif
#include "imgui.h"
+#ifndef IMGUI_DISABLE
+
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include "imgui_internal.h"
-#include // toupper, isprint
+#include // toupper
#include // vsnprintf, sscanf, printf
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
#include // intptr_t
@@ -865,27 +807,39 @@ CODE
#endif
// Debug options
-#define IMGUI_DEBUG_NAV_SCORING 0
-#define IMGUI_DEBUG_NAV_RECTS 0
+#define IMGUI_DEBUG_NAV_SCORING 0 // Display navigation scoring preview when hovering items. Display last moving direction matches when holding CTRL
+#define IMGUI_DEBUG_NAV_RECTS 0 // Display the reference navigation rectangle for each window
+#define IMGUI_DEBUG_INI_SETTINGS 0 // Save additional comments in .ini file (particularly helps for Docking, but makes saving slower)
// Visual Studio warnings
#ifdef _MSC_VER
#pragma warning (disable: 4127) // condition expression is constant
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
+#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later
+#pragma warning (disable: 5054) // operator '|': deprecated between enumerations of different types
+#endif
#endif
// Clang/GCC warnings with -Weverything
-#ifdef __clang__
+#if defined(__clang__)
#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning : unknown warning group '-Wformat-pedantic *' // not all warnings are known by all clang versions.. so ignoring warnings triggers new warnings on some configuration. great!
#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse.
#pragma clang diagnostic ignored "-Wfloat-equal" // warning : comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok.
#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning : format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code.
#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning : declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals.
-#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference it.
+#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference is.
#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness //
#pragma clang diagnostic ignored "-Wformat-pedantic" // warning : format specifies type 'void *' but the argument has type 'xxxx *' // unreasonable, would lead to casting every %p arg to void*. probably enabled by -pedantic.
-#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int'
+#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int'
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0
+#endif
+#if __has_warning("-Wdouble-promotion")
+#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
+#endif
#elif defined(__GNUC__)
+// We disable -Wpragmas because GCC doesn't provide an has_warning equivalent and some forks/patches may not following the warning/version association.
+#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used
#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size
#pragma GCC diagnostic ignored "-Wformat" // warning: format '%p' expects argument of type 'void*', but argument 6 has type 'ImGuiWindow*'
@@ -893,42 +847,36 @@ CODE
#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value
#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked
#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false
-#if __GNUC__ >= 8
-#pragma GCC diagnostic ignored "-Wclass-memaccess" // warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
-#endif
+#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
#endif
// When using CTRL+TAB (or Gamepad Square+L/R) we delay the visual a little in order to reduce visual noise doing a fast switch.
static const float NAV_WINDOWING_HIGHLIGHT_DELAY = 0.20f; // Time before the highlight and screen dimming starts fading in
static const float NAV_WINDOWING_LIST_APPEAR_DELAY = 0.15f; // Time before the window list starts to appear
-// Window resizing from edges (when io.ConfigResizeWindowsFromEdges = true)
-static const float RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS = 4.0f; // Extend outside and inside windows. Affect FindHoveredWindow().
-static const float RESIZE_WINDOWS_FROM_EDGES_FEEDBACK_TIMER = 0.04f; // Reduce visual noise by only highlighting the border after a certain time.
+// Window resizing from edges (when io.ConfigWindowsResizeFromEdges = true and ImGuiBackendFlags_HasMouseCursors is set in io.BackendFlags by back-end)
+static const float WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS = 4.0f; // Extend outside and inside windows. Affect FindHoveredWindow().
+static const float WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER = 0.04f; // Reduce visual noise by only highlighting the border after a certain time.
+static const float WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER = 2.00f; // Lock scrolled window (so it doesn't pick child windows that are scrolling through) for a certaint time, unless mouse moved.
//-------------------------------------------------------------------------
// [SECTION] FORWARD DECLARATIONS
//-------------------------------------------------------------------------
static void SetCurrentWindow(ImGuiWindow* window);
-static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond);
-static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond);
-static void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond);
static void FindHoveredWindow();
static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags);
-static void CheckStacksSize(ImGuiWindow* window, bool write);
static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges);
static void AddDrawListToDrawData(ImVector* out_list, ImDrawList* draw_list);
-static void AddWindowToDrawData(ImVector* out_list, ImGuiWindow* window);
static void AddWindowToSortBuffer(ImVector* out_sorted_windows, ImGuiWindow* window);
static ImRect GetViewportRect();
// Settings
-static void* SettingsHandlerWindow_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name);
-static void SettingsHandlerWindow_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line);
-static void SettingsHandlerWindow_WriteAll(ImGuiContext* imgui_ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf);
+static void* WindowSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name);
+static void WindowSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line);
+static void WindowSettingsHandler_WriteAll(ImGuiContext*, ImGuiSettingsHandler*, ImGuiTextBuffer* buf);
// Platform Dependents default implementation for IO functions
static const char* GetClipboardTextFn_DefaultImpl(void* user_data);
@@ -937,44 +885,53 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y);
namespace ImGui
{
-static bool BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags);
-
// Navigation
static void NavUpdate();
static void NavUpdateWindowing();
-static void NavUpdateWindowingList();
+static void NavUpdateWindowingOverlay();
static void NavUpdateMoveResult();
-static float NavUpdatePageUpPageDown(int allowed_dir_flags);
+static float NavUpdatePageUpPageDown();
static inline void NavUpdateAnyRequestFlag();
-static void NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, const ImGuiID id);
+static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand);
+static void NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, ImGuiID id);
static ImVec2 NavCalcPreferredRefPos();
-static void NavSaveLastChildNavWindow(ImGuiWindow* nav_window);
+static void NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window);
static ImGuiWindow* NavRestoreLastChildNavWindow(ImGuiWindow* window);
+static int FindWindowFocusIndex(ImGuiWindow* window);
+
+// Error Checking
+static void ErrorCheckEndFrame();
+static void ErrorCheckBeginEndCompareStacksSize(ImGuiWindow* window, bool write);
// Misc
static void UpdateMouseInputs();
static void UpdateMouseWheel();
-static void UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4]);
-}
+static bool UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4]);
+static void UpdateDebugToolItemPicker();
+static void RenderWindowOuterBorders(ImGuiWindow* window);
+static void RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size);
+static void RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open);
-// Test engine hooks (imgui-test)
-//#define IMGUI_ENABLE_TEST_ENGINE_HOOKS
-#ifdef IMGUI_ENABLE_TEST_ENGINE_HOOKS
-extern void ImGuiTestEngineHook_PreNewFrame();
-extern void ImGuiTestEngineHook_PostNewFrame();
-extern void ImGuiTestEngineHook_ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg);
-#endif
+}
//-----------------------------------------------------------------------------
// [SECTION] CONTEXT AND MEMORY ALLOCATORS
//-----------------------------------------------------------------------------
// Current context pointer. Implicitly used by all Dear ImGui functions. Always assumed to be != NULL.
-// CreateContext() will automatically set this pointer if it is NULL. Change to a different context by calling ImGui::SetCurrentContext().
-// If you use DLL hotreloading you might need to call SetCurrentContext() after reloading code from this file.
-// ImGui functions are not thread-safe because of this pointer. If you want thread-safety to allow N threads to access N different contexts, you can:
-// - Change this variable to use thread local storage. You may #define GImGui in imconfig.h for that purpose. Future development aim to make this context pointer explicit to all calls. Also read https://github.com/ocornut/imgui/issues/586
-// - Having multiple instances of the ImGui code compiled inside different namespace (easiest/safest, if you have a finite number of contexts)
+// ImGui::CreateContext() will automatically set this pointer if it is NULL. Change to a different context by calling ImGui::SetCurrentContext().
+// 1) Important: globals are not shared across DLL boundaries! If you use DLLs or any form of hot-reloading: you will need to call
+// SetCurrentContext() (with the pointer you got from CreateContext) from each unique static/DLL boundary, and after each hot-reloading.
+// In your debugger, add GImGui to your watch window and notice how its value changes depending on which location you are currently stepping into.
+// 2) Important: Dear ImGui functions are not thread-safe because of this pointer.
+// If you want thread-safety to allow N threads to access N different contexts, you can:
+// - Change this variable to use thread local storage so each thread can refer to a different context, in imconfig.h:
+// struct ImGuiContext;
+// extern thread_local ImGuiContext* MyImGuiTLS;
+// #define GImGui MyImGuiTLS
+// And then define MyImGuiTLS in one of your cpp file. Note that thread_local is a C++11 keyword, earlier C++ uses compiler-specific keyword.
+// - Future development aim to make this context pointer explicit to all calls. Also read https://github.com/ocornut/imgui/issues/586
+// - If you need a finite number of contexts, you may compile and use multiple instances of the ImGui code from different namespace.
#ifndef GImGui
ImGuiContext* GImGui = NULL;
#endif
@@ -983,11 +940,11 @@ ImGuiContext* GImGui = NULL;
// If you use DLL hotreloading you might need to call SetAllocatorFunctions() after reloading code from this file.
// Otherwise, you probably don't want to modify them mid-program, and if you use global/static e.g. ImVector<> instances you may need to keep them accessible during program destruction.
#ifndef IMGUI_DISABLE_DEFAULT_ALLOCATORS
-static void* MallocWrapper(size_t size, void* user_data) { (void)user_data; return malloc(size); }
-static void FreeWrapper(void* ptr, void* user_data) { (void)user_data; free(ptr); }
+static void* MallocWrapper(size_t size, void* user_data) { IM_UNUSED(user_data); return malloc(size); }
+static void FreeWrapper(void* ptr, void* user_data) { IM_UNUSED(user_data); free(ptr); }
#else
-static void* MallocWrapper(size_t size, void* user_data) { (void)user_data; (void)size; IM_ASSERT(0); return NULL; }
-static void FreeWrapper(void* ptr, void* user_data) { (void)user_data; (void)ptr; IM_ASSERT(0); }
+static void* MallocWrapper(size_t size, void* user_data) { IM_UNUSED(user_data); IM_UNUSED(size); IM_ASSERT(0); return NULL; }
+static void FreeWrapper(void* ptr, void* user_data) { IM_UNUSED(user_data); IM_UNUSED(ptr); IM_ASSERT(0); }
#endif
static void* (*GImAllocatorAllocFunc)(size_t size, void* user_data) = MallocWrapper;
@@ -1006,6 +963,7 @@ ImGuiStyle::ImGuiStyle()
WindowBorderSize = 1.0f; // Thickness of border around windows. Generally set to 0.0f or 1.0f. Other values not well tested.
WindowMinSize = ImVec2(32,32); // Minimum window size
WindowTitleAlign = ImVec2(0.0f,0.5f);// Alignment for title bar text
+ WindowMenuButtonPosition= ImGuiDir_Left; // Position of the collapsing/docking button in the title bar (left/right). Defaults to ImGuiDir_Left.
ChildRounding = 0.0f; // Radius of child window corners rounding. Set to 0.0f to have rectangular child windows
ChildBorderSize = 1.0f; // Thickness of border around child windows. Generally set to 0.0f or 1.0f. Other values not well tested.
PopupRounding = 0.0f; // Radius of popup window corners rounding. Set to 0.0f to have rectangular child windows
@@ -1017,18 +975,23 @@ ImGuiStyle::ImGuiStyle()
ItemInnerSpacing = ImVec2(4,4); // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label)
TouchExtraPadding = ImVec2(0,0); // Expand reactive bounding box for touch-based system where touch position is not accurate enough. Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget. So don't grow this too much!
IndentSpacing = 21.0f; // Horizontal spacing when e.g. entering a tree node. Generally == (FontSize + FramePadding.x*2).
- ColumnsMinSpacing = 6.0f; // Minimum horizontal spacing between two columns
- ScrollbarSize = 16.0f; // Width of the vertical scrollbar, Height of the horizontal scrollbar
+ ColumnsMinSpacing = 6.0f; // Minimum horizontal spacing between two columns. Preferably > (FramePadding.x + 1).
+ ScrollbarSize = 14.0f; // Width of the vertical scrollbar, Height of the horizontal scrollbar
ScrollbarRounding = 9.0f; // Radius of grab corners rounding for scrollbar
GrabMinSize = 10.0f; // Minimum width/height of a grab box for slider/scrollbar
GrabRounding = 0.0f; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
+ TabRounding = 4.0f; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
+ TabBorderSize = 0.0f; // Thickness of border around tabs.
+ ColorButtonPosition = ImGuiDir_Right; // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right.
ButtonTextAlign = ImVec2(0.5f,0.5f);// Alignment of button text when button is larger than text.
- DisplayWindowPadding = ImVec2(20,20); // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows.
+ SelectableTextAlign = ImVec2(0.0f,0.0f);// Alignment of selectable text when button is larger than text.
+ DisplayWindowPadding = ImVec2(19,19); // Window position are clamped to be visible within the display area or monitors by at least this amount. Only applies to regular windows.
DisplaySafeAreaPadding = ImVec2(3,3); // If you cannot see the edge of your screen (e.g. on a TV) increase the safe area padding. Covers popups/tooltips as well regular windows.
MouseCursorScale = 1.0f; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). May be removed later.
AntiAliasedLines = true; // Enable anti-aliasing on lines/borders. Disable if you are really short on CPU/GPU.
AntiAliasedFill = true; // Enable anti-aliasing on filled shapes (rounded rectangles, circles, etc.)
CurveTessellationTol = 1.25f; // Tessellation tolerance when using PathBezierCurveTo() without a specific number of segments. Decrease for highly tessellated curves (higher quality, more polygons), increase to reduce quality.
+ CircleSegmentMaxError = 1.60f; // Maximum error (in pixels) allowed when using AddCircle()/AddCircleFilled() or drawing rounded corner rectangles with no explicit segment count specified. Decrease for higher quality but more geometry.
// Default theme
ImGui::StyleColorsDark(this);
@@ -1054,6 +1017,7 @@ void ImGuiStyle::ScaleAllSizes(float scale_factor)
ScrollbarRounding = ImFloor(ScrollbarRounding * scale_factor);
GrabMinSize = ImFloor(GrabMinSize * scale_factor);
GrabRounding = ImFloor(GrabRounding * scale_factor);
+ TabRounding = ImFloor(TabRounding * scale_factor);
DisplayWindowPadding = ImFloor(DisplayWindowPadding * scale_factor);
DisplaySafeAreaPadding = ImFloor(DisplaySafeAreaPadding * scale_factor);
MouseCursorScale = ImFloor(MouseCursorScale * scale_factor);
@@ -1063,10 +1027,11 @@ ImGuiIO::ImGuiIO()
{
// Most fields are initialized with zero
memset(this, 0, sizeof(*this));
+ IM_ASSERT(IM_ARRAYSIZE(ImGuiIO::MouseDown) == ImGuiMouseButton_COUNT && IM_ARRAYSIZE(ImGuiIO::MouseClicked) == ImGuiMouseButton_COUNT); // Our pre-C++11 IM_STATIC_ASSERT() macros triggers warning on modern compilers so we don't use it here.
// Settings
- ConfigFlags = 0x00;
- BackendFlags = 0x00;
+ ConfigFlags = ImGuiConfigFlags_None;
+ BackendFlags = ImGuiBackendFlags_None;
DisplaySize = ImVec2(-1.0f, -1.0f);
DeltaTime = 1.0f/60.0f;
IniSavingRate = 5.0f;
@@ -1076,7 +1041,7 @@ ImGuiIO::ImGuiIO()
MouseDoubleClickMaxDist = 6.0f;
for (int i = 0; i < ImGuiKey_COUNT; i++)
KeyMap[i] = -1;
- KeyRepeatDelay = 0.250f;
+ KeyRepeatDelay = 0.275f;
KeyRepeatRate = 0.050f;
UserData = NULL;
@@ -1085,18 +1050,22 @@ ImGuiIO::ImGuiIO()
FontDefault = NULL;
FontAllowUserScaling = false;
DisplayFramebufferScale = ImVec2(1.0f, 1.0f);
- DisplayVisibleMin = DisplayVisibleMax = ImVec2(0.0f, 0.0f);
- // Miscellaneous configuration options
+ // Miscellaneous options
+ MouseDrawCursor = false;
#ifdef __APPLE__
ConfigMacOSXBehaviors = true; // Set Mac OS X style defaults based on __APPLE__ compile time flag
#else
ConfigMacOSXBehaviors = false;
#endif
ConfigInputTextCursorBlink = true;
- ConfigResizeWindowsFromEdges = false;
+ ConfigWindowsResizeFromEdges = true;
+ ConfigWindowsMoveFromTitleBarOnly = false;
+ ConfigWindowsMemoryCompactTimer = 60.0f;
- // Settings (User Functions)
+ // Platform Functions
+ BackendPlatformName = BackendRendererName = NULL;
+ BackendPlatformUserData = BackendRendererUserData = BackendLanguageUserData = NULL;
GetClipboardTextFn = GetClipboardTextFn_DefaultImpl; // Platform dependent default implementations
SetClipboardTextFn = SetClipboardTextFn_DefaultImpl;
ClipboardUserData = NULL;
@@ -1107,7 +1076,7 @@ ImGuiIO::ImGuiIO()
RenderDrawListsFn = NULL;
#endif
- // Input (NB: we already have memset zero the entire structure)
+ // Input (NB: we already have memset zero the entire structure!)
MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
MousePosPrev = ImVec2(-FLT_MAX, -FLT_MAX);
MouseDragThreshold = 6.0f;
@@ -1119,30 +1088,100 @@ ImGuiIO::ImGuiIO()
// Pass in translated ASCII characters for text input.
// - with glfw you can get those from the callback set in glfwSetCharCallback()
// - on Windows you can get those using ToAscii+keyboard state, or via the WM_CHAR message
-void ImGuiIO::AddInputCharacter(ImWchar c)
+void ImGuiIO::AddInputCharacter(unsigned int c)
{
- const int n = ImStrlenW(InputCharacters);
- if (n + 1 < IM_ARRAYSIZE(InputCharacters))
- {
- InputCharacters[n] = c;
- InputCharacters[n+1] = '\0';
- }
+ if (c > 0 && c <= IM_UNICODE_CODEPOINT_MAX)
+ InputQueueCharacters.push_back((ImWchar)c);
}
void ImGuiIO::AddInputCharactersUTF8(const char* utf8_chars)
{
- // We can't pass more wchars than ImGuiIO::InputCharacters[] can hold so don't convert more
- const int wchars_buf_len = sizeof(ImGuiIO::InputCharacters) / sizeof(ImWchar);
- ImWchar wchars[wchars_buf_len];
- ImTextStrFromUtf8(wchars, wchars_buf_len, utf8_chars, NULL);
- for (int i = 0; i < wchars_buf_len && wchars[i] != 0; i++)
- AddInputCharacter(wchars[i]);
+ while (*utf8_chars != 0)
+ {
+ unsigned int c = 0;
+ utf8_chars += ImTextCharFromUtf8(&c, utf8_chars, NULL);
+ if (c > 0 && c <= IM_UNICODE_CODEPOINT_MAX)
+ InputQueueCharacters.push_back((ImWchar)c);
+ }
+}
+
+void ImGuiIO::ClearInputCharacters()
+{
+ InputQueueCharacters.resize(0);
}
//-----------------------------------------------------------------------------
-// [SECTION] MISC HELPER/UTILITIES (Maths, String, Format, Hash, File functions)
+// [SECTION] MISC HELPERS/UTILITIES (Geometry functions)
//-----------------------------------------------------------------------------
+ImVec2 ImBezierClosestPoint(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, int num_segments)
+{
+ IM_ASSERT(num_segments > 0); // Use ImBezierClosestPointCasteljau()
+ ImVec2 p_last = p1;
+ ImVec2 p_closest;
+ float p_closest_dist2 = FLT_MAX;
+ float t_step = 1.0f / (float)num_segments;
+ for (int i_step = 1; i_step <= num_segments; i_step++)
+ {
+ ImVec2 p_current = ImBezierCalc(p1, p2, p3, p4, t_step * i_step);
+ ImVec2 p_line = ImLineClosestPoint(p_last, p_current, p);
+ float dist2 = ImLengthSqr(p - p_line);
+ if (dist2 < p_closest_dist2)
+ {
+ p_closest = p_line;
+ p_closest_dist2 = dist2;
+ }
+ p_last = p_current;
+ }
+ return p_closest;
+}
+
+// Closely mimics PathBezierToCasteljau() in imgui_draw.cpp
+static void BezierClosestPointCasteljauStep(const ImVec2& p, ImVec2& p_closest, ImVec2& p_last, float& p_closest_dist2, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level)
+{
+ float dx = x4 - x1;
+ float dy = y4 - y1;
+ float d2 = ((x2 - x4) * dy - (y2 - y4) * dx);
+ float d3 = ((x3 - x4) * dy - (y3 - y4) * dx);
+ d2 = (d2 >= 0) ? d2 : -d2;
+ d3 = (d3 >= 0) ? d3 : -d3;
+ if ((d2+d3) * (d2+d3) < tess_tol * (dx*dx + dy*dy))
+ {
+ ImVec2 p_current(x4, y4);
+ ImVec2 p_line = ImLineClosestPoint(p_last, p_current, p);
+ float dist2 = ImLengthSqr(p - p_line);
+ if (dist2 < p_closest_dist2)
+ {
+ p_closest = p_line;
+ p_closest_dist2 = dist2;
+ }
+ p_last = p_current;
+ }
+ else if (level < 10)
+ {
+ float x12 = (x1+x2)*0.5f, y12 = (y1+y2)*0.5f;
+ float x23 = (x2+x3)*0.5f, y23 = (y2+y3)*0.5f;
+ float x34 = (x3+x4)*0.5f, y34 = (y3+y4)*0.5f;
+ float x123 = (x12+x23)*0.5f, y123 = (y12+y23)*0.5f;
+ float x234 = (x23+x34)*0.5f, y234 = (y23+y34)*0.5f;
+ float x1234 = (x123+x234)*0.5f, y1234 = (y123+y234)*0.5f;
+ BezierClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, x1, y1, x12, y12, x123, y123, x1234, y1234, tess_tol, level + 1);
+ BezierClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, x1234, y1234, x234, y234, x34, y34, x4, y4, tess_tol, level + 1);
+ }
+}
+
+// tess_tol is generally the same value you would find in ImGui::GetStyle().CurveTessellationTol
+// Because those ImXXX functions are lower-level than ImGui:: we cannot access this value automatically.
+ImVec2 ImBezierClosestPointCasteljau(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, float tess_tol)
+{
+ IM_ASSERT(tess_tol > 0.0f);
+ ImVec2 p_last = p1;
+ ImVec2 p_closest;
+ float p_closest_dist2 = FLT_MAX;
+ BezierClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, tess_tol, 0);
+ return p_closest;
+}
+
ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p)
{
ImVec2 ap = p - a;
@@ -1191,6 +1230,11 @@ ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c,
return proj_ca;
}
+//-----------------------------------------------------------------------------
+// [SECTION] MISC HELPERS/UTILITIES (String, Format, Hash functions)
+//-----------------------------------------------------------------------------
+
+// Consider using _stricmp/_strnicmp under Windows or strcasecmp/strncasecmp. We don't actually use either ImStricmp/ImStrnicmp in the codebase any more.
int ImStricmp(const char* str1, const char* str2)
{
int d;
@@ -1207,16 +1251,32 @@ int ImStrnicmp(const char* str1, const char* str2, size_t count)
void ImStrncpy(char* dst, const char* src, size_t count)
{
- if (count < 1) return;
- strncpy(dst, src, count);
- dst[count-1] = 0;
+ if (count < 1)
+ return;
+ if (count > 1)
+ strncpy(dst, src, count - 1);
+ dst[count - 1] = 0;
}
-char* ImStrdup(const char *str)
+char* ImStrdup(const char* str)
{
- size_t len = strlen(str) + 1;
- void* buf = ImGui::MemAlloc(len);
- return (char*)memcpy(buf, (const void*)str, len);
+ size_t len = strlen(str);
+ void* buf = IM_ALLOC(len + 1);
+ return (char*)memcpy(buf, (const void*)str, len + 1);
+}
+
+char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* src)
+{
+ size_t dst_buf_size = p_dst_size ? *p_dst_size : strlen(dst) + 1;
+ size_t src_size = strlen(src) + 1;
+ if (dst_buf_size < src_size)
+ {
+ IM_FREE(dst);
+ dst = (char*)IM_ALLOC(src_size);
+ if (p_dst_size)
+ *p_dst_size = src_size;
+ }
+ return (char*)memcpy(dst, (const void*)src, src_size);
}
const char* ImStrchrRange(const char* str, const char* str_end, char c)
@@ -1227,7 +1287,7 @@ const char* ImStrchrRange(const char* str, const char* str_end, char c)
int ImStrlenW(const ImWchar* str)
{
- //return (int)wcslen((const wchar_t*)str); // FIXME-OPT: Could use this when wchar_t are 16-bits
+ //return (int)wcslen((const wchar_t*)str); // FIXME-OPT: Could use this when wchar_t are 16-bit
int n = 0;
while (*str++) n++;
return n;
@@ -1285,10 +1345,26 @@ void ImStrTrimBlanks(char* buf)
buf[p - p_start] = 0; // Zero terminate
}
+const char* ImStrSkipBlank(const char* str)
+{
+ while (str[0] == ' ' || str[0] == '\t')
+ str++;
+ return str;
+}
+
// A) MSVC version appears to return -1 on overflow, whereas glibc appears to return total count (which may be >= buf_size).
// Ideally we would test for only one of those limits at runtime depending on the behavior the vsnprintf(), but trying to deduct it at compile time sounds like a pandora can of worm.
// B) When buf==NULL vsnprintf() will return the output size.
-#ifndef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS
+#ifndef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
+
+// We support stb_sprintf which is much faster (see: https://github.com/nothings/stb/blob/master/stb_sprintf.h)
+// You may set IMGUI_USE_STB_SPRINTF to use our default wrapper, or set IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
+// and setup the wrapper yourself. (FIXME-OPT: Some of our high-level operations such as ImGuiTextBuffer::appendfv() are
+// designed using two-passes worst case, which probably could be improved using the stbsp_vsprintfcb() function.)
+#ifdef IMGUI_USE_STB_SPRINTF
+#define STB_SPRINTF_IMPLEMENTATION
+#include "stb_sprintf.h"
+#endif
#if defined(_MSC_VER) && !defined(vsnprintf)
#define vsnprintf _vsnprintf
@@ -1298,7 +1374,11 @@ int ImFormatString(char* buf, size_t buf_size, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
+#ifdef IMGUI_USE_STB_SPRINTF
+ int w = stbsp_vsnprintf(buf, (int)buf_size, fmt, args);
+#else
int w = vsnprintf(buf, buf_size, fmt, args);
+#endif
va_end(args);
if (buf == NULL)
return w;
@@ -1310,7 +1390,11 @@ int ImFormatString(char* buf, size_t buf_size, const char* fmt, ...)
int ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args)
{
+#ifdef IMGUI_USE_STB_SPRINTF
+ int w = stbsp_vsnprintf(buf, (int)buf_size, fmt, args);
+#else
int w = vsnprintf(buf, buf_size, fmt, args);
+#endif
if (buf == NULL)
return w;
if (w == -1 || w >= (int)buf_size)
@@ -1318,45 +1402,71 @@ int ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args)
buf[w] = 0;
return w;
}
-#endif // #ifdef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS
+#endif // #ifdef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
-// Pass data_size==0 for zero-terminated strings
-// FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements.
-ImU32 ImHash(const void* data, int data_size, ImU32 seed)
+// CRC32 needs a 1KB lookup table (not cache friendly)
+// Although the code to generate the table is simple and shorter than the table itself, using a const table allows us to easily:
+// - avoid an unnecessary branch/memory tap, - keep the ImHashXXX functions usable by static constructors, - make it thread-safe.
+static const ImU32 GCrc32LookupTable[256] =
{
- static ImU32 crc32_lut[256] = { 0 };
- if (!crc32_lut[1])
- {
- const ImU32 polynomial = 0xEDB88320;
- for (ImU32 i = 0; i < 256; i++)
- {
- ImU32 crc = i;
- for (ImU32 j = 0; j < 8; j++)
- crc = (crc >> 1) ^ (ImU32(-int(crc & 1)) & polynomial);
- crc32_lut[i] = crc;
- }
- }
+ 0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535,0x9E6495A3,0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD,0xE7B82D07,0x90BF1D91,
+ 0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D,0x6DDDE4EB,0xF4D4B551,0x83D385C7,0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC,0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5,
+ 0x3B6E20C8,0x4C69105E,0xD56041E4,0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,0x35B5A8FA,0x42B2986C,0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59,
+ 0x26D930AC,0x51DE003A,0xC8D75180,0xBFD06116,0x21B4F4B5,0x56B3C423,0xCFBA9599,0xB8BDA50F,0x2802B89E,0x5F058808,0xC60CD9B2,0xB10BE924,0x2F6F7C87,0x58684C11,0xC1611DAB,0xB6662D3D,
+ 0x76DC4190,0x01DB7106,0x98D220BC,0xEFD5102A,0x71B18589,0x06B6B51F,0x9FBFE4A5,0xE8B8D433,0x7807C9A2,0x0F00F934,0x9609A88E,0xE10E9818,0x7F6A0DBB,0x086D3D2D,0x91646C97,0xE6635C01,
+ 0x6B6B51F4,0x1C6C6162,0x856530D8,0xF262004E,0x6C0695ED,0x1B01A57B,0x8208F4C1,0xF50FC457,0x65B0D9C6,0x12B7E950,0x8BBEB8EA,0xFCB9887C,0x62DD1DDF,0x15DA2D49,0x8CD37CF3,0xFBD44C65,
+ 0x4DB26158,0x3AB551CE,0xA3BC0074,0xD4BB30E2,0x4ADFA541,0x3DD895D7,0xA4D1C46D,0xD3D6F4FB,0x4369E96A,0x346ED9FC,0xAD678846,0xDA60B8D0,0x44042D73,0x33031DE5,0xAA0A4C5F,0xDD0D7CC9,
+ 0x5005713C,0x270241AA,0xBE0B1010,0xC90C2086,0x5768B525,0x206F85B3,0xB966D409,0xCE61E49F,0x5EDEF90E,0x29D9C998,0xB0D09822,0xC7D7A8B4,0x59B33D17,0x2EB40D81,0xB7BD5C3B,0xC0BA6CAD,
+ 0xEDB88320,0x9ABFB3B6,0x03B6E20C,0x74B1D29A,0xEAD54739,0x9DD277AF,0x04DB2615,0x73DC1683,0xE3630B12,0x94643B84,0x0D6D6A3E,0x7A6A5AA8,0xE40ECF0B,0x9309FF9D,0x0A00AE27,0x7D079EB1,
+ 0xF00F9344,0x8708A3D2,0x1E01F268,0x6906C2FE,0xF762575D,0x806567CB,0x196C3671,0x6E6B06E7,0xFED41B76,0x89D32BE0,0x10DA7A5A,0x67DD4ACC,0xF9B9DF6F,0x8EBEEFF9,0x17B7BE43,0x60B08ED5,
+ 0xD6D6A3E8,0xA1D1937E,0x38D8C2C4,0x4FDFF252,0xD1BB67F1,0xA6BC5767,0x3FB506DD,0x48B2364B,0xD80D2BDA,0xAF0A1B4C,0x36034AF6,0x41047A60,0xDF60EFC3,0xA867DF55,0x316E8EEF,0x4669BE79,
+ 0xCB61B38C,0xBC66831A,0x256FD2A0,0x5268E236,0xCC0C7795,0xBB0B4703,0x220216B9,0x5505262F,0xC5BA3BBE,0xB2BD0B28,0x2BB45A92,0x5CB36A04,0xC2D7FFA7,0xB5D0CF31,0x2CD99E8B,0x5BDEAE1D,
+ 0x9B64C2B0,0xEC63F226,0x756AA39C,0x026D930A,0x9C0906A9,0xEB0E363F,0x72076785,0x05005713,0x95BF4A82,0xE2B87A14,0x7BB12BAE,0x0CB61B38,0x92D28E9B,0xE5D5BE0D,0x7CDCEFB7,0x0BDBDF21,
+ 0x86D3D2D4,0xF1D4E242,0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,0x88085AE6,0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45,
+ 0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D,0x3E6E77DB,0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5,0x47B2CF7F,0x30B5FFE9,
+ 0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605,0xCDD70693,0x54DE5729,0x23D967BF,0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94,0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D,
+};
+// Known size hash
+// It is ok to call ImHashData on a string with known length but the ### operator won't be supported.
+// FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements.
+ImU32 ImHashData(const void* data_p, size_t data_size, ImU32 seed)
+{
+ ImU32 crc = ~seed;
+ const unsigned char* data = (const unsigned char*)data_p;
+ const ImU32* crc32_lut = GCrc32LookupTable;
+ while (data_size-- != 0)
+ crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ *data++];
+ return ~crc;
+}
+
+// Zero-terminated string hash, with support for ### to reset back to seed value
+// We support a syntax of "label###id" where only "###id" is included in the hash, and only "label" gets displayed.
+// Because this syntax is rarely used we are optimizing for the common case.
+// - If we reach ### in the string we discard the hash so far and reset to the seed.
+// - We don't do 'current += 2; continue;' after handling ### to keep the code smaller/faster (measured ~10% diff in Debug build)
+// FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements.
+ImU32 ImHashStr(const char* data_p, size_t data_size, ImU32 seed)
+{
seed = ~seed;
ImU32 crc = seed;
- const unsigned char* current = (const unsigned char*)data;
-
- if (data_size > 0)
+ const unsigned char* data = (const unsigned char*)data_p;
+ const ImU32* crc32_lut = GCrc32LookupTable;
+ if (data_size != 0)
{
- // Known size
- while (data_size--)
- crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ *current++];
+ while (data_size-- != 0)
+ {
+ unsigned char c = *data++;
+ if (c == '#' && data_size >= 2 && data[0] == '#' && data[1] == '#')
+ crc = seed;
+ crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ c];
+ }
}
else
{
- // Zero-terminated string
- while (unsigned char c = *current++)
+ while (unsigned char c = *data++)
{
- // We support a syntax of "label###id" where only "###id" is included in the hash, and only "label" gets displayed.
- // Because this syntax is rarely used we are optimizing for the common case.
- // - If we reach ### in the string we discard the hash so far and reset to the seed.
- // - We don't do 'current += 2; continue;' after handling ### to keep the code smaller.
- if (c == '#' && current[0] == '#' && current[1] == '#')
+ if (c == '#' && data[0] == '#' && data[1] == '#')
crc = seed;
crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ c];
}
@@ -1364,10 +1474,16 @@ ImU32 ImHash(const void* data, int data_size, ImU32 seed)
return ~crc;
}
-FILE* ImFileOpen(const char* filename, const char* mode)
+//-----------------------------------------------------------------------------
+// [SECTION] MISC HELPERS/UTILITIES (File functions)
+//-----------------------------------------------------------------------------
+
+// Default file functions
+#ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
+ImFileHandle ImFileOpen(const char* filename, const char* mode)
{
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__GNUC__)
- // We need a fopen() wrapper because MSVC/Windows fopen doesn't handle UTF-8 filenames. Converting both strings from UTF-8 to wchar format (using a single allocation, because we can)
+#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(__CYGWIN__) && !defined(__GNUC__)
+ // We need a fopen() wrapper because MSVC/Windows fopen doesn't handle UTF-8 filenames.
const int filename_wsize = ImTextCountCharsFromUtf8(filename, NULL) + 1;
const int mode_wsize = ImTextCountCharsFromUtf8(mode, NULL) + 1;
ImVector buf;
@@ -1380,42 +1496,48 @@ FILE* ImFileOpen(const char* filename, const char* mode)
#endif
}
-// Load file content into memory
-// Memory allocated with ImGui::MemAlloc(), must be freed by user using ImGui::MemFree()
-void* ImFileLoadToMemory(const char* filename, const char* file_open_mode, size_t* out_file_size, int padding_bytes)
+// We should in theory be using fseeko()/ftello() with off_t and _fseeki64()/_ftelli64() with __int64, waiting for the PR that does that in a very portable pre-C++11 zero-warnings way.
+bool ImFileClose(ImFileHandle f) { return fclose(f) == 0; }
+ImU64 ImFileGetSize(ImFileHandle f) { long off = 0, sz = 0; return ((off = ftell(f)) != -1 && !fseek(f, 0, SEEK_END) && (sz = ftell(f)) != -1 && !fseek(f, off, SEEK_SET)) ? (ImU64)sz : (ImU64)-1; }
+ImU64 ImFileRead(void* data, ImU64 sz, ImU64 count, ImFileHandle f) { return fread(data, (size_t)sz, (size_t)count, f); }
+ImU64 ImFileWrite(const void* data, ImU64 sz, ImU64 count, ImFileHandle f) { return fwrite(data, (size_t)sz, (size_t)count, f); }
+#endif // #ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
+
+// Helper: Load file content into memory
+// Memory allocated with IM_ALLOC(), must be freed by user using IM_FREE() == ImGui::MemFree()
+void* ImFileLoadToMemory(const char* filename, const char* mode, size_t* out_file_size, int padding_bytes)
{
- IM_ASSERT(filename && file_open_mode);
+ IM_ASSERT(filename && mode);
if (out_file_size)
*out_file_size = 0;
- FILE* f;
- if ((f = ImFileOpen(filename, file_open_mode)) == NULL)
+ ImFileHandle f;
+ if ((f = ImFileOpen(filename, mode)) == NULL)
return NULL;
- long file_size_signed;
- if (fseek(f, 0, SEEK_END) || (file_size_signed = ftell(f)) == -1 || fseek(f, 0, SEEK_SET))
+ size_t file_size = (size_t)ImFileGetSize(f);
+ if (file_size == (size_t)-1)
{
- fclose(f);
+ ImFileClose(f);
return NULL;
}
- size_t file_size = (size_t)file_size_signed;
- void* file_data = ImGui::MemAlloc(file_size + padding_bytes);
+ void* file_data = IM_ALLOC(file_size + padding_bytes);
if (file_data == NULL)
{
- fclose(f);
+ ImFileClose(f);
return NULL;
}
- if (fread(file_data, 1, file_size, f) != file_size)
+ if (ImFileRead(file_data, 1, file_size, f) != file_size)
{
- fclose(f);
- ImGui::MemFree(file_data);
+ ImFileClose(f);
+ IM_FREE(file_data);
return NULL;
}
if (padding_bytes > 0)
memset((void*)(((char*)file_data) + file_size), 0, (size_t)padding_bytes);
- fclose(f);
+ ImFileClose(f);
if (out_file_size)
*out_file_size = file_size;
@@ -1426,7 +1548,7 @@ void* ImFileLoadToMemory(const char* filename, const char* file_open_mode, size_
// [SECTION] MISC HELPERS/UTILITIES (ImText* functions)
//-----------------------------------------------------------------------------
-// Convert UTF-8 to 32-bits character, process single character input.
+// Convert UTF-8 to 32-bit character, process single character input.
// Based on stb_from_utf8() from github.com/nothings/stb/
// We handle UTF-8 decoding error by skipping forward.
int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end)
@@ -1441,7 +1563,7 @@ int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char*
}
if ((*str & 0xe0) == 0xc0)
{
- *out_char = 0xFFFD; // will be invalid but not end of string
+ *out_char = IM_UNICODE_CODEPOINT_INVALID; // will be invalid but not end of string
if (in_text_end && in_text_end - (const char*)str < 2) return 1;
if (*str < 0xc2) return 2;
c = (unsigned int)((*str++ & 0x1f) << 6);
@@ -1452,7 +1574,7 @@ int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char*
}
if ((*str & 0xf0) == 0xe0)
{
- *out_char = 0xFFFD; // will be invalid but not end of string
+ *out_char = IM_UNICODE_CODEPOINT_INVALID; // will be invalid but not end of string
if (in_text_end && in_text_end - (const char*)str < 3) return 1;
if (*str == 0xe0 && (str[1] < 0xa0 || str[1] > 0xbf)) return 3;
if (*str == 0xed && str[1] > 0x9f) return 3; // str[1] < 0x80 is checked below
@@ -1466,7 +1588,7 @@ int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char*
}
if ((*str & 0xf8) == 0xf0)
{
- *out_char = 0xFFFD; // will be invalid but not end of string
+ *out_char = IM_UNICODE_CODEPOINT_INVALID; // will be invalid but not end of string
if (in_text_end && in_text_end - (const char*)str < 4) return 1;
if (*str > 0xf4) return 4;
if (*str == 0xf0 && (str[1] < 0x90 || str[1] > 0xbf)) return 4;
@@ -1497,7 +1619,7 @@ int ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const cha
in_text += ImTextCharFromUtf8(&c, in_text, in_text_end);
if (c == 0)
break;
- if (c < 0x10000) // FIXME: Losing characters that don't fit in 2 bytes
+ if (c <= IM_UNICODE_CODEPOINT_MAX) // FIXME: Losing characters that don't fit in 2 bytes
*buf_out++ = (ImWchar)c;
}
*buf_out = 0;
@@ -1515,7 +1637,7 @@ int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end)
in_text += ImTextCharFromUtf8(&c, in_text, in_text_end);
if (c == 0)
break;
- if (c < 0x10000)
+ if (c <= IM_UNICODE_CODEPOINT_MAX)
char_count++;
}
return char_count;
@@ -1606,7 +1728,7 @@ int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_e
}
//-----------------------------------------------------------------------------
-// [SECTION] MISC HELPER/UTILTIES (Color functions)
+// [SECTION] MISC HELPERS/UTILTIES (Color functions)
// Note: The Convert functions are early design which are not consistent with other API.
//-----------------------------------------------------------------------------
@@ -1681,53 +1803,21 @@ void ImGui::ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float&
}
}
-ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul)
-{
- ImGuiStyle& style = GImGui->Style;
- ImVec4 c = style.Colors[idx];
- c.w *= style.Alpha * alpha_mul;
- return ColorConvertFloat4ToU32(c);
-}
-
-ImU32 ImGui::GetColorU32(const ImVec4& col)
-{
- ImGuiStyle& style = GImGui->Style;
- ImVec4 c = col;
- c.w *= style.Alpha;
- return ColorConvertFloat4ToU32(c);
-}
-
-const ImVec4& ImGui::GetStyleColorVec4(ImGuiCol idx)
-{
- ImGuiStyle& style = GImGui->Style;
- return style.Colors[idx];
-}
-
-ImU32 ImGui::GetColorU32(ImU32 col)
-{
- float style_alpha = GImGui->Style.Alpha;
- if (style_alpha >= 1.0f)
- return col;
- ImU32 a = (col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT;
- a = (ImU32)(a * style_alpha); // We don't need to clamp 0..255 because Style.Alpha is in 0..1 range.
- return (col & ~IM_COL32_A_MASK) | (a << IM_COL32_A_SHIFT);
-}
-
//-----------------------------------------------------------------------------
// [SECTION] ImGuiStorage
// Helper: Key->value storage
//-----------------------------------------------------------------------------
// std::lower_bound but without the bullshit
-static ImVector::iterator LowerBound(ImVector& data, ImGuiID key)
+static ImGuiStorage::ImGuiStoragePair* LowerBound(ImVector& data, ImGuiID key)
{
- ImVector::iterator first = data.begin();
- ImVector::iterator last = data.end();
+ ImGuiStorage::ImGuiStoragePair* first = data.Data;
+ ImGuiStorage::ImGuiStoragePair* last = data.Data + data.Size;
size_t count = (size_t)(last - first);
while (count > 0)
{
size_t count2 = count >> 1;
- ImVector::iterator mid = first + count2;
+ ImGuiStorage::ImGuiStoragePair* mid = first + count2;
if (mid->key < key)
{
first = ++mid;
@@ -1749,18 +1839,18 @@ void ImGuiStorage::BuildSortByKey()
static int IMGUI_CDECL PairCompareByID(const void* lhs, const void* rhs)
{
// We can't just do a subtraction because qsort uses signed integers and subtracting our ID doesn't play well with that.
- if (((const Pair*)lhs)->key > ((const Pair*)rhs)->key) return +1;
- if (((const Pair*)lhs)->key < ((const Pair*)rhs)->key) return -1;
+ if (((const ImGuiStoragePair*)lhs)->key > ((const ImGuiStoragePair*)rhs)->key) return +1;
+ if (((const ImGuiStoragePair*)lhs)->key < ((const ImGuiStoragePair*)rhs)->key) return -1;
return 0;
}
};
if (Data.Size > 1)
- ImQsort(Data.Data, (size_t)Data.Size, sizeof(Pair), StaticFunc::PairCompareByID);
+ ImQsort(Data.Data, (size_t)Data.Size, sizeof(ImGuiStoragePair), StaticFunc::PairCompareByID);
}
int ImGuiStorage::GetInt(ImGuiID key, int default_val) const
{
- ImVector::iterator it = LowerBound(const_cast&>(Data), key);
+ ImGuiStoragePair* it = LowerBound(const_cast&>(Data), key);
if (it == Data.end() || it->key != key)
return default_val;
return it->val_i;
@@ -1773,7 +1863,7 @@ bool ImGuiStorage::GetBool(ImGuiID key, bool default_val) const
float ImGuiStorage::GetFloat(ImGuiID key, float default_val) const
{
- ImVector::iterator it = LowerBound(const_cast&>(Data), key);
+ ImGuiStoragePair* it = LowerBound(const_cast&>(Data), key);
if (it == Data.end() || it->key != key)
return default_val;
return it->val_f;
@@ -1781,7 +1871,7 @@ float ImGuiStorage::GetFloat(ImGuiID key, float default_val) const
void* ImGuiStorage::GetVoidPtr(ImGuiID key) const
{
- ImVector::iterator it = LowerBound(const_cast&>(Data), key);
+ ImGuiStoragePair* it = LowerBound(const_cast&>(Data), key);
if (it == Data.end() || it->key != key)
return NULL;
return it->val_p;
@@ -1790,9 +1880,9 @@ void* ImGuiStorage::GetVoidPtr(ImGuiID key) const
// References are only valid until a new value is added to the storage. Calling a Set***() function or a Get***Ref() function invalidates the pointer.
int* ImGuiStorage::GetIntRef(ImGuiID key, int default_val)
{
- ImVector::iterator it = LowerBound(Data, key);
+ ImGuiStoragePair* it = LowerBound(Data, key);
if (it == Data.end() || it->key != key)
- it = Data.insert(it, Pair(key, default_val));
+ it = Data.insert(it, ImGuiStoragePair(key, default_val));
return &it->val_i;
}
@@ -1803,27 +1893,27 @@ bool* ImGuiStorage::GetBoolRef(ImGuiID key, bool default_val)
float* ImGuiStorage::GetFloatRef(ImGuiID key, float default_val)
{
- ImVector::iterator it = LowerBound(Data, key);
+ ImGuiStoragePair* it = LowerBound(Data, key);
if (it == Data.end() || it->key != key)
- it = Data.insert(it, Pair(key, default_val));
+ it = Data.insert(it, ImGuiStoragePair(key, default_val));
return &it->val_f;
}
void** ImGuiStorage::GetVoidPtrRef(ImGuiID key, void* default_val)
{
- ImVector::iterator it = LowerBound(Data, key);
+ ImGuiStoragePair* it = LowerBound(Data, key);
if (it == Data.end() || it->key != key)
- it = Data.insert(it, Pair(key, default_val));
+ it = Data.insert(it, ImGuiStoragePair(key, default_val));
return &it->val_p;
}
// FIXME-OPT: Need a way to reuse the result of lower_bound when doing GetInt()/SetInt() - not too bad because it only happens on explicit interaction (maximum one a frame)
void ImGuiStorage::SetInt(ImGuiID key, int val)
{
- ImVector::iterator it = LowerBound(Data, key);
+ ImGuiStoragePair* it = LowerBound(Data, key);
if (it == Data.end() || it->key != key)
{
- Data.insert(it, Pair(key, val));
+ Data.insert(it, ImGuiStoragePair(key, val));
return;
}
it->val_i = val;
@@ -1836,10 +1926,10 @@ void ImGuiStorage::SetBool(ImGuiID key, bool val)
void ImGuiStorage::SetFloat(ImGuiID key, float val)
{
- ImVector::iterator it = LowerBound(Data, key);
+ ImGuiStoragePair* it = LowerBound(Data, key);
if (it == Data.end() || it->key != key)
{
- Data.insert(it, Pair(key, val));
+ Data.insert(it, ImGuiStoragePair(key, val));
return;
}
it->val_f = val;
@@ -1847,10 +1937,10 @@ void ImGuiStorage::SetFloat(ImGuiID key, float val)
void ImGuiStorage::SetVoidPtr(ImGuiID key, void* val)
{
- ImVector::iterator it = LowerBound(Data, key);
+ ImGuiStoragePair* it = LowerBound(Data, key);
if (it == Data.end() || it->key != key)
{
- Data.insert(it, Pair(key, val));
+ Data.insert(it, ImGuiStoragePair(key, val));
return;
}
it->val_p = val;
@@ -1884,16 +1974,14 @@ ImGuiTextFilter::ImGuiTextFilter(const char* default_filter)
bool ImGuiTextFilter::Draw(const char* label, float width)
{
if (width != 0.0f)
- ImGui::PushItemWidth(width);
+ ImGui::SetNextItemWidth(width);
bool value_changed = ImGui::InputText(label, InputBuf, IM_ARRAYSIZE(InputBuf));
- if (width != 0.0f)
- ImGui::PopItemWidth();
if (value_changed)
Build();
return value_changed;
}
-void ImGuiTextFilter::TextRange::split(char separator, ImVector* out) const
+void ImGuiTextFilter::ImGuiTextRange::split(char separator, ImVector* out) const
{
out->resize(0);
const char* wb = b;
@@ -1902,25 +1990,25 @@ void ImGuiTextFilter::TextRange::split(char separator, ImVector* out)
{
if (*we == separator)
{
- out->push_back(TextRange(wb, we));
+ out->push_back(ImGuiTextRange(wb, we));
wb = we + 1;
}
we++;
}
if (wb != we)
- out->push_back(TextRange(wb, we));
+ out->push_back(ImGuiTextRange(wb, we));
}
void ImGuiTextFilter::Build()
{
Filters.resize(0);
- TextRange input_range(InputBuf, InputBuf+strlen(InputBuf));
+ ImGuiTextRange input_range(InputBuf, InputBuf+strlen(InputBuf));
input_range.split(',', &Filters);
CountGrep = 0;
for (int i = 0; i != Filters.Size; i++)
{
- TextRange& f = Filters[i];
+ ImGuiTextRange& f = Filters[i];
while (f.b < f.e && ImCharIsBlankA(f.b[0]))
f.b++;
while (f.e > f.b && ImCharIsBlankA(f.e[-1]))
@@ -1942,19 +2030,19 @@ bool ImGuiTextFilter::PassFilter(const char* text, const char* text_end) const
for (int i = 0; i != Filters.Size; i++)
{
- const TextRange& f = Filters[i];
+ const ImGuiTextRange& f = Filters[i];
if (f.empty())
continue;
if (f.b[0] == '-')
{
// Subtract
- if (ImStristr(text, text_end, f.begin()+1, f.end()) != NULL)
+ if (ImStristr(text, text_end, f.b + 1, f.e) != NULL)
return false;
}
else
{
// Grep
- if (ImStristr(text, text_end, f.begin(), f.end()) != NULL)
+ if (ImStristr(text, text_end, f.b, f.e) != NULL)
return true;
}
}
@@ -1982,6 +2070,32 @@ bool ImGuiTextFilter::PassFilter(const char* text, const char* text_end) const
char ImGuiTextBuffer::EmptyString[1] = { 0 };
+void ImGuiTextBuffer::append(const char* str, const char* str_end)
+{
+ int len = str_end ? (int)(str_end - str) : (int)strlen(str);
+
+ // Add zero-terminator the first time
+ const int write_off = (Buf.Size != 0) ? Buf.Size : 1;
+ const int needed_sz = write_off + len;
+ if (write_off + len >= Buf.Capacity)
+ {
+ int new_capacity = Buf.Capacity * 2;
+ Buf.reserve(needed_sz > new_capacity ? needed_sz : new_capacity);
+ }
+
+ Buf.resize(needed_sz);
+ memcpy(&Buf[write_off - 1], str, (size_t)len);
+ Buf[write_off - 1 + len] = 0;
+}
+
+void ImGuiTextBuffer::appendf(const char* fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ appendfv(fmt, args);
+ va_end(args);
+}
+
// Helper: Text buffer for logging/accumulating text
void ImGuiTextBuffer::appendfv(const char* fmt, va_list args)
{
@@ -2000,8 +2114,8 @@ void ImGuiTextBuffer::appendfv(const char* fmt, va_list args)
const int needed_sz = write_off + len;
if (write_off + len >= Buf.Capacity)
{
- int double_capacity = Buf.Capacity * 2;
- Buf.reserve(needed_sz > double_capacity ? needed_sz : double_capacity);
+ int new_capacity = Buf.Capacity * 2;
+ Buf.reserve(needed_sz > new_capacity ? needed_sz : new_capacity);
}
Buf.resize(needed_sz);
@@ -2009,30 +2123,66 @@ void ImGuiTextBuffer::appendfv(const char* fmt, va_list args)
va_end(args_copy);
}
-void ImGuiTextBuffer::appendf(const char* fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- appendfv(fmt, args);
- va_end(args);
-}
-
//-----------------------------------------------------------------------------
// [SECTION] ImGuiListClipper
-// This is currently not as flexible/powerful as it should be, needs some rework (see TODO)
+// This is currently not as flexible/powerful as it should be and really confusing/spaghetti, mostly because we changed
+// the API mid-way through development and support two ways to using the clipper, needs some rework (see TODO)
//-----------------------------------------------------------------------------
+// Helper to calculate coarse clipping of large list of evenly sized items.
+// NB: Prefer using the ImGuiListClipper higher-level helper if you can! Read comments and instructions there on how those use this sort of pattern.
+// NB: 'items_count' is only used to clamp the result, if you don't know your count you can use INT_MAX
+void ImGui::CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ if (g.LogEnabled)
+ {
+ // If logging is active, do not perform any clipping
+ *out_items_display_start = 0;
+ *out_items_display_end = items_count;
+ return;
+ }
+ if (window->SkipItems)
+ {
+ *out_items_display_start = *out_items_display_end = 0;
+ return;
+ }
+
+ // We create the union of the ClipRect and the NavScoringRect which at worst should be 1 page away from ClipRect
+ ImRect unclipped_rect = window->ClipRect;
+ if (g.NavMoveRequest)
+ unclipped_rect.Add(g.NavScoringRectScreen);
+
+ const ImVec2 pos = window->DC.CursorPos;
+ int start = (int)((unclipped_rect.Min.y - pos.y) / items_height);
+ int end = (int)((unclipped_rect.Max.y - pos.y) / items_height);
+
+ // When performing a navigation request, ensure we have one item extra in the direction we are moving to
+ if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Up)
+ start--;
+ if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Down)
+ end++;
+
+ start = ImClamp(start, 0, items_count);
+ end = ImClamp(end + 1, start, items_count);
+ *out_items_display_start = start;
+ *out_items_display_end = end;
+}
+
static void SetCursorPosYAndSetupDummyPrevLine(float pos_y, float line_height)
{
// Set cursor position and a few other things so that SetScrollHereY() and Columns() can work when seeking cursor.
// FIXME: It is problematic that we have to do that here, because custom/equivalent end-user code would stumble on the same issue.
// The clipper should probably have a 4th step to display the last item in a regular manner.
- ImGui::SetCursorPosY(pos_y);
- ImGuiWindow* window = ImGui::GetCurrentWindow();
- window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y - line_height; // Setting those fields so that SetScrollHereY() can properly function after the end of our clipper usage.
- window->DC.PrevLineSize.y = (line_height - GImGui->Style.ItemSpacing.y); // If we end up needing more accurate data (to e.g. use SameLine) we may as well make the clipper have a fourth step to let user process and display the last item in their list.
- if (window->DC.ColumnsSet)
- window->DC.ColumnsSet->LineMinY = window->DC.CursorPos.y; // Setting this so that cell Y position are set properly
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ window->DC.CursorPos.y = pos_y;
+ window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, pos_y);
+ window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y - line_height; // Setting those fields so that SetScrollHereY() can properly function after the end of our clipper usage.
+ window->DC.PrevLineSize.y = (line_height - g.Style.ItemSpacing.y); // If we end up needing more accurate data (to e.g. use SameLine) we may as well make the clipper have a fourth step to let user process and display the last item in their list.
+ if (ImGuiColumns* columns = window->DC.CurrentColumns)
+ columns->LineMinY = window->DC.CursorPos.y; // Setting this so that cell Y position are set properly
}
// Use case A: Begin() called from constructor with items_height<0, then called again from Sync() in StepNo 1
@@ -2040,7 +2190,10 @@ static void SetCursorPosYAndSetupDummyPrevLine(float pos_y, float line_height)
// FIXME-LEGACY: Ideally we should remove the Begin/End functions but they are part of the legacy API we still support. This is why some of the code in Step() calling Begin() and reassign some fields, spaghetti style.
void ImGuiListClipper::Begin(int count, float items_height)
{
- StartPosY = ImGui::GetCursorPosY();
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+
+ StartPosY = window->DC.CursorPos.y;
ItemsHeight = items_height;
ItemsCount = count;
StepNo = 0;
@@ -2067,7 +2220,10 @@ void ImGuiListClipper::End()
bool ImGuiListClipper::Step()
{
- if (ItemsCount == 0 || ImGui::GetCurrentWindowRead()->SkipItems)
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+
+ if (ItemsCount == 0 || window->SkipItems)
{
ItemsCount = -1;
return false;
@@ -2076,16 +2232,16 @@ bool ImGuiListClipper::Step()
{
DisplayStart = 0;
DisplayEnd = 1;
- StartPosY = ImGui::GetCursorPosY();
+ StartPosY = window->DC.CursorPos.y;
StepNo = 1;
return true;
}
if (StepNo == 1) // Step 1: the clipper infer height from first element, calculate the actual range of elements to display, and position the cursor before the first element.
{
if (ItemsCount == 1) { ItemsCount = -1; return false; }
- float items_height = ImGui::GetCursorPosY() - StartPosY;
+ float items_height = window->DC.CursorPos.y - StartPosY;
IM_ASSERT(items_height > 0.0f); // If this triggers, it means Item 0 hasn't moved the cursor vertically
- Begin(ItemsCount-1, items_height);
+ Begin(ItemsCount - 1, items_height);
DisplayStart++;
DisplayEnd++;
StepNo = 3;
@@ -2104,10 +2260,42 @@ bool ImGuiListClipper::Step()
//-----------------------------------------------------------------------------
// [SECTION] RENDER HELPERS
-// Those (internal) functions are currently quite a legacy mess - their signature and behavior will change.
+// Some of those (internal) functions are currently quite a legacy mess - their signature and behavior will change.
// Also see imgui_draw.cpp for some more which have been reworked to not rely on ImGui:: state.
//-----------------------------------------------------------------------------
+ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul)
+{
+ ImGuiStyle& style = GImGui->Style;
+ ImVec4 c = style.Colors[idx];
+ c.w *= style.Alpha * alpha_mul;
+ return ColorConvertFloat4ToU32(c);
+}
+
+ImU32 ImGui::GetColorU32(const ImVec4& col)
+{
+ ImGuiStyle& style = GImGui->Style;
+ ImVec4 c = col;
+ c.w *= style.Alpha;
+ return ColorConvertFloat4ToU32(c);
+}
+
+const ImVec4& ImGui::GetStyleColorVec4(ImGuiCol idx)
+{
+ ImGuiStyle& style = GImGui->Style;
+ return style.Colors[idx];
+}
+
+ImU32 ImGui::GetColorU32(ImU32 col)
+{
+ ImGuiStyle& style = GImGui->Style;
+ if (style.Alpha >= 1.0f)
+ return col;
+ ImU32 a = (col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT;
+ a = (ImU32)(a * style.Alpha); // We don't need to clamp 0..255 because Style.Alpha is in 0..1 range.
+ return (col & ~IM_COL32_A_MASK) | (a << IM_COL32_A_SHIFT);
+}
+
const char* ImGui::FindRenderedTextEnd(const char* text, const char* text_end)
{
const char* text_display_end = text;
@@ -2165,17 +2353,8 @@ void ImGui::RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end
// Default clip_rect uses (pos_min,pos_max)
// Handle clipping on CPU immediately (vs typically let the GPU clip the triangles that are overlapping the clipping rectangle edges)
-void ImGui::RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect)
+void ImGui::RenderTextClippedEx(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_display_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect)
{
- // Hide anything after a '##' string
- const char* text_display_end = FindRenderedTextEnd(text, text_end);
- const int text_len = (int)(text_display_end - text);
- if (text_len == 0)
- return;
-
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = g.CurrentWindow;
-
// Perform CPU side clipping for single clipped element to avoid using scissor state
ImVec2 pos = pos_min;
const ImVec2 text_size = text_size_if_known ? *text_size_if_known : CalcTextSize(text, text_display_end, false, 0.0f);
@@ -2194,14 +2373,108 @@ void ImGui::RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, cons
if (need_clipping)
{
ImVec4 fine_clip_rect(clip_min->x, clip_min->y, clip_max->x, clip_max->y);
- window->DrawList->AddText(g.Font, g.FontSize, pos, GetColorU32(ImGuiCol_Text), text, text_display_end, 0.0f, &fine_clip_rect);
+ draw_list->AddText(NULL, 0.0f, pos, GetColorU32(ImGuiCol_Text), text, text_display_end, 0.0f, &fine_clip_rect);
}
else
{
- window->DrawList->AddText(g.Font, g.FontSize, pos, GetColorU32(ImGuiCol_Text), text, text_display_end, 0.0f, NULL);
+ draw_list->AddText(NULL, 0.0f, pos, GetColorU32(ImGuiCol_Text), text, text_display_end, 0.0f, NULL);
}
+}
+
+void ImGui::RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect)
+{
+ // Hide anything after a '##' string
+ const char* text_display_end = FindRenderedTextEnd(text, text_end);
+ const int text_len = (int)(text_display_end - text);
+ if (text_len == 0)
+ return;
+
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ RenderTextClippedEx(window->DrawList, pos_min, pos_max, text, text_display_end, text_size_if_known, align, clip_rect);
if (g.LogEnabled)
- LogRenderedText(&pos, text, text_display_end);
+ LogRenderedText(&pos_min, text, text_display_end);
+}
+
+
+// Another overly complex function until we reorganize everything into a nice all-in-one helper.
+// This is made more complex because we have dissociated the layout rectangle (pos_min..pos_max) which define _where_ the ellipsis is, from actual clipping of text and limit of the ellipsis display.
+// This is because in the context of tabs we selectively hide part of the text when the Close Button appears, but we don't want the ellipsis to move.
+void ImGui::RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, float clip_max_x, float ellipsis_max_x, const char* text, const char* text_end_full, const ImVec2* text_size_if_known)
+{
+ ImGuiContext& g = *GImGui;
+ if (text_end_full == NULL)
+ text_end_full = FindRenderedTextEnd(text);
+ const ImVec2 text_size = text_size_if_known ? *text_size_if_known : CalcTextSize(text, text_end_full, false, 0.0f);
+
+ //draw_list->AddLine(ImVec2(pos_max.x, pos_min.y - 4), ImVec2(pos_max.x, pos_max.y + 4), IM_COL32(0, 0, 255, 255));
+ //draw_list->AddLine(ImVec2(ellipsis_max_x, pos_min.y-2), ImVec2(ellipsis_max_x, pos_max.y+2), IM_COL32(0, 255, 0, 255));
+ //draw_list->AddLine(ImVec2(clip_max_x, pos_min.y), ImVec2(clip_max_x, pos_max.y), IM_COL32(255, 0, 0, 255));
+ // FIXME: We could technically remove (last_glyph->AdvanceX - last_glyph->X1) from text_size.x here and save a few pixels.
+ if (text_size.x > pos_max.x - pos_min.x)
+ {
+ // Hello wo...
+ // | | |
+ // min max ellipsis_max
+ // <-> this is generally some padding value
+
+ const ImFont* font = draw_list->_Data->Font;
+ const float font_size = draw_list->_Data->FontSize;
+ const char* text_end_ellipsis = NULL;
+
+ ImWchar ellipsis_char = font->EllipsisChar;
+ int ellipsis_char_count = 1;
+ if (ellipsis_char == (ImWchar)-1)
+ {
+ ellipsis_char = (ImWchar)'.';
+ ellipsis_char_count = 3;
+ }
+ const ImFontGlyph* glyph = font->FindGlyph(ellipsis_char);
+
+ float ellipsis_glyph_width = glyph->X1; // Width of the glyph with no padding on either side
+ float ellipsis_total_width = ellipsis_glyph_width; // Full width of entire ellipsis
+
+ if (ellipsis_char_count > 1)
+ {
+ // Full ellipsis size without free spacing after it.
+ const float spacing_between_dots = 1.0f * (draw_list->_Data->FontSize / font->FontSize);
+ ellipsis_glyph_width = glyph->X1 - glyph->X0 + spacing_between_dots;
+ ellipsis_total_width = ellipsis_glyph_width * (float)ellipsis_char_count - spacing_between_dots;
+ }
+
+ // We can now claim the space between pos_max.x and ellipsis_max.x
+ const float text_avail_width = ImMax((ImMax(pos_max.x, ellipsis_max_x) - ellipsis_total_width) - pos_min.x, 1.0f);
+ float text_size_clipped_x = font->CalcTextSizeA(font_size, text_avail_width, 0.0f, text, text_end_full, &text_end_ellipsis).x;
+ if (text == text_end_ellipsis && text_end_ellipsis < text_end_full)
+ {
+ // Always display at least 1 character if there's no room for character + ellipsis
+ text_end_ellipsis = text + ImTextCountUtf8BytesFromChar(text, text_end_full);
+ text_size_clipped_x = font->CalcTextSizeA(font_size, FLT_MAX, 0.0f, text, text_end_ellipsis).x;
+ }
+ while (text_end_ellipsis > text && ImCharIsBlankA(text_end_ellipsis[-1]))
+ {
+ // Trim trailing space before ellipsis (FIXME: Supporting non-ascii blanks would be nice, for this we need a function to backtrack in UTF-8 text)
+ text_end_ellipsis--;
+ text_size_clipped_x -= font->CalcTextSizeA(font_size, FLT_MAX, 0.0f, text_end_ellipsis, text_end_ellipsis + 1).x; // Ascii blanks are always 1 byte
+ }
+
+ // Render text, render ellipsis
+ RenderTextClippedEx(draw_list, pos_min, ImVec2(clip_max_x, pos_max.y), text, text_end_ellipsis, &text_size, ImVec2(0.0f, 0.0f));
+ float ellipsis_x = pos_min.x + text_size_clipped_x;
+ if (ellipsis_x + ellipsis_total_width <= ellipsis_max_x)
+ for (int i = 0; i < ellipsis_char_count; i++)
+ {
+ font->RenderChar(draw_list, font_size, ImVec2(ellipsis_x, pos_min.y), GetColorU32(ImGuiCol_Text), ellipsis_char);
+ ellipsis_x += ellipsis_glyph_width;
+ }
+ }
+ else
+ {
+ RenderTextClippedEx(draw_list, pos_min, ImVec2(clip_max_x, pos_max.y), text, text_end_full, &text_size, ImVec2(0.0f, 0.0f));
+ }
+
+ if (g.LogEnabled)
+ LogRenderedText(&pos_min, text, text_end_full);
}
// Render a rectangle shaped with optional rounding and borders
@@ -2231,13 +2504,11 @@ void ImGui::RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding)
}
// Render an arrow aimed to be aligned with text (p_min is a position in the same space text would be positioned). To e.g. denote expanded/collapsed state
-void ImGui::RenderArrow(ImVec2 p_min, ImGuiDir dir, float scale)
+void ImGui::RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale)
{
- ImGuiContext& g = *GImGui;
-
- const float h = g.FontSize * 1.00f;
+ const float h = draw_list->_Data->FontSize * 1.00f;
float r = h * 0.40f * scale;
- ImVec2 center = p_min + ImVec2(h * 0.50f, h * 0.50f * scale);
+ ImVec2 center = pos + ImVec2(h * 0.50f, h * 0.50f * scale);
ImVec2 a, b, c;
switch (dir)
@@ -2261,15 +2532,12 @@ void ImGui::RenderArrow(ImVec2 p_min, ImGuiDir dir, float scale)
IM_ASSERT(0);
break;
}
-
- g.CurrentWindow->DrawList->AddTriangleFilled(center + a, center + b, center + c, GetColorU32(ImGuiCol_Text));
+ draw_list->AddTriangleFilled(center + a, center + b, center + c, col);
}
-void ImGui::RenderBullet(ImVec2 pos)
+void ImGui::RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col)
{
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = g.CurrentWindow;
- window->DrawList->AddCircleFilled(pos, g.FontSize*0.20f, GetColorU32(ImGuiCol_Text), 8);
+ draw_list->AddCircleFilled(pos, draw_list->_Data->FontSize * 0.20f, col, 8);
}
void ImGui::RenderCheckMark(ImVec2 pos, ImU32 col, float sz)
@@ -2297,7 +2565,7 @@ void ImGui::RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFl
return;
if (g.NavDisableHighlight && !(flags & ImGuiNavHighlightFlags_AlwaysDraw))
return;
- ImGuiWindow* window = ImGui::GetCurrentWindow();
+ ImGuiWindow* window = g.CurrentWindow;
if (window->DC.NavHideHighlightOneFrame)
return;
@@ -2331,15 +2599,16 @@ ImGuiWindow::ImGuiWindow(ImGuiContext* context, const char* name)
: DrawListInst(&context->DrawListSharedData)
{
Name = ImStrdup(name);
- ID = ImHash(name, 0);
+ ID = ImHashStr(name);
IDStack.push_back(ID);
- Flags = 0;
+ Flags = ImGuiWindowFlags_None;
Pos = ImVec2(0.0f, 0.0f);
Size = SizeFull = ImVec2(0.0f, 0.0f);
- SizeContents = SizeContentsExplicit = ImVec2(0.0f, 0.0f);
+ ContentSize = ContentSizeExplicit = ImVec2(0.0f, 0.0f);
WindowPadding = ImVec2(0.0f, 0.0f);
WindowRounding = 0.0f;
WindowBorderSize = 0.0f;
+ NameBufLen = (int)strlen(name) + 1;
MoveId = GetID("#MOVE");
ChildId = 0;
Scroll = ImVec2(0.0f, 0.0f);
@@ -2354,23 +2623,28 @@ ImGuiWindow::ImGuiWindow(ImGuiContext* context, const char* name)
SkipItems = false;
Appearing = false;
Hidden = false;
+ IsFallbackWindow = false;
HasCloseButton = false;
+ ResizeBorderHeld = -1;
BeginCount = 0;
BeginOrderWithinParent = -1;
BeginOrderWithinContext = -1;
PopupId = 0;
AutoFitFramesX = AutoFitFramesY = -1;
- AutoFitOnlyGrows = false;
AutoFitChildAxises = 0x00;
+ AutoFitOnlyGrows = false;
AutoPosLastDirection = ImGuiDir_None;
- HiddenFramesRegular = HiddenFramesForResize = 0;
+ HiddenFramesCanSkipItems = HiddenFramesCannotSkipItems = 0;
SetWindowPosAllowFlags = SetWindowSizeAllowFlags = SetWindowCollapsedAllowFlags = ImGuiCond_Always | ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing;
SetWindowPosVal = SetWindowPosPivot = ImVec2(FLT_MAX, FLT_MAX);
+ InnerRect = ImRect(0.0f, 0.0f, 0.0f, 0.0f); // Clear so the InnerRect.GetSize() code in Begin() doesn't lead to overflow even if the result isn't used.
+
LastFrameActive = -1;
+ LastTimeActive = -1.0f;
ItemWidthDefault = 0.0f;
FontWindowScale = 1.0f;
- SettingsIdx = -1;
+ SettingsOffset = -1;
DrawList = &DrawListInst;
DrawList->_OwnerName = Name;
@@ -2383,9 +2657,8 @@ ImGuiWindow::ImGuiWindow(ImGuiContext* context, const char* name)
NavRectRel[0] = NavRectRel[1] = ImRect();
NavLastChildNavWindow = NULL;
- FocusIdxAllCounter = FocusIdxTabCounter = -1;
- FocusIdxAllRequestCurrent = FocusIdxTabRequestCurrent = INT_MAX;
- FocusIdxAllRequestNext = FocusIdxTabRequestNext = INT_MAX;
+ MemoryCompacted = false;
+ MemoryDrawListIdxCapacity = MemoryDrawListVtxCapacity = 0;
}
ImGuiWindow::~ImGuiWindow()
@@ -2393,13 +2666,13 @@ ImGuiWindow::~ImGuiWindow()
IM_ASSERT(DrawList == &DrawListInst);
IM_DELETE(Name);
for (int i = 0; i != ColumnsStorage.Size; i++)
- ColumnsStorage[i].~ImGuiColumnsSet();
+ ColumnsStorage[i].~ImGuiColumns();
}
ImGuiID ImGuiWindow::GetID(const char* str, const char* str_end)
{
ImGuiID seed = IDStack.back();
- ImGuiID id = ImHash(str, str_end ? (int)(str_end - str) : 0, seed);
+ ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed);
ImGui::KeepAliveID(id);
return id;
}
@@ -2407,7 +2680,15 @@ ImGuiID ImGuiWindow::GetID(const char* str, const char* str_end)
ImGuiID ImGuiWindow::GetID(const void* ptr)
{
ImGuiID seed = IDStack.back();
- ImGuiID id = ImHash(&ptr, sizeof(void*), seed);
+ ImGuiID id = ImHashData(&ptr, sizeof(void*), seed);
+ ImGui::KeepAliveID(id);
+ return id;
+}
+
+ImGuiID ImGuiWindow::GetID(int n)
+{
+ ImGuiID seed = IDStack.back();
+ ImGuiID id = ImHashData(&n, sizeof(n), seed);
ImGui::KeepAliveID(id);
return id;
}
@@ -2415,13 +2696,19 @@ ImGuiID ImGuiWindow::GetID(const void* ptr)
ImGuiID ImGuiWindow::GetIDNoKeepAlive(const char* str, const char* str_end)
{
ImGuiID seed = IDStack.back();
- return ImHash(str, str_end ? (int)(str_end - str) : 0, seed);
+ return ImHashStr(str, str_end ? (str_end - str) : 0, seed);
}
ImGuiID ImGuiWindow::GetIDNoKeepAlive(const void* ptr)
{
ImGuiID seed = IDStack.back();
- return ImHash(&ptr, sizeof(void*), seed);
+ return ImHashData(&ptr, sizeof(void*), seed);
+}
+
+ImGuiID ImGuiWindow::GetIDNoKeepAlive(int n)
+{
+ ImGuiID seed = IDStack.back();
+ return ImHashData(&n, sizeof(n), seed);
}
// This is only used in rare/specific situations to manufacture an ID out of nowhere.
@@ -2429,7 +2716,7 @@ ImGuiID ImGuiWindow::GetIDFromRectangle(const ImRect& r_abs)
{
ImGuiID seed = IDStack.back();
const int r_rel[4] = { (int)(r_abs.Min.x - Pos.x), (int)(r_abs.Min.y - Pos.y), (int)(r_abs.Max.x - Pos.x), (int)(r_abs.Max.y - Pos.y) };
- ImGuiID id = ImHash(&r_rel, sizeof(r_rel), seed);
+ ImGuiID id = ImHashData(&r_rel, sizeof(r_rel), seed);
ImGui::KeepAliveID(id);
return id;
}
@@ -2442,23 +2729,34 @@ static void SetCurrentWindow(ImGuiWindow* window)
g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
}
-void ImGui::SetNavID(ImGuiID id, int nav_layer)
+// Free up/compact internal window buffers, we can use this when a window becomes unused.
+// This is currently unused by the library, but you may call this yourself for easy GC.
+// Not freed:
+// - ImGuiWindow, ImGuiWindowSettings, Name
+// - StateStorage, ColumnsStorage (may hold useful data)
+// This should have no noticeable visual effect. When the window reappear however, expect new allocation/buffer growth/copy cost.
+void ImGui::GcCompactTransientWindowBuffers(ImGuiWindow* window)
{
- ImGuiContext& g = *GImGui;
- IM_ASSERT(g.NavWindow);
- IM_ASSERT(nav_layer == 0 || nav_layer == 1);
- g.NavId = id;
- g.NavWindow->NavLastIds[nav_layer] = id;
+ window->MemoryCompacted = true;
+ window->MemoryDrawListIdxCapacity = window->DrawList->IdxBuffer.Capacity;
+ window->MemoryDrawListVtxCapacity = window->DrawList->VtxBuffer.Capacity;
+ window->IDStack.clear();
+ window->DrawList->ClearFreeMemory();
+ window->DC.ChildWindows.clear();
+ window->DC.ItemFlagsStack.clear();
+ window->DC.ItemWidthStack.clear();
+ window->DC.TextWrapPosStack.clear();
+ window->DC.GroupStack.clear();
}
-void ImGui::SetNavIDWithRectRel(ImGuiID id, int nav_layer, const ImRect& rect_rel)
+void ImGui::GcAwakeTransientWindowBuffers(ImGuiWindow* window)
{
- ImGuiContext& g = *GImGui;
- SetNavID(id, nav_layer);
- g.NavWindow->NavRectRel[nav_layer] = rect_rel;
- g.NavMousePosDirty = true;
- g.NavDisableHighlight = false;
- g.NavDisableMouseHover = true;
+ // We stored capacity of the ImDrawList buffer to reduce growth-caused allocation/copy when awakening.
+ // The other buffers tends to amortize much faster.
+ window->MemoryCompacted = false;
+ window->DrawList->IdxBuffer.reserve(window->MemoryDrawListIdxCapacity);
+ window->DrawList->VtxBuffer.reserve(window->MemoryDrawListVtxCapacity);
+ window->MemoryDrawListIdxCapacity = window->MemoryDrawListVtxCapacity = 0;
}
void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window)
@@ -2468,7 +2766,8 @@ void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window)
if (g.ActiveIdIsJustActivated)
{
g.ActiveIdTimer = 0.0f;
- g.ActiveIdHasBeenEdited = false;
+ g.ActiveIdHasBeenPressedBefore = false;
+ g.ActiveIdHasBeenEditedBefore = false;
if (id != 0)
{
g.LastActiveId = id;
@@ -2476,36 +2775,20 @@ void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window)
}
}
g.ActiveId = id;
- g.ActiveIdAllowNavDirFlags = 0;
g.ActiveIdAllowOverlap = false;
g.ActiveIdWindow = window;
+ g.ActiveIdHasBeenEditedThisFrame = false;
if (id)
{
g.ActiveIdIsAlive = id;
g.ActiveIdSource = (g.NavActivateId == id || g.NavInputId == id || g.NavJustTabbedId == id || g.NavJustMovedToId == id) ? ImGuiInputSource_Nav : ImGuiInputSource_Mouse;
}
-}
-void ImGui::SetFocusID(ImGuiID id, ImGuiWindow* window)
-{
- ImGuiContext& g = *GImGui;
- IM_ASSERT(id != 0);
-
- // Assume that SetFocusID() is called in the context where its NavLayer is the current layer, which is the case everywhere we call it.
- const int nav_layer = window->DC.NavLayerCurrent;
- if (g.NavWindow != window)
- g.NavInitRequest = false;
- g.NavId = id;
- g.NavWindow = window;
- g.NavLayer = nav_layer;
- window->NavLastIds[nav_layer] = id;
- if (window->DC.LastItemId == id)
- window->NavRectRel[nav_layer] = ImRect(window->DC.LastItemRect.Min - window->Pos, window->DC.LastItemRect.Max - window->Pos);
-
- if (g.ActiveIdSource == ImGuiInputSource_Nav)
- g.NavDisableMouseHover = true;
- else
- g.NavDisableHighlight = true;
+ // Clear declaration of inputs claimed by the widget
+ // (Please note that this is WIP and not all keys/inputs are thoroughly declared by all widgets yet)
+ g.ActiveIdUsingNavDirMask = 0x00;
+ g.ActiveIdUsingNavInputMask = 0x00;
+ g.ActiveIdUsingKeyInputMask = 0x00;
}
void ImGui::ClearActiveID()
@@ -2541,11 +2824,12 @@ void ImGui::MarkItemEdited(ImGuiID id)
{
// This marking is solely to be able to provide info for IsItemDeactivatedAfterEdit().
// ActiveId might have been released by the time we call this (as in the typical press/release button behavior) but still need need to fill the data.
- (void)id; // Avoid unused variable warnings when asserts are compiled out.
ImGuiContext& g = *GImGui;
IM_ASSERT(g.ActiveId == id || g.ActiveId == 0 || g.DragDropActive);
+ IM_UNUSED(id); // Avoid unused variable warnings when asserts are compiled out.
//IM_ASSERT(g.CurrentWindow->DC.LastItemId == id);
- g.ActiveIdHasBeenEdited = true;
+ g.ActiveIdHasBeenEditedThisFrame = true;
+ g.ActiveIdHasBeenEditedBefore = true;
g.CurrentWindow->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Edited;
}
@@ -2565,40 +2849,46 @@ static inline bool IsWindowContentHoverable(ImGuiWindow* window, ImGuiHoveredFla
if ((focused_root_window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiHoveredFlags_AllowWhenBlockedByPopup))
return false;
}
-
return true;
}
// Advance cursor given item size for layout.
-void ImGui::ItemSize(const ImVec2& size, float text_offset_y)
+void ImGui::ItemSize(const ImVec2& size, float text_baseline_y)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
if (window->SkipItems)
return;
+ // We increase the height in this function to accommodate for baseline offset.
+ // In theory we should be offsetting the starting position (window->DC.CursorPos), that will be the topic of a larger refactor,
+ // but since ItemSize() is not yet an API that moves the cursor (to handle e.g. wrapping) enlarging the height has the same effect.
+ const float offset_to_match_baseline_y = (text_baseline_y >= 0) ? ImMax(0.0f, window->DC.CurrLineTextBaseOffset - text_baseline_y) : 0.0f;
+ const float line_height = ImMax(window->DC.CurrLineSize.y, size.y + offset_to_match_baseline_y);
+
// Always align ourselves on pixel boundaries
- const float line_height = ImMax(window->DC.CurrentLineSize.y, size.y);
- const float text_base_offset = ImMax(window->DC.CurrentLineTextBaseOffset, text_offset_y);
//if (g.IO.KeyAlt) window->DrawList->AddRect(window->DC.CursorPos, window->DC.CursorPos + ImVec2(size.x, line_height), IM_COL32(255,0,0,200)); // [DEBUG]
- window->DC.CursorPosPrevLine = ImVec2(window->DC.CursorPos.x + size.x, window->DC.CursorPos.y);
- window->DC.CursorPos = ImVec2((float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x), (float)(int)(window->DC.CursorPos.y + line_height + g.Style.ItemSpacing.y));
+ window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x + size.x;
+ window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y;
+ window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); // Next line
+ window->DC.CursorPos.y = IM_FLOOR(window->DC.CursorPos.y + line_height + g.Style.ItemSpacing.y); // Next line
window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPosPrevLine.x);
window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y - g.Style.ItemSpacing.y);
//if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorMaxPos, 3.0f, IM_COL32(255,0,0,255), 4); // [DEBUG]
window->DC.PrevLineSize.y = line_height;
- window->DC.PrevLineTextBaseOffset = text_base_offset;
- window->DC.CurrentLineSize.y = window->DC.CurrentLineTextBaseOffset = 0.0f;
+ window->DC.CurrLineSize.y = 0.0f;
+ window->DC.PrevLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, text_baseline_y);
+ window->DC.CurrLineTextBaseOffset = 0.0f;
// Horizontal layout mode
if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
SameLine();
}
-void ImGui::ItemSize(const ImRect& bb, float text_offset_y)
+void ImGui::ItemSize(const ImRect& bb, float text_baseline_y)
{
- ItemSize(bb.GetSize(), text_offset_y);
+ ItemSize(bb.GetSize(), text_baseline_y);
}
// Declare item bounding box for clipping and interaction.
@@ -2606,10 +2896,6 @@ void ImGui::ItemSize(const ImRect& bb, float text_offset_y)
// declare their minimum size requirement to ItemSize() and then use a larger region for drawing/interaction, which is passed to ItemAdd().
bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg)
{
-#ifdef IMGUI_ENABLE_TEST_ENGINE_HOOKS
- ImGuiTestEngineHook_ItemAdd(bb, id, nav_bb_arg);
-#endif
-
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
@@ -2617,19 +2903,38 @@ bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg)
{
// Navigation processing runs prior to clipping early-out
// (a) So that NavInitRequest can be honored, for newly opened windows to select a default widget
- // (b) So that we can scroll up/down past clipped items. This adds a small O(N) cost to regular navigation requests unfortunately, but it is still limited to one window.
- // it may not scale very well for windows with ten of thousands of item, but at least NavMoveRequest is only set on user interaction, aka maximum once a frame.
- // We could early out with "if (is_clipped && !g.NavInitRequest) return false;" but when we wouldn't be able to reach unclipped widgets. This would work if user had explicit scrolling control (e.g. mapped on a stick)
+ // (b) So that we can scroll up/down past clipped items. This adds a small O(N) cost to regular navigation requests
+ // unfortunately, but it is still limited to one window. It may not scale very well for windows with ten of
+ // thousands of item, but at least NavMoveRequest is only set on user interaction, aka maximum once a frame.
+ // We could early out with "if (is_clipped && !g.NavInitRequest) return false;" but when we wouldn't be able
+ // to reach unclipped widgets. This would work if user had explicit scrolling control (e.g. mapped on a stick).
+ // We intentionally don't check if g.NavWindow != NULL because g.NavAnyRequest should only be set when it is non null.
+ // If we crash on a NULL g.NavWindow we need to fix the bug elsewhere.
window->DC.NavLayerActiveMaskNext |= window->DC.NavLayerCurrentMask;
if (g.NavId == id || g.NavAnyRequest)
if (g.NavWindow->RootWindowForNav == window->RootWindowForNav)
if (window == g.NavWindow || ((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened))
NavProcessItem(window, nav_bb_arg ? *nav_bb_arg : bb, id);
+
+ // [DEBUG] Item Picker tool, when enabling the "extended" version we perform the check in ItemAdd()
+#ifdef IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
+ if (id == g.DebugItemPickerBreakId)
+ {
+ IM_DEBUG_BREAK();
+ g.DebugItemPickerBreakId = 0;
+ }
+#endif
}
window->DC.LastItemId = id;
window->DC.LastItemRect = bb;
- window->DC.LastItemStatusFlags = 0;
+ window->DC.LastItemStatusFlags = ImGuiItemStatusFlags_None;
+ g.NextItemData.Flags = ImGuiNextItemDataFlags_None;
+
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+ if (id != 0)
+ IMGUI_TEST_ENGINE_ITEM_ADD(nav_bb_arg ? *nav_bb_arg : bb, id);
+#endif
// Clipping test
const bool is_clipped = IsClippedEx(bb, id, false);
@@ -2671,7 +2976,8 @@ bool ImGui::IsItemHovered(ImGuiHoveredFlags flags)
if (g.ActiveId != 0 && g.ActiveId != window->DC.LastItemId && !g.ActiveIdAllowOverlap && g.ActiveId != window->MoveId)
return false;
- // Test if interactions on this window are blocked by an active popup or modal
+ // Test if interactions on this window are blocked by an active popup or modal.
+ // The ImGuiHoveredFlags_AllowWhenBlockedByPopup flag will be tested here.
if (!IsWindowContentHoverable(window, flags))
return false;
@@ -2679,7 +2985,8 @@ bool ImGui::IsItemHovered(ImGuiHoveredFlags flags)
if ((window->DC.ItemFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled))
return false;
- // Special handling for the 1st item after Begin() which represent the title bar. When the window is collapsed (SkipItems==true) that last item will never be overwritten so we need to detect tht case.
+ // Special handling for the dummy item after Begin() which represent the title bar or tab.
+ // When the window is collapsed (SkipItems==true) that last item will never be overwritten so we need to detect the case.
if (window->DC.LastItemId == window->MoveId && window->WriteAccessed)
return false;
return true;
@@ -2705,6 +3012,17 @@ bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id)
return false;
SetHoveredID(id);
+
+ // [DEBUG] Item Picker tool!
+ // We perform the check here because SetHoveredID() is not frequently called (1~ time a frame), making
+ // the cost of this tool near-zero. We can get slightly better call-stack and support picking non-hovered
+ // items if we perform the test in ItemAdd(), but that would incur a small runtime cost.
+ // #define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX in imconfig.h if you want this check to also be performed in ItemAdd().
+ if (g.DebugItemPickerActive && g.HoveredIdPreviousFrame == id)
+ GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(255, 255, 0, 255));
+ if (g.DebugItemPickerBreakId == id)
+ IM_DEBUG_BREAK();
+
return true;
}
@@ -2719,26 +3037,39 @@ bool ImGui::IsClippedEx(const ImRect& bb, ImGuiID id, bool clip_even_when_logged
return false;
}
-bool ImGui::FocusableItemRegister(ImGuiWindow* window, ImGuiID id, bool tab_stop)
+// Process TAB/Shift+TAB. Be mindful that this function may _clear_ the ActiveID when tabbing out.
+bool ImGui::FocusableItemRegister(ImGuiWindow* window, ImGuiID id)
{
ImGuiContext& g = *GImGui;
+ // Increment counters
const bool is_tab_stop = (window->DC.ItemFlags & (ImGuiItemFlags_NoTabStop | ImGuiItemFlags_Disabled)) == 0;
- window->FocusIdxAllCounter++;
+ window->DC.FocusCounterRegular++;
if (is_tab_stop)
- window->FocusIdxTabCounter++;
+ window->DC.FocusCounterTabStop++;
- // Process keyboard input at this point: TAB/Shift-TAB to tab out of the currently focused item.
- // Note that we can always TAB out of a widget that doesn't allow tabbing in.
- if (tab_stop && (g.ActiveId == id) && window->FocusIdxAllRequestNext == INT_MAX && window->FocusIdxTabRequestNext == INT_MAX && !g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab))
- window->FocusIdxTabRequestNext = window->FocusIdxTabCounter + (g.IO.KeyShift ? (is_tab_stop ? -1 : 0) : +1); // Modulo on index will be applied at the end of frame once we've got the total counter of items.
-
- if (window->FocusIdxAllCounter == window->FocusIdxAllRequestCurrent)
- return true;
- if (is_tab_stop && window->FocusIdxTabCounter == window->FocusIdxTabRequestCurrent)
+ // Process TAB/Shift-TAB to tab *OUT* of the currently focused item.
+ // (Note that we can always TAB out of a widget that doesn't allow tabbing in)
+ if (g.ActiveId == id && g.FocusTabPressed && !IsActiveIdUsingKey(ImGuiKey_Tab) && g.FocusRequestNextWindow == NULL)
{
- g.NavJustTabbedId = id;
- return true;
+ g.FocusRequestNextWindow = window;
+ g.FocusRequestNextCounterTabStop = window->DC.FocusCounterTabStop + (g.IO.KeyShift ? (is_tab_stop ? -1 : 0) : +1); // Modulo on index will be applied at the end of frame once we've got the total counter of items.
+ }
+
+ // Handle focus requests
+ if (g.FocusRequestCurrWindow == window)
+ {
+ if (window->DC.FocusCounterRegular == g.FocusRequestCurrCounterRegular)
+ return true;
+ if (is_tab_stop && window->DC.FocusCounterTabStop == g.FocusRequestCurrCounterTabStop)
+ {
+ g.NavJustTabbedId = id;
+ return true;
+ }
+
+ // If another item is about to be focused, we clear our own active id
+ if (g.ActiveId == id)
+ ClearActiveID();
}
return false;
@@ -2746,21 +3077,8 @@ bool ImGui::FocusableItemRegister(ImGuiWindow* window, ImGuiID id, bool tab_stop
void ImGui::FocusableItemUnregister(ImGuiWindow* window)
{
- window->FocusIdxAllCounter--;
- window->FocusIdxTabCounter--;
-}
-
-ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_x, float default_y)
-{
- ImGuiContext& g = *GImGui;
- ImVec2 content_max;
- if (size.x < 0.0f || size.y < 0.0f)
- content_max = g.CurrentWindow->Pos + GetContentRegionMax();
- if (size.x <= 0.0f)
- size.x = (size.x == 0.0f) ? default_x : ImMax(content_max.x - g.CurrentWindow->DC.CursorPos.x, 4.0f) + size.x;
- if (size.y <= 0.0f)
- size.y = (size.y == 0.0f) ? default_y : ImMax(content_max.y - g.CurrentWindow->DC.CursorPos.y, 4.0f) + size.y;
- return size;
+ window->DC.FocusCounterRegular--;
+ window->DC.FocusCounterTabStop--;
}
float ImGui::CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x)
@@ -2768,15 +3086,16 @@ float ImGui::CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x)
if (wrap_pos_x < 0.0f)
return 0.0f;
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
if (wrap_pos_x == 0.0f)
- wrap_pos_x = GetContentRegionMax().x + window->Pos.x;
+ wrap_pos_x = window->WorkRect.Max.x;
else if (wrap_pos_x > 0.0f)
wrap_pos_x += window->Pos.x - window->Scroll.x; // wrap_pos_x is provided is window local space
return ImMax(wrap_pos_x - pos.x, 1.0f);
}
+// IM_ALLOC() == ImGui::MemAlloc()
void* ImGui::MemAlloc(size_t size)
{
if (ImGuiContext* ctx = GImGui)
@@ -2784,9 +3103,10 @@ void* ImGui::MemAlloc(size_t size)
return GImAllocatorAllocFunc(size, GImAllocatorUserData);
}
+// IM_FREE() == ImGui::MemFree()
void ImGui::MemFree(void* ptr)
{
- if (ptr)
+ if (ptr)
if (ImGuiContext* ctx = GImGui)
ctx->IO.MetricsActiveAllocations--;
return GImAllocatorFreeFunc(ptr, GImAllocatorUserData);
@@ -2794,13 +3114,15 @@ void ImGui::MemFree(void* ptr)
const char* ImGui::GetClipboardText()
{
- return GImGui->IO.GetClipboardTextFn ? GImGui->IO.GetClipboardTextFn(GImGui->IO.ClipboardUserData) : "";
+ ImGuiContext& g = *GImGui;
+ return g.IO.GetClipboardTextFn ? g.IO.GetClipboardTextFn(g.IO.ClipboardUserData) : "";
}
void ImGui::SetClipboardText(const char* text)
{
- if (GImGui->IO.SetClipboardTextFn)
- GImGui->IO.SetClipboardTextFn(GImGui->IO.ClipboardUserData, text);
+ ImGuiContext& g = *GImGui;
+ if (g.IO.SetClipboardTextFn)
+ g.IO.SetClipboardTextFn(g.IO.ClipboardUserData, text);
}
const char* ImGui::GetVersion()
@@ -2808,7 +3130,7 @@ const char* ImGui::GetVersion()
return IMGUI_VERSION;
}
-// Internal state access - if you want to share ImGui state between modules (e.g. DLL) or allocate it yourself
+// Internal state access - if you want to share Dear ImGui state between modules (e.g. DLL) or allocate it yourself
// Note that we still point to some static data and members (such as GFontAtlas), so the state instance you end up using will point to the static data within its module
ImGuiContext* ImGui::GetCurrentContext()
{
@@ -2824,9 +3146,12 @@ void ImGui::SetCurrentContext(ImGuiContext* ctx)
#endif
}
-// Helper function to verify that the type sizes are matching between the calling file's compilation unit and imgui.cpp's compilation unit
-// If the user has inconsistent compilation settings, imgui configuration #define, packing pragma, etc. you may see different structures from what imgui.cpp sees which is highly problematic.
-bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_vert)
+// Helper function to verify ABI compatibility between caller code and compiled version of Dear ImGui.
+// Verify that the type sizes are matching between the calling file's compilation unit and imgui.cpp's compilation unit
+// If the user has inconsistent compilation settings, imgui configuration #define, packing pragma, etc. your user code
+// may see different structures than what imgui.cpp sees, which is problematic.
+// We usually require settings to be in imconfig.h to make sure that they are accessible to all compilation units involved with Dear ImGui.
+bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_vert, size_t sz_idx)
{
bool error = false;
if (strcmp(version, IMGUI_VERSION)!=0) { error = true; IM_ASSERT(strcmp(version,IMGUI_VERSION)==0 && "Mismatched version string!"); }
@@ -2835,10 +3160,11 @@ bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, si
if (sz_vec2 != sizeof(ImVec2)) { error = true; IM_ASSERT(sz_vec2 == sizeof(ImVec2) && "Mismatched struct layout!"); }
if (sz_vec4 != sizeof(ImVec4)) { error = true; IM_ASSERT(sz_vec4 == sizeof(ImVec4) && "Mismatched struct layout!"); }
if (sz_vert != sizeof(ImDrawVert)) { error = true; IM_ASSERT(sz_vert == sizeof(ImDrawVert) && "Mismatched struct layout!"); }
+ if (sz_idx != sizeof(ImDrawIdx)) { error = true; IM_ASSERT(sz_idx == sizeof(ImDrawIdx) && "Mismatched struct layout!"); }
return !error;
}
-void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void(*free_func)(void* ptr, void* user_data), void* user_data)
+void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data)
{
GImAllocatorAllocFunc = alloc_func;
GImAllocatorFreeFunc = free_func;
@@ -2866,13 +3192,13 @@ void ImGui::DestroyContext(ImGuiContext* ctx)
ImGuiIO& ImGui::GetIO()
{
- IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() or ImGui::SetCurrentContext()?");
+ IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
return GImGui->IO;
}
ImGuiStyle& ImGui::GetStyle()
{
- IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() or ImGui::SetCurrentContext()?");
+ IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
return GImGui->Style;
}
@@ -2893,9 +3219,14 @@ int ImGui::GetFrameCount()
return GImGui->FrameCount;
}
-ImDrawList* ImGui::GetOverlayDrawList()
+ImDrawList* ImGui::GetBackgroundDrawList()
{
- return &GImGui->OverlayDrawList;
+ return &GImGui->BackgroundDrawList;
+}
+
+ImDrawList* ImGui::GetForegroundDrawList()
+{
+ return &GImGui->ForegroundDrawList;
}
ImDrawListSharedData* ImGui::GetDrawListSharedData()
@@ -2906,18 +3237,24 @@ ImDrawListSharedData* ImGui::GetDrawListSharedData()
void ImGui::StartMouseMovingWindow(ImGuiWindow* window)
{
// Set ActiveId even if the _NoMove flag is set. Without it, dragging away from a window with _NoMove would activate hover on other windows.
+ // We _also_ call this when clicking in a window empty space when io.ConfigWindowsMoveFromTitleBarOnly is set, but clear g.MovingWindow afterward.
+ // This is because we want ActiveId to be set even when the window is not permitted to move.
ImGuiContext& g = *GImGui;
FocusWindow(window);
SetActiveID(window->MoveId, window);
g.NavDisableHighlight = true;
g.ActiveIdClickOffset = g.IO.MousePos - window->RootWindow->Pos;
- if (!(window->Flags & ImGuiWindowFlags_NoMove) && !(window->RootWindow->Flags & ImGuiWindowFlags_NoMove))
+
+ bool can_move_window = true;
+ if ((window->Flags & ImGuiWindowFlags_NoMove) || (window->RootWindow->Flags & ImGuiWindowFlags_NoMove))
+ can_move_window = false;
+ if (can_move_window)
g.MovingWindow = window;
}
// Handle mouse moving window
// Note: moving window with the navigation keys (Square + d-pad / CTRL+TAB + Arrows) are processed in NavUpdateWindowing()
-void ImGui::UpdateMouseMovingWindow()
+void ImGui::UpdateMouseMovingWindowNewFrame()
{
ImGuiContext& g = *GImGui;
if (g.MovingWindow != NULL)
@@ -2955,6 +3292,58 @@ void ImGui::UpdateMouseMovingWindow()
}
}
+// Initiate moving window when clicking on empty space or title bar.
+// Handle left-click and right-click focus.
+void ImGui::UpdateMouseMovingWindowEndFrame()
+{
+ ImGuiContext& g = *GImGui;
+ if (g.ActiveId != 0 || g.HoveredId != 0)
+ return;
+
+ // Unless we just made a window/popup appear
+ if (g.NavWindow && g.NavWindow->Appearing)
+ return;
+
+ // Click to focus window and start moving (after we're done with all our widgets)
+ if (g.IO.MouseClicked[0])
+ {
+ if (g.HoveredRootWindow != NULL)
+ {
+ StartMouseMovingWindow(g.HoveredWindow);
+ if (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoTitleBar))
+ if (!g.HoveredRootWindow->TitleBarRect().Contains(g.IO.MouseClickedPos[0]))
+ g.MovingWindow = NULL;
+ }
+ else if (g.NavWindow != NULL && GetTopMostPopupModal() == NULL)
+ {
+ // Clicking on void disable focus
+ FocusWindow(NULL);
+ }
+ }
+
+ // With right mouse button we close popups without changing focus based on where the mouse is aimed
+ // Instead, focus will be restored to the window under the bottom-most closed popup.
+ // (The left mouse button path calls FocusWindow on the hovered window, which will lead NewFrame->ClosePopupsOverWindow to trigger)
+ if (g.IO.MouseClicked[1])
+ {
+ // Find the top-most window between HoveredWindow and the top-most Modal Window.
+ // This is where we can trim the popup stack.
+ ImGuiWindow* modal = GetTopMostPopupModal();
+ bool hovered_window_above_modal = false;
+ if (modal == NULL)
+ hovered_window_above_modal = true;
+ for (int i = g.Windows.Size - 1; i >= 0 && hovered_window_above_modal == false; i--)
+ {
+ ImGuiWindow* window = g.Windows[i];
+ if (window == modal)
+ break;
+ if (window == g.HoveredWindow)
+ hovered_window_above_modal = true;
+ }
+ ClosePopupsOverWindow(hovered_window_above_modal ? g.HoveredWindow : modal, true);
+ }
+}
+
static bool IsWindowActiveAndVisible(ImGuiWindow* window)
{
return (window->Active) && (!window->Hidden);
@@ -2966,7 +3355,7 @@ static void ImGui::UpdateMouseInputs()
// Round mouse position to avoid spreading non-rounded position (e.g. UpdateManualResize doesn't support them well)
if (IsMousePosValid(&g.IO.MousePos))
- g.IO.MousePos = ImFloor(g.IO.MousePos);
+ g.IO.MousePos = g.LastValidMousePos = ImFloor(g.IO.MousePos);
// If mouse just appeared or disappeared (usually denoted by -FLT_MAX components) we cancel out movement in MouseDelta
if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MousePosPrev))
@@ -2998,6 +3387,7 @@ static void ImGui::UpdateMouseInputs()
g.IO.MouseClickedTime[i] = g.Time;
}
g.IO.MouseClickedPos[i] = g.IO.MousePos;
+ g.IO.MouseDownWasDoubleClick[i] = g.IO.MouseDoubleClicked[i];
g.IO.MouseDragMaxDistanceAbs[i] = ImVec2(0.0f, 0.0f);
g.IO.MouseDragMaxDistanceSqr[i] = 0.0f;
}
@@ -3009,53 +3399,96 @@ static void ImGui::UpdateMouseInputs()
g.IO.MouseDragMaxDistanceAbs[i].x = ImMax(g.IO.MouseDragMaxDistanceAbs[i].x, delta_from_click_pos.x < 0.0f ? -delta_from_click_pos.x : delta_from_click_pos.x);
g.IO.MouseDragMaxDistanceAbs[i].y = ImMax(g.IO.MouseDragMaxDistanceAbs[i].y, delta_from_click_pos.y < 0.0f ? -delta_from_click_pos.y : delta_from_click_pos.y);
}
+ if (!g.IO.MouseDown[i] && !g.IO.MouseReleased[i])
+ g.IO.MouseDownWasDoubleClick[i] = false;
if (g.IO.MouseClicked[i]) // Clicking any mouse button reactivate mouse hovering which may have been deactivated by gamepad/keyboard navigation
g.NavDisableMouseHover = false;
}
}
+static void StartLockWheelingWindow(ImGuiWindow* window)
+{
+ ImGuiContext& g = *GImGui;
+ if (g.WheelingWindow == window)
+ return;
+ g.WheelingWindow = window;
+ g.WheelingWindowRefMousePos = g.IO.MousePos;
+ g.WheelingWindowTimer = WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER;
+}
+
void ImGui::UpdateMouseWheel()
{
ImGuiContext& g = *GImGui;
- if (!g.HoveredWindow || g.HoveredWindow->Collapsed)
- return;
+
+ // Reset the locked window if we move the mouse or after the timer elapses
+ if (g.WheelingWindow != NULL)
+ {
+ g.WheelingWindowTimer -= g.IO.DeltaTime;
+ if (IsMousePosValid() && ImLengthSqr(g.IO.MousePos - g.WheelingWindowRefMousePos) > g.IO.MouseDragThreshold * g.IO.MouseDragThreshold)
+ g.WheelingWindowTimer = 0.0f;
+ if (g.WheelingWindowTimer <= 0.0f)
+ {
+ g.WheelingWindow = NULL;
+ g.WheelingWindowTimer = 0.0f;
+ }
+ }
+
if (g.IO.MouseWheel == 0.0f && g.IO.MouseWheelH == 0.0f)
return;
- // If a child window has the ImGuiWindowFlags_NoScrollWithMouse flag, we give a chance to scroll its parent (unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set).
- ImGuiWindow* window = g.HoveredWindow;
- ImGuiWindow* scroll_window = window;
- while ((scroll_window->Flags & ImGuiWindowFlags_ChildWindow) && (scroll_window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(scroll_window->Flags & ImGuiWindowFlags_NoScrollbar) && !(scroll_window->Flags & ImGuiWindowFlags_NoMouseInputs) && scroll_window->ParentWindow)
- scroll_window = scroll_window->ParentWindow;
- const bool scroll_allowed = !(scroll_window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(scroll_window->Flags & ImGuiWindowFlags_NoMouseInputs);
+ ImGuiWindow* window = g.WheelingWindow ? g.WheelingWindow : g.HoveredWindow;
+ if (!window || window->Collapsed)
+ return;
- if (g.IO.MouseWheel != 0.0f)
+ // Zoom / Scale window
+ // FIXME-OBSOLETE: This is an old feature, it still works but pretty much nobody is using it and may be best redesigned.
+ if (g.IO.MouseWheel != 0.0f && g.IO.KeyCtrl && g.IO.FontAllowUserScaling)
{
- if (g.IO.KeyCtrl && g.IO.FontAllowUserScaling)
+ StartLockWheelingWindow(window);
+ const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f);
+ const float scale = new_font_scale / window->FontWindowScale;
+ window->FontWindowScale = new_font_scale;
+ if (!(window->Flags & ImGuiWindowFlags_ChildWindow))
{
- // Zoom / Scale window
- const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f);
- const float scale = new_font_scale / window->FontWindowScale;
- window->FontWindowScale = new_font_scale;
-
const ImVec2 offset = window->Size * (1.0f - scale) * (g.IO.MousePos - window->Pos) / window->Size;
- window->Pos += offset;
- window->Size *= scale;
- window->SizeFull *= scale;
+ SetWindowPos(window, window->Pos + offset, 0);
+ window->Size = ImFloor(window->Size * scale);
+ window->SizeFull = ImFloor(window->SizeFull * scale);
}
- else if (!g.IO.KeyCtrl && scroll_allowed)
+ return;
+ }
+
+ // Mouse wheel scrolling
+ // If a child window has the ImGuiWindowFlags_NoScrollWithMouse flag, we give a chance to scroll its parent
+
+ // Vertical Mouse Wheel scrolling
+ const float wheel_y = (g.IO.MouseWheel != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f;
+ if (wheel_y != 0.0f && !g.IO.KeyCtrl)
+ {
+ StartLockWheelingWindow(window);
+ while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.y == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))))
+ window = window->ParentWindow;
+ if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))
{
- // Mouse wheel vertical scrolling
- float scroll_amount = 5 * scroll_window->CalcFontSize();
- scroll_amount = (float)(int)ImMin(scroll_amount, (scroll_window->ContentsRegionRect.GetHeight() + scroll_window->WindowPadding.y * 2.0f) * 0.67f);
- SetWindowScrollY(scroll_window, scroll_window->Scroll.y - g.IO.MouseWheel * scroll_amount);
+ float max_step = window->InnerRect.GetHeight() * 0.67f;
+ float scroll_step = ImFloor(ImMin(5 * window->CalcFontSize(), max_step));
+ SetScrollY(window, window->Scroll.y - wheel_y * scroll_step);
}
}
- if (g.IO.MouseWheelH != 0.0f && scroll_allowed && !g.IO.KeyCtrl)
+
+ // Horizontal Mouse Wheel scrolling, or Vertical Mouse Wheel w/ Shift held
+ const float wheel_x = (g.IO.MouseWheelH != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheelH : (g.IO.MouseWheel != 0.0f && g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f;
+ if (wheel_x != 0.0f && !g.IO.KeyCtrl)
{
- // Mouse wheel horizontal scrolling (for hardware that supports it)
- float scroll_amount = scroll_window->CalcFontSize();
- SetWindowScrollX(scroll_window, scroll_window->Scroll.x - g.IO.MouseWheelH * scroll_amount);
+ StartLockWheelingWindow(window);
+ while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.x == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))))
+ window = window->ParentWindow;
+ if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))
+ {
+ float max_step = window->InnerRect.GetWidth() * 0.67f;
+ float scroll_step = ImFloor(ImMin(2 * window->CalcFontSize(), max_step));
+ SetScrollX(window, window->Scroll.x - wheel_x * scroll_step);
+ }
}
}
@@ -3071,7 +3504,7 @@ void ImGui::UpdateHoveredWindowAndCaptureFlags()
FindHoveredWindow();
// Modal windows prevents cursor from hovering behind them.
- ImGuiWindow* modal_window = GetFrontMostPopupModal();
+ ImGuiWindow* modal_window = GetTopMostPopupModal();
if (modal_window)
if (g.HoveredRootWindow && !IsWindowChildOf(g.HoveredRootWindow, modal_window))
g.HoveredRootWindow = g.HoveredWindow = NULL;
@@ -3100,13 +3533,13 @@ void ImGui::UpdateHoveredWindowAndCaptureFlags()
if (!mouse_avail_to_imgui && !mouse_dragging_extern_payload)
g.HoveredWindow = g.HoveredRootWindow = NULL;
- // Update io.WantCaptureMouse for the user application (true = dispatch mouse info to imgui, false = dispatch mouse info to imgui + app)
+ // Update io.WantCaptureMouse for the user application (true = dispatch mouse info to imgui, false = dispatch mouse info to Dear ImGui + app)
if (g.WantCaptureMouseNextFrame != -1)
g.IO.WantCaptureMouse = (g.WantCaptureMouseNextFrame != 0);
else
g.IO.WantCaptureMouse = (mouse_avail_to_imgui && (g.HoveredWindow != NULL || mouse_any_down)) || (!g.OpenPopupStack.empty());
- // Update io.WantCaptureKeyboard for the user application (true = dispatch keyboard info to imgui, false = dispatch keyboard info to imgui + app)
+ // Update io.WantCaptureKeyboard for the user application (true = dispatch keyboard info to imgui, false = dispatch keyboard info to Dear ImGui + app)
if (g.WantCaptureKeyboardNextFrame != -1)
g.IO.WantCaptureKeyboard = (g.WantCaptureKeyboardNextFrame != 0);
else
@@ -3118,25 +3551,23 @@ void ImGui::UpdateHoveredWindowAndCaptureFlags()
g.IO.WantTextInput = (g.WantTextInputNextFrame != -1) ? (g.WantTextInputNextFrame != 0) : false;
}
-void ImGui::NewFrame()
+static void NewFrameSanityChecks()
{
- IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() or ImGui::SetCurrentContext()?");
ImGuiContext& g = *GImGui;
-#ifdef IMGUI_ENABLE_TEST_ENGINE_HOOKS
- ImGuiTestEngineHook_PreNewFrame();
-#endif
-
// Check user data
// (We pass an error message in the assert expression to make it visible to programmers who are not using a debugger, as most assert handlers display their argument)
IM_ASSERT(g.Initialized);
- IM_ASSERT(g.IO.DeltaTime >= 0.0f && "Need a positive DeltaTime (zero is tolerated but will cause some timing issues)");
- IM_ASSERT(g.IO.DisplaySize.x >= 0.0f && g.IO.DisplaySize.y >= 0.0f && "Invalid DisplaySize value");
+ IM_ASSERT((g.IO.DeltaTime > 0.0f || g.FrameCount == 0) && "Need a positive DeltaTime!");
+ IM_ASSERT((g.FrameCount == 0 || g.FrameCountEnded == g.FrameCount) && "Forgot to call Render() or EndFrame() at the end of the previous frame?");
+ IM_ASSERT(g.IO.DisplaySize.x >= 0.0f && g.IO.DisplaySize.y >= 0.0f && "Invalid DisplaySize value!");
IM_ASSERT(g.IO.Fonts->Fonts.Size > 0 && "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8() ?");
IM_ASSERT(g.IO.Fonts->Fonts[0]->IsLoaded() && "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8() ?");
- IM_ASSERT(g.Style.CurveTessellationTol > 0.0f && "Invalid style setting");
- IM_ASSERT(g.Style.Alpha >= 0.0f && g.Style.Alpha <= 1.0f && "Invalid style setting. Alpha cannot be negative (allows us to avoid a few clamps in color computations)");
- IM_ASSERT((g.FrameCount == 0 || g.FrameCountEnded == g.FrameCount) && "Forgot to call Render() or EndFrame() at the end of the previous frame?");
+ IM_ASSERT(g.Style.CurveTessellationTol > 0.0f && "Invalid style setting!");
+ IM_ASSERT(g.Style.CircleSegmentMaxError > 0.0f && "Invalid style setting!");
+ IM_ASSERT(g.Style.Alpha >= 0.0f && g.Style.Alpha <= 1.0f && "Invalid style setting. Alpha cannot be negative (allows us to avoid a few clamps in color computations)!");
+ IM_ASSERT(g.Style.WindowMinSize.x >= 1.0f && g.Style.WindowMinSize.y >= 1.0f && "Invalid style setting.");
+ IM_ASSERT(g.Style.WindowMenuButtonPosition == ImGuiDir_None || g.Style.WindowMenuButtonPosition == ImGuiDir_Left || g.Style.WindowMenuButtonPosition == ImGuiDir_Right);
for (int n = 0; n < ImGuiKey_COUNT; n++)
IM_ASSERT(g.IO.KeyMap[n] >= -1 && g.IO.KeyMap[n] < IM_ARRAYSIZE(g.IO.KeysDown) && "io.KeyMap[] contains an out of bound value (need to be 0..512, or -1 for unmapped key)");
@@ -3144,9 +3575,22 @@ void ImGui::NewFrame()
if (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard)
IM_ASSERT(g.IO.KeyMap[ImGuiKey_Space] != -1 && "ImGuiKey_Space is not mapped, required for keyboard navigation.");
- // Perform simple check: the beta io.ConfigResizeWindowsFromEdges option requires back-end to honor mouse cursor changes and set the ImGuiBackendFlags_HasMouseCursors flag accordingly.
- if (g.IO.ConfigResizeWindowsFromEdges && !(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseCursors))
- g.IO.ConfigResizeWindowsFromEdges = false;
+ // Perform simple check: the beta io.ConfigWindowsResizeFromEdges option requires back-end to honor mouse cursor changes and set the ImGuiBackendFlags_HasMouseCursors flag accordingly.
+ if (g.IO.ConfigWindowsResizeFromEdges && !(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseCursors))
+ g.IO.ConfigWindowsResizeFromEdges = false;
+}
+
+void ImGui::NewFrame()
+{
+ IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
+ ImGuiContext& g = *GImGui;
+
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+ ImGuiTestEngineHook_PreNewFrame(&g);
+#endif
+
+ // Check and assert for various common IO and Configuration mistakes
+ NewFrameSanityChecks();
// Load settings on first frame (if not explicitly loaded manually before)
if (!g.SettingsLoaded)
@@ -3172,24 +3616,35 @@ void ImGui::NewFrame()
}
g.Time += g.IO.DeltaTime;
- g.FrameScopeActive = true;
+ g.WithinFrameScope = true;
g.FrameCount += 1;
g.TooltipOverrideCount = 0;
g.WindowsActiveCount = 0;
- // Setup current font and draw list
+ // Setup current font and draw list shared data
g.IO.Fonts->Locked = true;
SetCurrentFont(GetDefaultFont());
IM_ASSERT(g.Font->IsLoaded());
g.DrawListSharedData.ClipRectFullscreen = ImVec4(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y);
g.DrawListSharedData.CurveTessellationTol = g.Style.CurveTessellationTol;
+ g.DrawListSharedData.SetCircleSegmentMaxError(g.Style.CircleSegmentMaxError);
+ g.DrawListSharedData.InitialFlags = ImDrawListFlags_None;
+ if (g.Style.AntiAliasedLines)
+ g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedLines;
+ if (g.Style.AntiAliasedFill)
+ g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedFill;
+ if (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset)
+ g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AllowVtxOffset;
- g.OverlayDrawList.Clear();
- g.OverlayDrawList.PushTextureID(g.IO.Fonts->TexID);
- g.OverlayDrawList.PushClipRectFullScreen();
- g.OverlayDrawList.Flags = (g.Style.AntiAliasedLines ? ImDrawListFlags_AntiAliasedLines : 0) | (g.Style.AntiAliasedFill ? ImDrawListFlags_AntiAliasedFill : 0);
+ g.BackgroundDrawList.Clear();
+ g.BackgroundDrawList.PushTextureID(g.IO.Fonts->TexID);
+ g.BackgroundDrawList.PushClipRectFullScreen();
- // Mark rendering data as invalid to prevent user who may have a handle on it to use it
+ g.ForegroundDrawList.Clear();
+ g.ForegroundDrawList.PushTextureID(g.IO.Fonts->TexID);
+ g.ForegroundDrawList.PushClipRectFullScreen();
+
+ // Mark rendering data as invalid to prevent user who may have a handle on it to use it.
g.DrawData.Clear();
// Drag and drop keep the source ID alive so even if the source disappear our state is consistent
@@ -3215,12 +3670,18 @@ void ImGui::NewFrame()
g.LastActiveIdTimer += g.IO.DeltaTime;
g.ActiveIdPreviousFrame = g.ActiveId;
g.ActiveIdPreviousFrameWindow = g.ActiveIdWindow;
- g.ActiveIdPreviousFrameHasBeenEdited = g.ActiveIdHasBeenEdited;
+ g.ActiveIdPreviousFrameHasBeenEditedBefore = g.ActiveIdHasBeenEditedBefore;
g.ActiveIdIsAlive = 0;
+ g.ActiveIdHasBeenEditedThisFrame = false;
g.ActiveIdPreviousFrameIsAlive = false;
g.ActiveIdIsJustActivated = false;
- if (g.ScalarAsInputTextId && g.ActiveId != g.ScalarAsInputTextId)
- g.ScalarAsInputTextId = 0;
+ if (g.TempInputTextId != 0 && g.ActiveId != g.TempInputTextId)
+ g.TempInputTextId = 0;
+ if (g.ActiveId == 0)
+ {
+ g.ActiveIdUsingNavDirMask = g.ActiveIdUsingNavInputMask = 0;
+ g.ActiveIdUsingKeyInputMask = 0;
+ }
// Drag and drop
g.DragDropAcceptIdPrev = g.DragDropAcceptIdCurr;
@@ -3245,12 +3706,15 @@ void ImGui::NewFrame()
g.FramerateSecPerFrameIdx = (g.FramerateSecPerFrameIdx + 1) % IM_ARRAYSIZE(g.FramerateSecPerFrame);
g.IO.Framerate = (g.FramerateSecPerFrameAccum > 0.0f) ? (1.0f / (g.FramerateSecPerFrameAccum / (float)IM_ARRAYSIZE(g.FramerateSecPerFrame))) : FLT_MAX;
- // Handle user moving window with mouse (at the beginning of the frame to avoid input lag or sheering)
- UpdateMouseMovingWindow();
+ // Find hovered window
+ // (needs to be before UpdateMouseMovingWindowNewFrame so we fill g.HoveredWindowUnderMovingWindow on the mouse release frame)
UpdateHoveredWindowAndCaptureFlags();
+ // Handle user moving window with mouse (at the beginning of the frame to avoid input lag or sheering)
+ UpdateMouseMovingWindowNewFrame();
+
// Background darkening/whitening
- if (GetFrontMostPopupModal() != NULL || (g.NavWindowingTarget != NULL && g.NavWindowingHighlightAlpha > 0.0f))
+ if (GetTopMostPopupModal() != NULL || (g.NavWindowingTarget != NULL && g.NavWindowingHighlightAlpha > 0.0f))
g.DimBgRatio = ImMin(g.DimBgRatio + g.IO.DeltaTime * 6.0f, 1.0f);
else
g.DimBgRatio = ImMax(g.DimBgRatio - g.IO.DeltaTime * 10.0f, 0.0f);
@@ -3263,58 +3727,134 @@ void ImGui::NewFrame()
UpdateMouseWheel();
// Pressing TAB activate widget focus
- if (g.ActiveId == 0 && g.NavWindow != NULL && g.NavWindow->Active && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab, false))
+ g.FocusTabPressed = (g.NavWindow && g.NavWindow->Active && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab));
+ if (g.ActiveId == 0 && g.FocusTabPressed)
{
+ // Note that SetKeyboardFocusHere() sets the Next fields mid-frame. To be consistent we also
+ // manipulate the Next fields even, even though they will be turned into Curr fields by the code below.
+ g.FocusRequestNextWindow = g.NavWindow;
+ g.FocusRequestNextCounterRegular = INT_MAX;
if (g.NavId != 0 && g.NavIdTabCounter != INT_MAX)
- g.NavWindow->FocusIdxTabRequestNext = g.NavIdTabCounter + 1 + (g.IO.KeyShift ? -1 : 1);
+ g.FocusRequestNextCounterTabStop = g.NavIdTabCounter + 1 + (g.IO.KeyShift ? -1 : 1);
else
- g.NavWindow->FocusIdxTabRequestNext = g.IO.KeyShift ? -1 : 0;
+ g.FocusRequestNextCounterTabStop = g.IO.KeyShift ? -1 : 0;
}
+
+ // Turn queued focus request into current one
+ g.FocusRequestCurrWindow = NULL;
+ g.FocusRequestCurrCounterRegular = g.FocusRequestCurrCounterTabStop = INT_MAX;
+ if (g.FocusRequestNextWindow != NULL)
+ {
+ ImGuiWindow* window = g.FocusRequestNextWindow;
+ g.FocusRequestCurrWindow = window;
+ if (g.FocusRequestNextCounterRegular != INT_MAX && window->DC.FocusCounterRegular != -1)
+ g.FocusRequestCurrCounterRegular = ImModPositive(g.FocusRequestNextCounterRegular, window->DC.FocusCounterRegular + 1);
+ if (g.FocusRequestNextCounterTabStop != INT_MAX && window->DC.FocusCounterTabStop != -1)
+ g.FocusRequestCurrCounterTabStop = ImModPositive(g.FocusRequestNextCounterTabStop, window->DC.FocusCounterTabStop + 1);
+ g.FocusRequestNextWindow = NULL;
+ g.FocusRequestNextCounterRegular = g.FocusRequestNextCounterTabStop = INT_MAX;
+ }
+
g.NavIdTabCounter = INT_MAX;
- // Mark all windows as not visible
+ // Mark all windows as not visible and compact unused memory.
IM_ASSERT(g.WindowsFocusOrder.Size == g.Windows.Size);
+ const float memory_compact_start_time = (g.IO.ConfigWindowsMemoryCompactTimer >= 0.0f) ? (float)g.Time - g.IO.ConfigWindowsMemoryCompactTimer : FLT_MAX;
for (int i = 0; i != g.Windows.Size; i++)
{
ImGuiWindow* window = g.Windows[i];
window->WasActive = window->Active;
+ window->BeginCount = 0;
window->Active = false;
window->WriteAccessed = false;
+
+ // Garbage collect transient buffers of recently unused windows
+ if (!window->WasActive && !window->MemoryCompacted && window->LastTimeActive < memory_compact_start_time)
+ GcCompactTransientWindowBuffers(window);
}
// Closing the focused window restore focus to the first active root window in descending z-order
if (g.NavWindow && !g.NavWindow->WasActive)
- FocusPreviousWindowIgnoringOne(NULL);
+ FocusTopMostWindowUnderOne(NULL, NULL);
// No window should be open at the beginning of the frame.
// But in order to allow the user to call NewFrame() multiple times without calling Render(), we are doing an explicit clear.
g.CurrentWindowStack.resize(0);
- g.CurrentPopupStack.resize(0);
- ClosePopupsOverWindow(g.NavWindow);
+ g.BeginPopupStack.resize(0);
+ ClosePopupsOverWindow(g.NavWindow, false);
- // Create implicit window - we will only render it if the user has added something to it.
+ // [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack.
+ UpdateDebugToolItemPicker();
+
+ // Create implicit/fallback window - which we will only render it if the user has added something to it.
// We don't use "Debug" to avoid colliding with user trying to create a "Debug" window with custom flags.
+ // This fallback is particularly important as it avoid ImGui:: calls from crashing.
+ g.WithinFrameScopeWithImplicitWindow = true;
SetNextWindowSize(ImVec2(400,400), ImGuiCond_FirstUseEver);
Begin("Debug##Default");
+ IM_ASSERT(g.CurrentWindow->IsFallbackWindow == true);
-#ifdef IMGUI_ENABLE_TEST_ENGINE_HOOKS
- ImGuiTestEngineHook_PostNewFrame();
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+ ImGuiTestEngineHook_PostNewFrame(&g);
#endif
}
+// [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack.
+void ImGui::UpdateDebugToolItemPicker()
+{
+ ImGuiContext& g = *GImGui;
+ g.DebugItemPickerBreakId = 0;
+ if (g.DebugItemPickerActive)
+ {
+ const ImGuiID hovered_id = g.HoveredIdPreviousFrame;
+ ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
+ if (ImGui::IsKeyPressedMap(ImGuiKey_Escape))
+ g.DebugItemPickerActive = false;
+ if (ImGui::IsMouseClicked(0) && hovered_id)
+ {
+ g.DebugItemPickerBreakId = hovered_id;
+ g.DebugItemPickerActive = false;
+ }
+ ImGui::SetNextWindowBgAlpha(0.60f);
+ ImGui::BeginTooltip();
+ ImGui::Text("HoveredId: 0x%08X", hovered_id);
+ ImGui::Text("Press ESC to abort picking.");
+ ImGui::TextColored(GetStyleColorVec4(hovered_id ? ImGuiCol_Text : ImGuiCol_TextDisabled), "Click to break in debugger!");
+ ImGui::EndTooltip();
+ }
+}
+
void ImGui::Initialize(ImGuiContext* context)
{
ImGuiContext& g = *context;
IM_ASSERT(!g.Initialized && !g.SettingsLoaded);
// Add .ini handle for ImGuiWindow type
- ImGuiSettingsHandler ini_handler;
- ini_handler.TypeName = "Window";
- ini_handler.TypeHash = ImHash("Window", 0, 0);
- ini_handler.ReadOpenFn = SettingsHandlerWindow_ReadOpen;
- ini_handler.ReadLineFn = SettingsHandlerWindow_ReadLine;
- ini_handler.WriteAllFn = SettingsHandlerWindow_WriteAll;
- g.SettingsHandlers.push_front(ini_handler);
+ {
+ ImGuiSettingsHandler ini_handler;
+ ini_handler.TypeName = "Window";
+ ini_handler.TypeHash = ImHashStr("Window");
+ ini_handler.ReadOpenFn = WindowSettingsHandler_ReadOpen;
+ ini_handler.ReadLineFn = WindowSettingsHandler_ReadLine;
+ ini_handler.WriteAllFn = WindowSettingsHandler_WriteAll;
+ g.SettingsHandlers.push_back(ini_handler);
+ }
+
+#ifdef IMGUI_HAS_TABLE
+ // Add .ini handle for ImGuiTable type
+ {
+ ImGuiSettingsHandler ini_handler;
+ ini_handler.TypeName = "Table";
+ ini_handler.TypeHash = ImHashStr("Table");
+ ini_handler.ReadOpenFn = TableSettingsHandler_ReadOpen;
+ ini_handler.ReadLineFn = TableSettingsHandler_ReadLine;
+ ini_handler.WriteAllFn = TableSettingsHandler_WriteAll;
+ g.SettingsHandlers.push_back(ini_handler);
+ }
+#endif // #ifdef IMGUI_HAS_TABLE
+
+#ifdef IMGUI_HAS_DOCK
+#endif // #ifdef IMGUI_HAS_DOCK
g.Initialized = true;
}
@@ -3331,7 +3871,7 @@ void ImGui::Shutdown(ImGuiContext* context)
}
g.IO.Fonts = NULL;
- // Cleanup of other data are conditional on actually having initialized ImGui.
+ // Cleanup of other data are conditional on actually having initialized Dear ImGui.
if (!g.Initialized)
return;
@@ -3349,38 +3889,42 @@ void ImGui::Shutdown(ImGuiContext* context)
IM_DELETE(g.Windows[i]);
g.Windows.clear();
g.WindowsFocusOrder.clear();
- g.WindowsSortBuffer.clear();
+ g.WindowsTempSortBuffer.clear();
g.CurrentWindow = NULL;
g.CurrentWindowStack.clear();
g.WindowsById.Clear();
g.NavWindow = NULL;
- g.HoveredWindow = NULL;
- g.HoveredRootWindow = NULL;
+ g.HoveredWindow = g.HoveredRootWindow = NULL;
g.ActiveIdWindow = g.ActiveIdPreviousFrameWindow = NULL;
g.MovingWindow = NULL;
g.ColorModifiers.clear();
g.StyleModifiers.clear();
g.FontStack.clear();
g.OpenPopupStack.clear();
- g.CurrentPopupStack.clear();
+ g.BeginPopupStack.clear();
g.DrawDataBuilder.ClearFreeMemory();
- g.OverlayDrawList.ClearFreeMemory();
- g.PrivateClipboard.clear();
- g.InputTextState.TextW.clear();
- g.InputTextState.InitialText.clear();
- g.InputTextState.TempBuffer.clear();
+ g.BackgroundDrawList.ClearFreeMemory();
+ g.ForegroundDrawList.ClearFreeMemory();
+
+ g.TabBars.Clear();
+ g.CurrentTabBarStack.clear();
+ g.ShrinkWidthBuffer.clear();
+
+ g.PrivateClipboard.clear();
+ g.InputTextState.ClearFreeMemory();
- for (int i = 0; i < g.SettingsWindows.Size; i++)
- IM_DELETE(g.SettingsWindows[i].Name);
g.SettingsWindows.clear();
g.SettingsHandlers.clear();
- if (g.LogFile && g.LogFile != stdout)
+ if (g.LogFile)
{
- fclose(g.LogFile);
+#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
+ if (g.LogFile != stdout)
+#endif
+ ImFileClose(g.LogFile);
g.LogFile = NULL;
}
- g.LogClipboard.clear();
+ g.LogBuffer.clear();
g.Initialized = false;
}
@@ -3404,7 +3948,7 @@ static void AddWindowToSortBuffer(ImVector* out_sorted_windows, Im
{
int count = window->DC.ChildWindows.Size;
if (count > 1)
- ImQsort(window->DC.ChildWindows.begin(), (size_t)count, sizeof(ImGuiWindow*), ChildWindowComparer);
+ ImQsort(window->DC.ChildWindows.Data, (size_t)count, sizeof(ImGuiWindow*), ChildWindowComparer);
for (int i = 0; i < count; i++)
{
ImGuiWindow* child = window->DC.ChildWindows[i];
@@ -3428,19 +3972,28 @@ static void AddDrawListToDrawData(ImVector* out_list, ImDrawList* d
return;
}
- // Draw list sanity check. Detect mismatch between PrimReserve() calls and incrementing _VtxCurrentIdx, _VtxWritePtr etc. May trigger for you if you are using PrimXXX functions incorrectly.
+ // Draw list sanity check. Detect mismatch between PrimReserve() calls and incrementing _VtxCurrentIdx, _VtxWritePtr etc.
+ // May trigger for you if you are using PrimXXX functions incorrectly.
IM_ASSERT(draw_list->VtxBuffer.Size == 0 || draw_list->_VtxWritePtr == draw_list->VtxBuffer.Data + draw_list->VtxBuffer.Size);
IM_ASSERT(draw_list->IdxBuffer.Size == 0 || draw_list->_IdxWritePtr == draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size);
- IM_ASSERT((int)draw_list->_VtxCurrentIdx == draw_list->VtxBuffer.Size);
+ if (!(draw_list->Flags & ImDrawListFlags_AllowVtxOffset))
+ IM_ASSERT((int)draw_list->_VtxCurrentIdx == draw_list->VtxBuffer.Size);
// Check that draw_list doesn't use more vertices than indexable (default ImDrawIdx = unsigned short = 2 bytes = 64K vertices per ImDrawList = per window)
// If this assert triggers because you are drawing lots of stuff manually:
- // A) Make sure you are coarse clipping, because ImDrawList let all your vertices pass. You can use the Metrics window to inspect draw list contents.
- // B) If you need/want meshes with more than 64K vertices, uncomment the '#define ImDrawIdx unsigned int' line in imconfig.h to set the index size to 4 bytes.
- // You'll need to handle the 4-bytes indices to your renderer. For example, the OpenGL example code detect index size at compile-time by doing:
- // glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer_offset);
- // Your own engine or render API may use different parameters or function calls to specify index sizes. 2 and 4 bytes indices are generally supported by most API.
- // C) If for some reason you cannot use 4 bytes indices or don't want to, a workaround is to call BeginChild()/EndChild() before reaching the 64K limit to split your draw commands in multiple draw lists.
+ // - First, make sure you are coarse clipping yourself and not trying to draw many things outside visible bounds.
+ // Be mindful that the ImDrawList API doesn't filter vertices. Use the Metrics window to inspect draw list contents.
+ // - If you want large meshes with more than 64K vertices, you can either:
+ // (A) Handle the ImDrawCmd::VtxOffset value in your renderer back-end, and set 'io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset'.
+ // Most example back-ends already support this from 1.71. Pre-1.71 back-ends won't.
+ // Some graphics API such as GL ES 1/2 don't have a way to offset the starting vertex so it is not supported for them.
+ // (B) Or handle 32-bit indices in your renderer back-end, and uncomment '#define ImDrawIdx unsigned int' line in imconfig.h.
+ // Most example back-ends already support this. For example, the OpenGL example code detect index size at compile-time:
+ // glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer_offset);
+ // Your own engine or render API may use different parameters or function calls to specify index sizes.
+ // 2 and 4 bytes indices are generally supported by most graphics API.
+ // - If for some reason neither of those solutions works for you, a workaround is to call BeginChild()/EndChild() before reaching
+ // the 64K limit to split your draw commands in multiple draw lists.
if (sizeof(ImDrawIdx) == 2)
IM_ASSERT(draw_list->_VtxCurrentIdx < (1 << 16) && "Too many vertices in ImDrawList using 16-bit indices. Read comment above");
@@ -3460,13 +4013,12 @@ static void AddWindowToDrawData(ImVector* out_render_list, ImGuiWin
}
}
-static void AddWindowToDrawDataSelectLayer(ImGuiWindow* window)
+// Layer is locked for the root window, however child windows may use a different viewport (e.g. extruding menu)
+static void AddRootWindowToDrawData(ImGuiWindow* window)
{
ImGuiContext& g = *GImGui;
- if (window->Flags & ImGuiWindowFlags_Tooltip)
- AddWindowToDrawData(&g.DrawDataBuilder.Layers[1], window);
- else
- AddWindowToDrawData(&g.DrawDataBuilder.Layers[0], window);
+ int layer = (window->Flags & ImGuiWindowFlags_Tooltip) ? 1 : 0;
+ AddWindowToDrawData(&g.DrawDataBuilder.Layers[layer], window);
}
void ImDrawDataBuilder::FlattenIntoSingleLayer()
@@ -3496,6 +4048,7 @@ static void SetupDrawData(ImVector* draw_lists, ImDrawData* draw_da
draw_data->TotalVtxCount = draw_data->TotalIdxCount = 0;
draw_data->DisplayPos = ImVec2(0.0f, 0.0f);
draw_data->DisplaySize = io.DisplaySize;
+ draw_data->FramebufferScale = io.DisplayFramebufferScale;
for (int n = 0; n < draw_lists->Size; n++)
{
draw_data->TotalVtxCount += draw_lists->Data[n]->VtxBuffer.Size;
@@ -3525,24 +4078,26 @@ void ImGui::EndFrame()
IM_ASSERT(g.Initialized);
if (g.FrameCountEnded == g.FrameCount) // Don't process EndFrame() multiple times.
return;
- IM_ASSERT(g.FrameScopeActive && "Forgot to call ImGui::NewFrame()");
+ IM_ASSERT(g.WithinFrameScope && "Forgot to call ImGui::NewFrame()?");
// Notify OS when our Input Method Editor cursor has moved (e.g. CJK inputs using Microsoft IME)
- if (g.IO.ImeSetInputScreenPosFn && ImLengthSqr(g.PlatformImeLastPos - g.PlatformImePos) > 0.0001f)
+ if (g.IO.ImeSetInputScreenPosFn && (g.PlatformImeLastPos.x == FLT_MAX || ImLengthSqr(g.PlatformImeLastPos - g.PlatformImePos) > 0.0001f))
{
g.IO.ImeSetInputScreenPosFn((int)g.PlatformImePos.x, (int)g.PlatformImePos.y);
g.PlatformImeLastPos = g.PlatformImePos;
}
- // Hide implicit "Debug" window if it hasn't been used
- IM_ASSERT(g.CurrentWindowStack.Size == 1); // Mismatched Begin()/End() calls, did you forget to call end on g.CurrentWindow->Name?
+ ErrorCheckEndFrame();
+
+ // Hide implicit/fallback "Debug" window if it hasn't been used
+ g.WithinFrameScopeWithImplicitWindow = false;
if (g.CurrentWindow && !g.CurrentWindow->WriteAccessed)
g.CurrentWindow->Active = false;
End();
- // Show CTRL+TAB list
- if (g.NavWindowingTarget)
- NavUpdateWindowingList();
+ // Show CTRL+TAB list window
+ if (g.NavWindowingTarget != NULL)
+ NavUpdateWindowingOverlay();
// Drag and Drop: Elapse payload (if delivered, or if source stops being submitted)
if (g.DragDropActive)
@@ -3561,57 +4116,28 @@ void ImGui::EndFrame()
g.DragDropWithinSourceOrTarget = false;
}
- // Initiate moving window
- if (g.ActiveId == 0 && g.HoveredId == 0)
- {
- if (!g.NavWindow || !g.NavWindow->Appearing) // Unless we just made a window/popup appear
- {
- // Click to focus window and start moving (after we're done with all our widgets)
- if (g.IO.MouseClicked[0])
- {
- if (g.HoveredRootWindow != NULL)
- StartMouseMovingWindow(g.HoveredWindow);
- else if (g.NavWindow != NULL && GetFrontMostPopupModal() == NULL)
- FocusWindow(NULL); // Clicking on void disable focus
- }
+ // End frame
+ g.WithinFrameScope = false;
+ g.FrameCountEnded = g.FrameCount;
- // With right mouse button we close popups without changing focus
- // (The left mouse button path calls FocusWindow which will lead NewFrame->ClosePopupsOverWindow to trigger)
- if (g.IO.MouseClicked[1])
- {
- // Find the top-most window between HoveredWindow and the front most Modal Window.
- // This is where we can trim the popup stack.
- ImGuiWindow* modal = GetFrontMostPopupModal();
- bool hovered_window_above_modal = false;
- if (modal == NULL)
- hovered_window_above_modal = true;
- for (int i = g.Windows.Size - 1; i >= 0 && hovered_window_above_modal == false; i--)
- {
- ImGuiWindow* window = g.Windows[i];
- if (window == modal)
- break;
- if (window == g.HoveredWindow)
- hovered_window_above_modal = true;
- }
- ClosePopupsOverWindow(hovered_window_above_modal ? g.HoveredWindow : modal);
- }
- }
- }
+ // Initiate moving window + handle left-click and right-click focus
+ UpdateMouseMovingWindowEndFrame();
// Sort the window list so that all child windows are after their parent
// We cannot do that on FocusWindow() because childs may not exist yet
- g.WindowsSortBuffer.resize(0);
- g.WindowsSortBuffer.reserve(g.Windows.Size);
+ g.WindowsTempSortBuffer.resize(0);
+ g.WindowsTempSortBuffer.reserve(g.Windows.Size);
for (int i = 0; i != g.Windows.Size; i++)
{
ImGuiWindow* window = g.Windows[i];
if (window->Active && (window->Flags & ImGuiWindowFlags_ChildWindow)) // if a child is active its parent will add it
continue;
- AddWindowToSortBuffer(&g.WindowsSortBuffer, window);
+ AddWindowToSortBuffer(&g.WindowsTempSortBuffer, window);
}
- IM_ASSERT(g.Windows.Size == g.WindowsSortBuffer.Size); // we done something wrong
- g.Windows.swap(g.WindowsSortBuffer);
+ // This usually assert if there is a mismatch between the ImGuiWindowFlags_ChildWindow / ParentWindow values and DC.ChildWindows[] in parents, aka we've done something wrong.
+ IM_ASSERT(g.Windows.Size == g.WindowsTempSortBuffer.Size);
+ g.Windows.swap(g.WindowsTempSortBuffer);
g.IO.MetricsActiveWindows = g.WindowsActiveCount;
// Unlock font atlas
@@ -3619,11 +4145,8 @@ void ImGui::EndFrame()
// Clear Input data for next frame
g.IO.MouseWheel = g.IO.MouseWheelH = 0.0f;
- memset(g.IO.InputCharacters, 0, sizeof(g.IO.InputCharacters));
+ g.IO.InputQueueCharacters.resize(0);
memset(g.IO.NavInputs, 0, sizeof(g.IO.NavInputs));
-
- g.FrameScopeActive = false;
- g.FrameCountEnded = g.FrameCount;
}
void ImGui::Render()
@@ -3632,39 +4155,44 @@ void ImGui::Render()
IM_ASSERT(g.Initialized);
if (g.FrameCountEnded != g.FrameCount)
- ImGui::EndFrame();
+ EndFrame();
g.FrameCountRendered = g.FrameCount;
-
- // Gather ImDrawList to render (for each active window)
- g.IO.MetricsRenderVertices = g.IO.MetricsRenderIndices = g.IO.MetricsRenderWindows = 0;
+ g.IO.MetricsRenderWindows = 0;
g.DrawDataBuilder.Clear();
- ImGuiWindow* windows_to_render_front_most[2];
- windows_to_render_front_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindow : NULL;
- windows_to_render_front_most[1] = g.NavWindowingTarget ? g.NavWindowingList : NULL;
+
+ // Add background ImDrawList
+ if (!g.BackgroundDrawList.VtxBuffer.empty())
+ AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.BackgroundDrawList);
+
+ // Add ImDrawList to render
+ ImGuiWindow* windows_to_render_top_most[2];
+ windows_to_render_top_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindow : NULL;
+ windows_to_render_top_most[1] = (g.NavWindowingTarget ? g.NavWindowingList : NULL);
for (int n = 0; n != g.Windows.Size; n++)
{
ImGuiWindow* window = g.Windows[n];
- if (IsWindowActiveAndVisible(window) && (window->Flags & ImGuiWindowFlags_ChildWindow) == 0 && window != windows_to_render_front_most[0] && window != windows_to_render_front_most[1])
- AddWindowToDrawDataSelectLayer(window);
+ if (IsWindowActiveAndVisible(window) && (window->Flags & ImGuiWindowFlags_ChildWindow) == 0 && window != windows_to_render_top_most[0] && window != windows_to_render_top_most[1])
+ AddRootWindowToDrawData(window);
}
- for (int n = 0; n < IM_ARRAYSIZE(windows_to_render_front_most); n++)
- if (windows_to_render_front_most[n] && IsWindowActiveAndVisible(windows_to_render_front_most[n])) // NavWindowingTarget is always temporarily displayed as the front-most window
- AddWindowToDrawDataSelectLayer(windows_to_render_front_most[n]);
+ for (int n = 0; n < IM_ARRAYSIZE(windows_to_render_top_most); n++)
+ if (windows_to_render_top_most[n] && IsWindowActiveAndVisible(windows_to_render_top_most[n])) // NavWindowingTarget is always temporarily displayed as the top-most window
+ AddRootWindowToDrawData(windows_to_render_top_most[n]);
g.DrawDataBuilder.FlattenIntoSingleLayer();
// Draw software mouse cursor if requested
if (g.IO.MouseDrawCursor)
- RenderMouseCursor(&g.OverlayDrawList, g.IO.MousePos, g.Style.MouseCursorScale, g.MouseCursor);
+ RenderMouseCursor(&g.ForegroundDrawList, g.IO.MousePos, g.Style.MouseCursorScale, g.MouseCursor, IM_COL32_WHITE, IM_COL32_BLACK, IM_COL32(0, 0, 0, 48));
- if (!g.OverlayDrawList.VtxBuffer.empty())
- AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.OverlayDrawList);
+ // Add foreground ImDrawList
+ if (!g.ForegroundDrawList.VtxBuffer.empty())
+ AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.ForegroundDrawList);
// Setup ImDrawData structure for end-user
SetupDrawData(&g.DrawDataBuilder.Layers[0], &g.DrawData);
g.IO.MetricsRenderVertices = g.DrawData.TotalVtxCount;
g.IO.MetricsRenderIndices = g.DrawData.TotalIdxCount;
- // Render. If user hasn't set a callback then they may retrieve the draw data via GetDrawData()
+ // (Legacy) Call the Render callback function. The current prefer way is to let the user retrieve GetDrawData() and call the render function themselves.
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
if (g.DrawData.CmdListsCount > 0 && g.IO.RenderDrawListsFn != NULL)
g.IO.RenderDrawListsFn(&g.DrawData);
@@ -3672,7 +4200,7 @@ void ImGui::Render()
}
// Calculate text size. Text can be multi-line. Optionally ignore text after a ## marker.
-// CalcTextSize("") should return ImVec2(0.0f, GImGui->FontSize)
+// CalcTextSize("") should return ImVec2(0.0f, g.FontSize)
ImVec2 ImGui::CalcTextSize(const char* text, const char* text_end, bool hide_text_after_double_hash, float wrap_width)
{
ImGuiContext& g = *GImGui;
@@ -3689,60 +4217,15 @@ ImVec2 ImGui::CalcTextSize(const char* text, const char* text_end, bool hide_tex
return ImVec2(0.0f, font_size);
ImVec2 text_size = font->CalcTextSizeA(font_size, FLT_MAX, wrap_width, text, text_display_end, NULL);
- // Cancel out character spacing for the last character of a line (it is baked into glyph->AdvanceX field)
- const float font_scale = font_size / font->FontSize;
- const float character_spacing_x = 1.0f * font_scale;
- if (text_size.x > 0.0f)
- text_size.x -= character_spacing_x;
- text_size.x = (float)(int)(text_size.x + 0.95f);
+ // Round
+ text_size.x = IM_FLOOR(text_size.x + 0.95f);
return text_size;
}
-// Helper to calculate coarse clipping of large list of evenly sized items.
-// NB: Prefer using the ImGuiListClipper higher-level helper if you can! Read comments and instructions there on how those use this sort of pattern.
-// NB: 'items_count' is only used to clamp the result, if you don't know your count you can use INT_MAX
-void ImGui::CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end)
-{
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = g.CurrentWindow;
- if (g.LogEnabled)
- {
- // If logging is active, do not perform any clipping
- *out_items_display_start = 0;
- *out_items_display_end = items_count;
- return;
- }
- if (window->SkipItems)
- {
- *out_items_display_start = *out_items_display_end = 0;
- return;
- }
-
- // We create the union of the ClipRect and the NavScoringRect which at worst should be 1 page away from ClipRect
- ImRect unclipped_rect = window->ClipRect;
- if (g.NavMoveRequest)
- unclipped_rect.Add(g.NavScoringRectScreen);
-
- const ImVec2 pos = window->DC.CursorPos;
- int start = (int)((unclipped_rect.Min.y - pos.y) / items_height);
- int end = (int)((unclipped_rect.Max.y - pos.y) / items_height);
-
- // When performing a navigation request, ensure we have one item extra in the direction we are moving to
- if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Up)
- start--;
- if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Down)
- end++;
-
- start = ImClamp(start, 0, items_count);
- end = ImClamp(end + 1, start, items_count);
- *out_items_display_start = start;
- *out_items_display_end = end;
-}
-
// Find window given position, search front-to-back
-// FIXME: Note that we have an inconsequential lag here: OuterRectClipped is updated in Begin(), so windows moved programatically
-// with SetWindowPos() and not SetNextWindowPos() will have that rectangle lagging by a frame at the time FindHoveredWindow() is
+// FIXME: Note that we have an inconsequential lag here: OuterRectClipped is updated in Begin(), so windows moved programatically
+// with SetWindowPos() and not SetNextWindowPos() will have that rectangle lagging by a frame at the time FindHoveredWindow() is
// called, aka before the next Begin(). Moving window isn't affected.
static void FindHoveredWindow()
{
@@ -3753,8 +4236,8 @@ static void FindHoveredWindow()
hovered_window = g.MovingWindow;
ImVec2 padding_regular = g.Style.TouchExtraPadding;
- ImVec2 padding_for_resize_from_edges = g.IO.ConfigResizeWindowsFromEdges ? ImMax(g.Style.TouchExtraPadding, ImVec2(RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS, RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS)) : padding_regular;
- for (int i = g.Windows.Size - 1; i >= 0 && hovered_window == NULL; i--)
+ ImVec2 padding_for_resize_from_edges = g.IO.ConfigWindowsResizeFromEdges ? ImMax(g.Style.TouchExtraPadding, ImVec2(WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS, WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS)) : padding_regular;
+ for (int i = g.Windows.Size - 1; i >= 0; i--)
{
ImGuiWindow* window = g.Windows[i];
if (!window->Active || window->Hidden)
@@ -3764,7 +4247,7 @@ static void FindHoveredWindow()
// Using the clipped AABB, a child window will typically be clipped by its parent (not always)
ImRect bb(window->OuterRectClipped);
- if ((window->Flags & ImGuiWindowFlags_ChildWindow) || (window->Flags & ImGuiWindowFlags_NoResize))
+ if (window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize))
bb.Expand(padding_regular);
else
bb.Expand(padding_for_resize_from_edges);
@@ -3805,40 +4288,54 @@ bool ImGui::IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool c
int ImGui::GetKeyIndex(ImGuiKey imgui_key)
{
IM_ASSERT(imgui_key >= 0 && imgui_key < ImGuiKey_COUNT);
- return GImGui->IO.KeyMap[imgui_key];
+ ImGuiContext& g = *GImGui;
+ return g.IO.KeyMap[imgui_key];
}
-// Note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your back-end/engine stored them into io.KeysDown[]!
+// Note that dear imgui doesn't know the semantic of each entry of io.KeysDown[]!
+// Use your own indices/enums according to how your back-end/engine stored them into io.KeysDown[]!
bool ImGui::IsKeyDown(int user_key_index)
{
- if (user_key_index < 0) return false;
- IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(GImGui->IO.KeysDown));
- return GImGui->IO.KeysDown[user_key_index];
+ if (user_key_index < 0)
+ return false;
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown));
+ return g.IO.KeysDown[user_key_index];
}
-int ImGui::CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate)
+// t0 = previous time (e.g.: g.Time - g.IO.DeltaTime)
+// t1 = current time (e.g.: g.Time)
+// An event is triggered at:
+// t = 0.0f t = repeat_delay, t = repeat_delay + repeat_rate*N
+int ImGui::CalcTypematicRepeatAmount(float t0, float t1, float repeat_delay, float repeat_rate)
{
- if (t == 0.0f)
+ if (t1 == 0.0f)
return 1;
- if (t <= repeat_delay || repeat_rate <= 0.0f)
+ if (t0 >= t1)
return 0;
- const int count = (int)((t - repeat_delay) / repeat_rate) - (int)((t_prev - repeat_delay) / repeat_rate);
- return (count > 0) ? count : 0;
+ if (repeat_rate <= 0.0f)
+ return (t0 < repeat_delay) && (t1 >= repeat_delay);
+ const int count_t0 = (t0 < repeat_delay) ? -1 : (int)((t0 - repeat_delay) / repeat_rate);
+ const int count_t1 = (t1 < repeat_delay) ? -1 : (int)((t1 - repeat_delay) / repeat_rate);
+ const int count = count_t1 - count_t0;
+ return count;
}
int ImGui::GetKeyPressedAmount(int key_index, float repeat_delay, float repeat_rate)
{
ImGuiContext& g = *GImGui;
- if (key_index < 0) return false;
+ if (key_index < 0)
+ return 0;
IM_ASSERT(key_index >= 0 && key_index < IM_ARRAYSIZE(g.IO.KeysDown));
const float t = g.IO.KeysDownDuration[key_index];
- return CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, repeat_delay, repeat_rate);
+ return CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, repeat_delay, repeat_rate);
}
bool ImGui::IsKeyPressed(int user_key_index, bool repeat)
{
ImGuiContext& g = *GImGui;
- if (user_key_index < 0) return false;
+ if (user_key_index < 0)
+ return false;
IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown));
const float t = g.IO.KeysDownDuration[user_key_index];
if (t == 0.0f)
@@ -3856,13 +4353,90 @@ bool ImGui::IsKeyReleased(int user_key_index)
return g.IO.KeysDownDurationPrev[user_key_index] >= 0.0f && !g.IO.KeysDown[user_key_index];
}
-bool ImGui::IsMouseDown(int button)
+bool ImGui::IsMouseDown(ImGuiMouseButton button)
{
ImGuiContext& g = *GImGui;
IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
return g.IO.MouseDown[button];
}
+bool ImGui::IsMouseClicked(ImGuiMouseButton button, bool repeat)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
+ const float t = g.IO.MouseDownDuration[button];
+ if (t == 0.0f)
+ return true;
+
+ if (repeat && t > g.IO.KeyRepeatDelay)
+ {
+ // FIXME: 2019/05/03: Our old repeat code was wrong here and led to doubling the repeat rate, which made it an ok rate for repeat on mouse hold.
+ int amount = CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate * 0.50f);
+ if (amount > 0)
+ return true;
+ }
+ return false;
+}
+
+bool ImGui::IsMouseReleased(ImGuiMouseButton button)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
+ return g.IO.MouseReleased[button];
+}
+
+bool ImGui::IsMouseDoubleClicked(ImGuiMouseButton button)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
+ return g.IO.MouseDoubleClicked[button];
+}
+
+// [Internal] This doesn't test if the button is pressed
+bool ImGui::IsMouseDragPastThreshold(ImGuiMouseButton button, float lock_threshold)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
+ if (lock_threshold < 0.0f)
+ lock_threshold = g.IO.MouseDragThreshold;
+ return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
+}
+
+bool ImGui::IsMouseDragging(ImGuiMouseButton button, float lock_threshold)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
+ if (!g.IO.MouseDown[button])
+ return false;
+ return IsMouseDragPastThreshold(button, lock_threshold);
+}
+
+ImVec2 ImGui::GetMousePos()
+{
+ ImGuiContext& g = *GImGui;
+ return g.IO.MousePos;
+}
+
+// NB: prefer to call right after BeginPopup(). At the time Selectable/MenuItem is activated, the popup is already closed!
+ImVec2 ImGui::GetMousePosOnOpeningCurrentPopup()
+{
+ ImGuiContext& g = *GImGui;
+ if (g.BeginPopupStack.Size > 0)
+ return g.OpenPopupStack[g.BeginPopupStack.Size-1].OpenMousePos;
+ return g.IO.MousePos;
+}
+
+// We typically use ImVec2(-FLT_MAX,-FLT_MAX) to denote an invalid mouse position.
+bool ImGui::IsMousePosValid(const ImVec2* mouse_pos)
+{
+ // The assert is only to silence a false-positive in XCode Static Analysis.
+ // Because GImGui is not dereferenced in every code path, the static analyzer assume that it may be NULL (which it doesn't for other functions).
+ IM_ASSERT(GImGui != NULL);
+ const float MOUSE_INVALID = -256000.0f;
+ ImVec2 p = mouse_pos ? *mouse_pos : GImGui->IO.MousePos;
+ return p.x >= MOUSE_INVALID && p.y >= MOUSE_INVALID;
+}
+
bool ImGui::IsAnyMouseDown()
{
ImGuiContext& g = *GImGui;
@@ -3872,86 +4446,23 @@ bool ImGui::IsAnyMouseDown()
return false;
}
-bool ImGui::IsMouseClicked(int button, bool repeat)
-{
- ImGuiContext& g = *GImGui;
- IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
- const float t = g.IO.MouseDownDuration[button];
- if (t == 0.0f)
- return true;
-
- if (repeat && t > g.IO.KeyRepeatDelay)
- {
- float delay = g.IO.KeyRepeatDelay, rate = g.IO.KeyRepeatRate;
- if ((ImFmod(t - delay, rate) > rate*0.5f) != (ImFmod(t - delay - g.IO.DeltaTime, rate) > rate*0.5f))
- return true;
- }
-
- return false;
-}
-
-bool ImGui::IsMouseReleased(int button)
-{
- ImGuiContext& g = *GImGui;
- IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
- return g.IO.MouseReleased[button];
-}
-
-bool ImGui::IsMouseDoubleClicked(int button)
-{
- ImGuiContext& g = *GImGui;
- IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
- return g.IO.MouseDoubleClicked[button];
-}
-
-bool ImGui::IsMouseDragging(int button, float lock_threshold)
-{
- ImGuiContext& g = *GImGui;
- IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
- if (!g.IO.MouseDown[button])
- return false;
- if (lock_threshold < 0.0f)
- lock_threshold = g.IO.MouseDragThreshold;
- return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
-}
-
-ImVec2 ImGui::GetMousePos()
-{
- return GImGui->IO.MousePos;
-}
-
-// NB: prefer to call right after BeginPopup(). At the time Selectable/MenuItem is activated, the popup is already closed!
-ImVec2 ImGui::GetMousePosOnOpeningCurrentPopup()
-{
- ImGuiContext& g = *GImGui;
- if (g.CurrentPopupStack.Size > 0)
- return g.OpenPopupStack[g.CurrentPopupStack.Size-1].OpenMousePos;
- return g.IO.MousePos;
-}
-
-// We typically use ImVec2(-FLT_MAX,-FLT_MAX) to denote an invalid mouse position
-bool ImGui::IsMousePosValid(const ImVec2* mouse_pos)
-{
- if (mouse_pos == NULL)
- mouse_pos = &GImGui->IO.MousePos;
- const float MOUSE_INVALID = -256000.0f;
- return mouse_pos->x >= MOUSE_INVALID && mouse_pos->y >= MOUSE_INVALID;
-}
-
+// Return the delta from the initial clicking position while the mouse button is clicked or was just released.
+// This is locked and return 0.0f until the mouse moves past a distance threshold at least once.
// NB: This is only valid if IsMousePosValid(). Back-ends in theory should always keep mouse position valid when dragging even outside the client window.
-ImVec2 ImGui::GetMouseDragDelta(int button, float lock_threshold)
+ImVec2 ImGui::GetMouseDragDelta(ImGuiMouseButton button, float lock_threshold)
{
ImGuiContext& g = *GImGui;
IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
if (lock_threshold < 0.0f)
lock_threshold = g.IO.MouseDragThreshold;
- if (g.IO.MouseDown[button])
+ if (g.IO.MouseDown[button] || g.IO.MouseReleased[button])
if (g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold)
- return g.IO.MousePos - g.IO.MouseClickedPos[button]; // Assume we can only get active with left-mouse button (at the moment).
+ if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MouseClickedPos[button]))
+ return g.IO.MousePos - g.IO.MouseClickedPos[button];
return ImVec2(0.0f, 0.0f);
}
-void ImGui::ResetMouseDragDelta(int button)
+void ImGui::ResetMouseDragDelta(ImGuiMouseButton button)
{
ImGuiContext& g = *GImGui;
IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
@@ -3990,30 +4501,60 @@ bool ImGui::IsItemActive()
return false;
}
+bool ImGui::IsItemActivated()
+{
+ ImGuiContext& g = *GImGui;
+ if (g.ActiveId)
+ {
+ ImGuiWindow* window = g.CurrentWindow;
+ if (g.ActiveId == window->DC.LastItemId && g.ActiveIdPreviousFrame != window->DC.LastItemId)
+ return true;
+ }
+ return false;
+}
+
bool ImGui::IsItemDeactivated()
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
+ if (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HasDeactivated)
+ return (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_Deactivated) != 0;
return (g.ActiveIdPreviousFrame == window->DC.LastItemId && g.ActiveIdPreviousFrame != 0 && g.ActiveId != window->DC.LastItemId);
}
bool ImGui::IsItemDeactivatedAfterEdit()
{
ImGuiContext& g = *GImGui;
- return IsItemDeactivated() && (g.ActiveIdPreviousFrameHasBeenEdited || (g.ActiveId == 0 && g.ActiveIdHasBeenEdited));
+ return IsItemDeactivated() && (g.ActiveIdPreviousFrameHasBeenEditedBefore || (g.ActiveId == 0 && g.ActiveIdHasBeenEditedBefore));
}
bool ImGui::IsItemFocused()
{
ImGuiContext& g = *GImGui;
- return g.NavId && !g.NavDisableHighlight && g.NavId == g.CurrentWindow->DC.LastItemId;
+ ImGuiWindow* window = g.CurrentWindow;
+
+ if (g.NavId == 0 || g.NavDisableHighlight || g.NavId != window->DC.LastItemId)
+ return false;
+ return true;
}
-bool ImGui::IsItemClicked(int mouse_button)
+bool ImGui::IsItemClicked(ImGuiMouseButton mouse_button)
{
return IsMouseClicked(mouse_button) && IsItemHovered(ImGuiHoveredFlags_None);
}
+bool ImGui::IsItemToggledOpen()
+{
+ ImGuiContext& g = *GImGui;
+ return (g.CurrentWindow->DC.LastItemStatusFlags & ImGuiItemStatusFlags_ToggledOpen) ? true : false;
+}
+
+bool ImGui::IsItemToggledSelection()
+{
+ ImGuiContext& g = *GImGui;
+ return (g.CurrentWindow->DC.LastItemStatusFlags & ImGuiItemStatusFlags_ToggledSelection) ? true : false;
+}
+
bool ImGui::IsAnyItemHovered()
{
ImGuiContext& g = *GImGui;
@@ -4075,12 +4616,10 @@ ImVec2 ImGui::GetItemRectSize()
static ImRect GetViewportRect()
{
ImGuiContext& g = *GImGui;
- if (g.IO.DisplayVisibleMin.x != g.IO.DisplayVisibleMax.x && g.IO.DisplayVisibleMin.y != g.IO.DisplayVisibleMax.y)
- return ImRect(g.IO.DisplayVisibleMin, g.IO.DisplayVisibleMax);
return ImRect(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y);
}
-static bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags)
+bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* parent_window = g.CurrentWindow;
@@ -4113,7 +4652,12 @@ static bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size
ImGuiWindow* child_window = g.CurrentWindow;
child_window->ChildId = id;
- child_window->AutoFitChildAxises = auto_fit_axises;
+ child_window->AutoFitChildAxises = (ImS8)auto_fit_axises;
+
+ // Set the cursor to handle case where the user called SetNextWindowPos()+BeginChild() manually.
+ // While this is not really documented/defined, it seems that the expected thing to do.
+ if (child_window->BeginCount == 1)
+ parent_window->DC.CursorPos = child_window->Pos;
// Process navigation-in immediately so NavInit can run on first frame
if (g.NavActivateId == id && !(flags & ImGuiWindowFlags_NavFlattened) && (child_window->DC.NavLayerActiveMask != 0 || child_window->DC.NavHasScroll))
@@ -4143,7 +4687,10 @@ void ImGui::EndChild()
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
- IM_ASSERT(window->Flags & ImGuiWindowFlags_ChildWindow); // Mismatched BeginChild()/EndChild() callss
+ IM_ASSERT(g.WithinEndChild == false);
+ IM_ASSERT(window->Flags & ImGuiWindowFlags_ChildWindow); // Mismatched BeginChild()/EndChild() calls
+
+ g.WithinEndChild = true;
if (window->BeginCount > 1)
{
End();
@@ -4175,6 +4722,7 @@ void ImGui::EndChild()
ItemAdd(bb, 0);
}
}
+ g.WithinEndChild = false;
}
// Helper to create a child window / scrolling region that looks like a normal widget frame.
@@ -4197,22 +4745,6 @@ void ImGui::EndChildFrame()
EndChild();
}
-// Save and compare stack sizes on Begin()/End() to detect usage errors
-static void CheckStacksSize(ImGuiWindow* window, bool write)
-{
- // NOT checking: DC.ItemWidth, DC.AllowKeyboardFocus, DC.ButtonRepeat, DC.TextWrapPos (per window) to allow user to conveniently push once and not pop (they are cleared on Begin)
- ImGuiContext& g = *GImGui;
- int* p_backup = &window->DC.StackSizesBackup[0];
- { int current = window->IDStack.Size; if (write) *p_backup = current; else IM_ASSERT(*p_backup == current && "PushID/PopID or TreeNode/TreePop Mismatch!"); p_backup++; } // Too few or too many PopID()/TreePop()
- { int current = window->DC.GroupStack.Size; if (write) *p_backup = current; else IM_ASSERT(*p_backup == current && "BeginGroup/EndGroup Mismatch!"); p_backup++; } // Too few or too many EndGroup()
- { int current = g.CurrentPopupStack.Size; if (write) *p_backup = current; else IM_ASSERT(*p_backup == current && "BeginMenu/EndMenu or BeginPopup/EndPopup Mismatch"); p_backup++;}// Too few or too many EndMenu()/EndPopup()
- // For color, style and font stacks there is an incentive to use Push/Begin/Pop/.../End patterns, so we relax our checks a little to allow them.
- { int current = g.ColorModifiers.Size; if (write) *p_backup = current; else IM_ASSERT(*p_backup >= current && "PushStyleColor/PopStyleColor Mismatch!"); p_backup++; } // Too few or too many PopStyleColor()
- { int current = g.StyleModifiers.Size; if (write) *p_backup = current; else IM_ASSERT(*p_backup >= current && "PushStyleVar/PopStyleVar Mismatch!"); p_backup++; } // Too few or too many PopStyleVar()
- { int current = g.FontStack.Size; if (write) *p_backup = current; else IM_ASSERT(*p_backup >= current && "PushFont/PopFont Mismatch!"); p_backup++; } // Too few or too many PopFont()
- IM_ASSERT(p_backup == window->DC.StackSizesBackup + IM_ARRAYSIZE(window->DC.StackSizesBackup));
-}
-
static void SetWindowConditionAllowFlags(ImGuiWindow* window, ImGuiCond flags, bool enabled)
{
window->SetWindowPosAllowFlags = enabled ? (window->SetWindowPosAllowFlags | flags) : (window->SetWindowPosAllowFlags & ~flags);
@@ -4220,16 +4752,22 @@ static void SetWindowConditionAllowFlags(ImGuiWindow* window, ImGuiCond flags, b
window->SetWindowCollapsedAllowFlags = enabled ? (window->SetWindowCollapsedAllowFlags | flags) : (window->SetWindowCollapsedAllowFlags & ~flags);
}
-ImGuiWindow* ImGui::FindWindowByName(const char* name)
+ImGuiWindow* ImGui::FindWindowByID(ImGuiID id)
{
ImGuiContext& g = *GImGui;
- ImGuiID id = ImHash(name, 0);
return (ImGuiWindow*)g.WindowsById.GetVoidPtr(id);
}
+ImGuiWindow* ImGui::FindWindowByName(const char* name)
+{
+ ImGuiID id = ImHashStr(name);
+ return FindWindowByID(id);
+}
+
static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags)
{
ImGuiContext& g = *GImGui;
+ //IMGUI_DEBUG_LOG("CreateNewWindow '%s', flags = 0x%08X\n", name, flags);
// Create window the first time
ImGuiWindow* window = IM_NEW(ImGuiWindow)(&g, name);
@@ -4244,15 +4782,15 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl
if (ImGuiWindowSettings* settings = ImGui::FindWindowSettings(window->ID))
{
// Retrieve settings from .ini file
- window->SettingsIdx = g.SettingsWindows.index_from_pointer(settings);
+ window->SettingsOffset = g.SettingsWindows.offset_from_ptr(settings);
SetWindowConditionAllowFlags(window, ImGuiCond_FirstUseEver, false);
- window->Pos = ImFloor(settings->Pos);
+ window->Pos = ImVec2(settings->Pos.x, settings->Pos.y);
window->Collapsed = settings->Collapsed;
- if (ImLengthSqr(settings->Size) > 0.00001f)
- size = ImFloor(settings->Size);
+ if (settings->Size.x > 0 && settings->Size.y > 0)
+ size = ImVec2(settings->Size.x, settings->Size.y);
}
- window->Size = window->SizeFull = window->SizeFullAtLastBegin = ImFloor(size);
- window->DC.CursorMaxPos = window->Pos; // So first call to CalcSizeContents() doesn't return crazy values
+ window->Size = window->SizeFull = ImFloor(size);
+ window->DC.CursorStartPos = window->DC.CursorMaxPos = window->Pos; // So first call to CalcContentSize() doesn't return crazy values
if ((flags & ImGuiWindowFlags_AlwaysAutoResize) != 0)
{
@@ -4276,10 +4814,10 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl
return window;
}
-static ImVec2 CalcSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
+static ImVec2 CalcWindowSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
{
ImGuiContext& g = *GImGui;
- if (g.NextWindowData.SizeConstraintCond != 0)
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint)
{
// Using -1,-1 on either X/Y axis to preserve the current size.
ImRect cr = g.NextWindowData.SizeConstraintRect;
@@ -4295,47 +4833,64 @@ static ImVec2 CalcSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
g.NextWindowData.SizeCallback(&data);
new_size = data.DesiredSize;
}
+ new_size.x = IM_FLOOR(new_size.x);
+ new_size.y = IM_FLOOR(new_size.y);
}
// Minimum size
if (!(window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_AlwaysAutoResize)))
{
+ ImGuiWindow* window_for_height = window;
new_size = ImMax(new_size, g.Style.WindowMinSize);
- new_size.y = ImMax(new_size.y, window->TitleBarHeight() + window->MenuBarHeight() + ImMax(0.0f, g.Style.WindowRounding - 1.0f)); // Reduce artifacts with very small windows
+ new_size.y = ImMax(new_size.y, window_for_height->TitleBarHeight() + window_for_height->MenuBarHeight() + ImMax(0.0f, g.Style.WindowRounding - 1.0f)); // Reduce artifacts with very small windows
}
return new_size;
}
-static ImVec2 CalcSizeContents(ImGuiWindow* window)
+static ImVec2 CalcWindowContentSize(ImGuiWindow* window)
{
+ if (window->Collapsed)
+ if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
+ return window->ContentSize;
+ if (window->Hidden && window->HiddenFramesCannotSkipItems == 0 && window->HiddenFramesCanSkipItems > 0)
+ return window->ContentSize;
+
ImVec2 sz;
- sz.x = (float)(int)((window->SizeContentsExplicit.x != 0.0f) ? window->SizeContentsExplicit.x : (window->DC.CursorMaxPos.x - window->Pos.x + window->Scroll.x));
- sz.y = (float)(int)((window->SizeContentsExplicit.y != 0.0f) ? window->SizeContentsExplicit.y : (window->DC.CursorMaxPos.y - window->Pos.y + window->Scroll.y));
- return sz + window->WindowPadding;
+ sz.x = IM_FLOOR((window->ContentSizeExplicit.x != 0.0f) ? window->ContentSizeExplicit.x : window->DC.CursorMaxPos.x - window->DC.CursorStartPos.x);
+ sz.y = IM_FLOOR((window->ContentSizeExplicit.y != 0.0f) ? window->ContentSizeExplicit.y : window->DC.CursorMaxPos.y - window->DC.CursorStartPos.y);
+ return sz;
}
-static ImVec2 CalcSizeAutoFit(ImGuiWindow* window, const ImVec2& size_contents)
+static ImVec2 CalcWindowAutoFitSize(ImGuiWindow* window, const ImVec2& size_contents)
{
ImGuiContext& g = *GImGui;
ImGuiStyle& style = g.Style;
+ ImVec2 size_decorations = ImVec2(0.0f, window->TitleBarHeight() + window->MenuBarHeight());
+ ImVec2 size_pad = window->WindowPadding * 2.0f;
+ ImVec2 size_desired = size_contents + size_pad + size_decorations;
if (window->Flags & ImGuiWindowFlags_Tooltip)
{
// Tooltip always resize
- return size_contents;
+ return size_desired;
}
else
{
- // When the window cannot fit all contents (either because of constraints, either because screen is too small): we are growing the size on the other axis to compensate for expected scrollbar. FIXME: Might turn bigger than DisplaySize-WindowPadding.
+ // Maximum window size is determined by the viewport size or monitor size
const bool is_popup = (window->Flags & ImGuiWindowFlags_Popup) != 0;
const bool is_menu = (window->Flags & ImGuiWindowFlags_ChildMenu) != 0;
ImVec2 size_min = style.WindowMinSize;
if (is_popup || is_menu) // Popups and menus bypass style.WindowMinSize by default, but we give then a non-zero minimum size to facilitate understanding problematic cases (e.g. empty popups)
size_min = ImMin(size_min, ImVec2(4.0f, 4.0f));
- ImVec2 size_auto_fit = ImClamp(size_contents, size_min, ImMax(size_min, g.IO.DisplaySize - style.DisplaySafeAreaPadding * 2.0f));
- ImVec2 size_auto_fit_after_constraint = CalcSizeAfterConstraint(window, size_auto_fit);
- if (size_auto_fit_after_constraint.x < size_contents.x && !(window->Flags & ImGuiWindowFlags_NoScrollbar) && (window->Flags & ImGuiWindowFlags_HorizontalScrollbar))
+ ImVec2 size_auto_fit = ImClamp(size_desired, size_min, ImMax(size_min, g.IO.DisplaySize - style.DisplaySafeAreaPadding * 2.0f));
+
+ // When the window cannot fit all contents (either because of constraints, either because screen is too small),
+ // we are growing the size on the other axis to compensate for expected scrollbar. FIXME: Might turn bigger than ViewportSize-WindowPadding.
+ ImVec2 size_auto_fit_after_constraint = CalcWindowSizeAfterConstraint(window, size_auto_fit);
+ bool will_have_scrollbar_x = (size_auto_fit_after_constraint.x - size_pad.x - size_decorations.x < size_contents.x && !(window->Flags & ImGuiWindowFlags_NoScrollbar) && (window->Flags & ImGuiWindowFlags_HorizontalScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar);
+ bool will_have_scrollbar_y = (size_auto_fit_after_constraint.y - size_pad.y - size_decorations.y < size_contents.y && !(window->Flags & ImGuiWindowFlags_NoScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysVerticalScrollbar);
+ if (will_have_scrollbar_x)
size_auto_fit.y += style.ScrollbarSize;
- if (size_auto_fit_after_constraint.y < size_contents.y && !(window->Flags & ImGuiWindowFlags_NoScrollbar))
+ if (will_have_scrollbar_y)
size_auto_fit.x += style.ScrollbarSize;
return size_auto_fit;
}
@@ -4343,47 +4898,10 @@ static ImVec2 CalcSizeAutoFit(ImGuiWindow* window, const ImVec2& size_contents)
ImVec2 ImGui::CalcWindowExpectedSize(ImGuiWindow* window)
{
- ImVec2 size_contents = CalcSizeContents(window);
- return CalcSizeAfterConstraint(window, CalcSizeAutoFit(window, size_contents));
-}
-
-float ImGui::GetWindowScrollMaxX(ImGuiWindow* window)
-{
- return ImMax(0.0f, window->SizeContents.x - (window->SizeFull.x - window->ScrollbarSizes.x));
-}
-
-float ImGui::GetWindowScrollMaxY(ImGuiWindow* window)
-{
- return ImMax(0.0f, window->SizeContents.y - (window->SizeFull.y - window->ScrollbarSizes.y));
-}
-
-static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges)
-{
- ImGuiContext& g = *GImGui;
- ImVec2 scroll = window->Scroll;
- if (window->ScrollTarget.x < FLT_MAX)
- {
- float cr_x = window->ScrollTargetCenterRatio.x;
- scroll.x = window->ScrollTarget.x - cr_x * (window->SizeFull.x - window->ScrollbarSizes.x);
- }
- if (window->ScrollTarget.y < FLT_MAX)
- {
- // 'snap_on_edges' allows for a discontinuity at the edge of scrolling limits to take account of WindowPadding so that scrolling to make the last item visible scroll far enough to see the padding.
- float cr_y = window->ScrollTargetCenterRatio.y;
- float target_y = window->ScrollTarget.y;
- if (snap_on_edges && cr_y <= 0.0f && target_y <= window->WindowPadding.y)
- target_y = 0.0f;
- if (snap_on_edges && cr_y >= 1.0f && target_y >= window->SizeContents.y - window->WindowPadding.y + g.Style.ItemSpacing.y)
- target_y = window->SizeContents.y;
- scroll.y = target_y - (1.0f - cr_y) * (window->TitleBarHeight() + window->MenuBarHeight()) - cr_y * (window->SizeFull.y - window->ScrollbarSizes.y);
- }
- scroll = ImMax(scroll, ImVec2(0.0f, 0.0f));
- if (!window->Collapsed && !window->SkipItems)
- {
- scroll.x = ImMin(scroll.x, ImGui::GetWindowScrollMaxX(window));
- scroll.y = ImMin(scroll.y, ImGui::GetWindowScrollMaxY(window));
- }
- return scroll;
+ ImVec2 size_contents = CalcWindowContentSize(window);
+ ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, size_contents);
+ ImVec2 size_final = CalcWindowSizeAfterConstraint(window, size_auto_fit);
+ return size_final;
}
static ImGuiCol GetWindowBgColorIdxFromFlags(ImGuiWindowFlags flags)
@@ -4400,7 +4918,7 @@ static void CalcResizePosSizeFromAnyCorner(ImGuiWindow* window, const ImVec2& co
ImVec2 pos_min = ImLerp(corner_target, window->Pos, corner_norm); // Expected window upper-left
ImVec2 pos_max = ImLerp(window->Pos + window->Size, corner_target, corner_norm); // Expected window lower-right
ImVec2 size_expected = pos_max - pos_min;
- ImVec2 size_constrained = CalcSizeAfterConstraint(window, size_expected);
+ ImVec2 size_constrained = CalcWindowSizeAfterConstraint(window, size_expected);
*out_pos = pos_min;
if (corner_norm.x == 0.0f)
out_pos->x -= (size_constrained.x - size_expected.x);
@@ -4411,78 +4929,97 @@ static void CalcResizePosSizeFromAnyCorner(ImGuiWindow* window, const ImVec2& co
struct ImGuiResizeGripDef
{
- ImVec2 CornerPos;
+ ImVec2 CornerPosN;
ImVec2 InnerDir;
int AngleMin12, AngleMax12;
};
-const ImGuiResizeGripDef resize_grip_def[4] =
+static const ImGuiResizeGripDef resize_grip_def[4] =
{
- { ImVec2(1,1), ImVec2(-1,-1), 0, 3 }, // Lower right
- { ImVec2(0,1), ImVec2(+1,-1), 3, 6 }, // Lower left
- { ImVec2(0,0), ImVec2(+1,+1), 6, 9 }, // Upper left
- { ImVec2(1,0), ImVec2(-1,+1), 9,12 }, // Upper right
+ { ImVec2(1,1), ImVec2(-1,-1), 0, 3 }, // Lower-right
+ { ImVec2(0,1), ImVec2(+1,-1), 3, 6 }, // Lower-left
+ { ImVec2(0,0), ImVec2(+1,+1), 6, 9 }, // Upper-left (Unused)
+ { ImVec2(1,0), ImVec2(-1,+1), 9,12 }, // Upper-right (Unused)
};
static ImRect GetResizeBorderRect(ImGuiWindow* window, int border_n, float perp_padding, float thickness)
{
ImRect rect = window->Rect();
if (thickness == 0.0f) rect.Max -= ImVec2(1,1);
- if (border_n == 0) return ImRect(rect.Min.x + perp_padding, rect.Min.y - thickness, rect.Max.x - perp_padding, rect.Min.y + thickness);
- if (border_n == 1) return ImRect(rect.Max.x - thickness, rect.Min.y + perp_padding, rect.Max.x + thickness, rect.Max.y - perp_padding);
- if (border_n == 2) return ImRect(rect.Min.x + perp_padding, rect.Max.y - thickness, rect.Max.x - perp_padding, rect.Max.y + thickness);
- if (border_n == 3) return ImRect(rect.Min.x - thickness, rect.Min.y + perp_padding, rect.Min.x + thickness, rect.Max.y - perp_padding);
+ if (border_n == 0) return ImRect(rect.Min.x + perp_padding, rect.Min.y - thickness, rect.Max.x - perp_padding, rect.Min.y + thickness); // Top
+ if (border_n == 1) return ImRect(rect.Max.x - thickness, rect.Min.y + perp_padding, rect.Max.x + thickness, rect.Max.y - perp_padding); // Right
+ if (border_n == 2) return ImRect(rect.Min.x + perp_padding, rect.Max.y - thickness, rect.Max.x - perp_padding, rect.Max.y + thickness); // Bottom
+ if (border_n == 3) return ImRect(rect.Min.x - thickness, rect.Min.y + perp_padding, rect.Min.x + thickness, rect.Max.y - perp_padding); // Left
IM_ASSERT(0);
return ImRect();
}
+// 0..3: corners (Lower-right, Lower-left, Unused, Unused)
+// 4..7: borders (Top, Right, Bottom, Left)
+ImGuiID ImGui::GetWindowResizeID(ImGuiWindow* window, int n)
+{
+ IM_ASSERT(n >= 0 && n <= 7);
+ ImGuiID id = window->ID;
+ id = ImHashStr("#RESIZE", 0, id);
+ id = ImHashData(&n, sizeof(int), id);
+ return id;
+}
+
// Handle resize for: Resize Grips, Borders, Gamepad
-static void ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4])
+// Return true when using auto-fit (double click on resize grip)
+static bool ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4])
{
ImGuiContext& g = *GImGui;
ImGuiWindowFlags flags = window->Flags;
- if ((flags & ImGuiWindowFlags_NoResize) || (flags & ImGuiWindowFlags_AlwaysAutoResize) || window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0)
- return;
- if (window->WasActive == false) // Early out to avoid running this code for e.g. an hidden implicit Debug window.
- return;
- const int resize_border_count = g.IO.ConfigResizeWindowsFromEdges ? 4 : 0;
- const float grip_draw_size = (float)(int)ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f);
- const float grip_hover_inner_size = (float)(int)(grip_draw_size * 0.75f);
- const float grip_hover_outer_size = g.IO.ConfigResizeWindowsFromEdges ? RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS : 0.0f;
+ if ((flags & ImGuiWindowFlags_NoResize) || (flags & ImGuiWindowFlags_AlwaysAutoResize) || window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0)
+ return false;
+ if (window->WasActive == false) // Early out to avoid running this code for e.g. an hidden implicit/fallback Debug window.
+ return false;
+
+ bool ret_auto_fit = false;
+ const int resize_border_count = g.IO.ConfigWindowsResizeFromEdges ? 4 : 0;
+ const float grip_draw_size = IM_FLOOR(ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f));
+ const float grip_hover_inner_size = IM_FLOOR(grip_draw_size * 0.75f);
+ const float grip_hover_outer_size = g.IO.ConfigWindowsResizeFromEdges ? WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS : 0.0f;
ImVec2 pos_target(FLT_MAX, FLT_MAX);
ImVec2 size_target(FLT_MAX, FLT_MAX);
+ // Resize grips and borders are on layer 1
+ window->DC.NavLayerCurrent = ImGuiNavLayer_Menu;
+ window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Menu);
+
// Manual resize grips
PushID("#RESIZE");
for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++)
{
const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n];
- const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPos);
+ const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPosN);
// Using the FlattenChilds button flag we make the resize button accessible even if we are hovering over a child window
ImRect resize_rect(corner - grip.InnerDir * grip_hover_outer_size, corner + grip.InnerDir * grip_hover_inner_size);
if (resize_rect.Min.x > resize_rect.Max.x) ImSwap(resize_rect.Min.x, resize_rect.Max.x);
if (resize_rect.Min.y > resize_rect.Max.y) ImSwap(resize_rect.Min.y, resize_rect.Max.y);
bool hovered, held;
- ButtonBehavior(resize_rect, window->GetID((void*)(intptr_t)resize_grip_n), &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_NoNavFocus);
- //GetOverlayDrawList()->AddRect(resize_rect.Min, resize_rect.Max, IM_COL32(255, 255, 0, 255));
+ ButtonBehavior(resize_rect, window->GetID(resize_grip_n), &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_NoNavFocus);
+ //GetForegroundDrawList(window)->AddRect(resize_rect.Min, resize_rect.Max, IM_COL32(255, 255, 0, 255));
if (hovered || held)
g.MouseCursor = (resize_grip_n & 1) ? ImGuiMouseCursor_ResizeNESW : ImGuiMouseCursor_ResizeNWSE;
if (held && g.IO.MouseDoubleClicked[0] && resize_grip_n == 0)
{
// Manual auto-fit when double-clicking
- size_target = CalcSizeAfterConstraint(window, size_auto_fit);
+ size_target = CalcWindowSizeAfterConstraint(window, size_auto_fit);
+ ret_auto_fit = true;
ClearActiveID();
}
else if (held)
{
// Resize from any of the four corners
// We don't use an incremental MouseDelta but rather compute an absolute target size based on mouse position
- ImVec2 corner_target = g.IO.MousePos - g.ActiveIdClickOffset + ImLerp(grip.InnerDir * grip_hover_outer_size, grip.InnerDir * -grip_hover_inner_size, grip.CornerPos); // Corner of the window corresponding to our corner grip
- CalcResizePosSizeFromAnyCorner(window, corner_target, grip.CornerPos, &pos_target, &size_target);
+ ImVec2 corner_target = g.IO.MousePos - g.ActiveIdClickOffset + ImLerp(grip.InnerDir * grip_hover_outer_size, grip.InnerDir * -grip_hover_inner_size, grip.CornerPosN); // Corner of the window corresponding to our corner grip
+ CalcResizePosSizeFromAnyCorner(window, corner_target, grip.CornerPosN, &pos_target, &size_target);
}
if (resize_grip_n == 0 || held || hovered)
resize_grip_col[resize_grip_n] = GetColorU32(held ? ImGuiCol_ResizeGripActive : hovered ? ImGuiCol_ResizeGripHovered : ImGuiCol_ResizeGrip);
@@ -4490,27 +5027,32 @@ static void ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_au
for (int border_n = 0; border_n < resize_border_count; border_n++)
{
bool hovered, held;
- ImRect border_rect = GetResizeBorderRect(window, border_n, grip_hover_inner_size, RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS);
- ButtonBehavior(border_rect, window->GetID((void*)(intptr_t)(border_n + 4)), &hovered, &held, ImGuiButtonFlags_FlattenChildren);
- //GetOverlayDrawList()->AddRect(border_rect.Min, border_rect.Max, IM_COL32(255, 255, 0, 255));
- if ((hovered && g.HoveredIdTimer > RESIZE_WINDOWS_FROM_EDGES_FEEDBACK_TIMER) || held)
+ ImRect border_rect = GetResizeBorderRect(window, border_n, grip_hover_inner_size, WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS);
+ ButtonBehavior(border_rect, window->GetID(border_n + 4), &hovered, &held, ImGuiButtonFlags_FlattenChildren);
+ //GetForegroundDrawLists(window)->AddRect(border_rect.Min, border_rect.Max, IM_COL32(255, 255, 0, 255));
+ if ((hovered && g.HoveredIdTimer > WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER) || held)
{
g.MouseCursor = (border_n & 1) ? ImGuiMouseCursor_ResizeEW : ImGuiMouseCursor_ResizeNS;
- if (held) *border_held = border_n;
+ if (held)
+ *border_held = border_n;
}
if (held)
{
ImVec2 border_target = window->Pos;
ImVec2 border_posn;
- if (border_n == 0) { border_posn = ImVec2(0, 0); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS); }
- if (border_n == 1) { border_posn = ImVec2(1, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS); }
- if (border_n == 2) { border_posn = ImVec2(0, 1); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS); }
- if (border_n == 3) { border_posn = ImVec2(0, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + RESIZE_WINDOWS_FROM_EDGES_HALF_THICKNESS); }
+ if (border_n == 0) { border_posn = ImVec2(0, 0); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Top
+ if (border_n == 1) { border_posn = ImVec2(1, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Right
+ if (border_n == 2) { border_posn = ImVec2(0, 1); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Bottom
+ if (border_n == 3) { border_posn = ImVec2(0, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Left
CalcResizePosSizeFromAnyCorner(window, border_target, border_posn, &pos_target, &size_target);
}
}
PopID();
+ // Restore nav layer
+ window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
+ window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main);
+
// Navigation resize (keyboard/gamepad)
if (g.NavWindowingTarget && g.NavWindowingTarget->RootWindow == window)
{
@@ -4527,7 +5069,7 @@ static void ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_au
g.NavDisableMouseHover = true;
resize_grip_col[0] = GetColorU32(ImGuiCol_ResizeGripActive);
// FIXME-NAV: Should store and accumulate into a separate size buffer to handle sizing constraints properly, right now a constraint will make us stuck.
- size_target = CalcSizeAfterConstraint(window, window->SizeFull + nav_resize_delta);
+ size_target = CalcWindowSizeAfterConstraint(window, window->SizeFull + nav_resize_delta);
}
}
@@ -4544,6 +5086,220 @@ static void ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_au
}
window->Size = window->SizeFull;
+ return ret_auto_fit;
+}
+
+static inline void ClampWindowRect(ImGuiWindow* window, const ImRect& rect, const ImVec2& padding)
+{
+ ImGuiContext& g = *GImGui;
+ ImVec2 size_for_clamping = (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(window->Flags & ImGuiWindowFlags_NoTitleBar)) ? ImVec2(window->Size.x, window->TitleBarHeight()) : window->Size;
+ window->Pos = ImMin(rect.Max - padding, ImMax(window->Pos + size_for_clamping, rect.Min + padding) - size_for_clamping);
+}
+
+static void ImGui::RenderWindowOuterBorders(ImGuiWindow* window)
+{
+ ImGuiContext& g = *GImGui;
+ float rounding = window->WindowRounding;
+ float border_size = window->WindowBorderSize;
+ if (border_size > 0.0f && !(window->Flags & ImGuiWindowFlags_NoBackground))
+ window->DrawList->AddRect(window->Pos, window->Pos + window->Size, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size);
+
+ int border_held = window->ResizeBorderHeld;
+ if (border_held != -1)
+ {
+ struct ImGuiResizeBorderDef
+ {
+ ImVec2 InnerDir;
+ ImVec2 CornerPosN1, CornerPosN2;
+ float OuterAngle;
+ };
+ static const ImGuiResizeBorderDef resize_border_def[4] =
+ {
+ { ImVec2(0,+1), ImVec2(0,0), ImVec2(1,0), IM_PI*1.50f }, // Top
+ { ImVec2(-1,0), ImVec2(1,0), ImVec2(1,1), IM_PI*0.00f }, // Right
+ { ImVec2(0,-1), ImVec2(1,1), ImVec2(0,1), IM_PI*0.50f }, // Bottom
+ { ImVec2(+1,0), ImVec2(0,1), ImVec2(0,0), IM_PI*1.00f } // Left
+ };
+ const ImGuiResizeBorderDef& def = resize_border_def[border_held];
+ ImRect border_r = GetResizeBorderRect(window, border_held, rounding, 0.0f);
+ window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.CornerPosN1) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle - IM_PI*0.25f, def.OuterAngle);
+ window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.CornerPosN2) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle, def.OuterAngle + IM_PI*0.25f);
+ window->DrawList->PathStroke(GetColorU32(ImGuiCol_SeparatorActive), false, ImMax(2.0f, border_size)); // Thicker than usual
+ }
+ if (g.Style.FrameBorderSize > 0 && !(window->Flags & ImGuiWindowFlags_NoTitleBar))
+ {
+ float y = window->Pos.y + window->TitleBarHeight() - 1;
+ window->DrawList->AddLine(ImVec2(window->Pos.x + border_size, y), ImVec2(window->Pos.x + window->Size.x - border_size, y), GetColorU32(ImGuiCol_Border), g.Style.FrameBorderSize);
+ }
+}
+
+// Draw background and borders
+// Draw and handle scrollbars
+void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiStyle& style = g.Style;
+ ImGuiWindowFlags flags = window->Flags;
+
+ // Ensure that ScrollBar doesn't read last frame's SkipItems
+ window->SkipItems = false;
+
+ // Draw window + handle manual resize
+ // As we highlight the title bar when want_focus is set, multiple reappearing windows will have have their title bar highlighted on their reappearing frame.
+ const float window_rounding = window->WindowRounding;
+ const float window_border_size = window->WindowBorderSize;
+ if (window->Collapsed)
+ {
+ // Title bar only
+ float backup_border_size = style.FrameBorderSize;
+ g.Style.FrameBorderSize = window->WindowBorderSize;
+ ImU32 title_bar_col = GetColorU32((title_bar_is_highlight && !g.NavDisableHighlight) ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBgCollapsed);
+ RenderFrame(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, true, window_rounding);
+ g.Style.FrameBorderSize = backup_border_size;
+ }
+ else
+ {
+ // Window background
+ if (!(flags & ImGuiWindowFlags_NoBackground))
+ {
+ ImU32 bg_col = GetColorU32(GetWindowBgColorIdxFromFlags(flags));
+ bool override_alpha = false;
+ float alpha = 1.0f;
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasBgAlpha)
+ {
+ alpha = g.NextWindowData.BgAlphaVal;
+ override_alpha = true;
+ }
+ if (override_alpha)
+ bg_col = (bg_col & ~IM_COL32_A_MASK) | (IM_F32_TO_INT8_SAT(alpha) << IM_COL32_A_SHIFT);
+ window->DrawList->AddRectFilled(window->Pos + ImVec2(0, window->TitleBarHeight()), window->Pos + window->Size, bg_col, window_rounding, (flags & ImGuiWindowFlags_NoTitleBar) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Bot);
+ }
+
+ // Title bar
+ if (!(flags & ImGuiWindowFlags_NoTitleBar))
+ {
+ ImU32 title_bar_col = GetColorU32(title_bar_is_highlight ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg);
+ window->DrawList->AddRectFilled(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, window_rounding, ImDrawCornerFlags_Top);
+ }
+
+ // Menu bar
+ if (flags & ImGuiWindowFlags_MenuBar)
+ {
+ ImRect menu_bar_rect = window->MenuBarRect();
+ menu_bar_rect.ClipWith(window->Rect()); // Soft clipping, in particular child window don't have minimum size covering the menu bar so this is useful for them.
+ window->DrawList->AddRectFilled(menu_bar_rect.Min + ImVec2(window_border_size, 0), menu_bar_rect.Max - ImVec2(window_border_size, 0), GetColorU32(ImGuiCol_MenuBarBg), (flags & ImGuiWindowFlags_NoTitleBar) ? window_rounding : 0.0f, ImDrawCornerFlags_Top);
+ if (style.FrameBorderSize > 0.0f && menu_bar_rect.Max.y < window->Pos.y + window->Size.y)
+ window->DrawList->AddLine(menu_bar_rect.GetBL(), menu_bar_rect.GetBR(), GetColorU32(ImGuiCol_Border), style.FrameBorderSize);
+ }
+
+ // Scrollbars
+ if (window->ScrollbarX)
+ Scrollbar(ImGuiAxis_X);
+ if (window->ScrollbarY)
+ Scrollbar(ImGuiAxis_Y);
+
+ // Render resize grips (after their input handling so we don't have a frame of latency)
+ if (!(flags & ImGuiWindowFlags_NoResize))
+ {
+ for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++)
+ {
+ const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n];
+ const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPosN);
+ window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(window_border_size, resize_grip_draw_size) : ImVec2(resize_grip_draw_size, window_border_size)));
+ window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(resize_grip_draw_size, window_border_size) : ImVec2(window_border_size, resize_grip_draw_size)));
+ window->DrawList->PathArcToFast(ImVec2(corner.x + grip.InnerDir.x * (window_rounding + window_border_size), corner.y + grip.InnerDir.y * (window_rounding + window_border_size)), window_rounding, grip.AngleMin12, grip.AngleMax12);
+ window->DrawList->PathFillConvex(resize_grip_col[resize_grip_n]);
+ }
+ }
+
+ // Borders
+ RenderWindowOuterBorders(window);
+ }
+}
+
+// Render title text, collapse button, close button
+void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiStyle& style = g.Style;
+ ImGuiWindowFlags flags = window->Flags;
+
+ const bool has_close_button = (p_open != NULL);
+ const bool has_collapse_button = !(flags & ImGuiWindowFlags_NoCollapse) && (style.WindowMenuButtonPosition != ImGuiDir_None);
+
+ // Close & Collapse button are on the Menu NavLayer and don't default focus (unless there's nothing else on that layer)
+ const ImGuiItemFlags item_flags_backup = window->DC.ItemFlags;
+ window->DC.ItemFlags |= ImGuiItemFlags_NoNavDefaultFocus;
+ window->DC.NavLayerCurrent = ImGuiNavLayer_Menu;
+ window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Menu);
+
+ // Layout buttons
+ // FIXME: Would be nice to generalize the subtleties expressed here into reusable code.
+ float pad_l = style.FramePadding.x;
+ float pad_r = style.FramePadding.x;
+ float button_sz = g.FontSize;
+ ImVec2 close_button_pos;
+ ImVec2 collapse_button_pos;
+ if (has_close_button)
+ {
+ pad_r += button_sz;
+ close_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - style.FramePadding.x, title_bar_rect.Min.y);
+ }
+ if (has_collapse_button && style.WindowMenuButtonPosition == ImGuiDir_Right)
+ {
+ pad_r += button_sz;
+ collapse_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - style.FramePadding.x, title_bar_rect.Min.y);
+ }
+ if (has_collapse_button && style.WindowMenuButtonPosition == ImGuiDir_Left)
+ {
+ collapse_button_pos = ImVec2(title_bar_rect.Min.x + pad_l - style.FramePadding.x, title_bar_rect.Min.y);
+ pad_l += button_sz;
+ }
+
+ // Collapse button (submitting first so it gets priority when choosing a navigation init fallback)
+ if (has_collapse_button)
+ if (CollapseButton(window->GetID("#COLLAPSE"), collapse_button_pos))
+ window->WantCollapseToggle = true; // Defer actual collapsing to next frame as we are too far in the Begin() function
+
+ // Close button
+ if (has_close_button)
+ if (CloseButton(window->GetID("#CLOSE"), close_button_pos))
+ *p_open = false;
+
+ window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
+ window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main);
+ window->DC.ItemFlags = item_flags_backup;
+
+ // Title bar text (with: horizontal alignment, avoiding collapse/close button, optional "unsaved document" marker)
+ // FIXME: Refactor text alignment facilities along with RenderText helpers, this is WAY too much messy code..
+ const char* UNSAVED_DOCUMENT_MARKER = "*";
+ const float marker_size_x = (flags & ImGuiWindowFlags_UnsavedDocument) ? CalcTextSize(UNSAVED_DOCUMENT_MARKER, NULL, false).x : 0.0f;
+ const ImVec2 text_size = CalcTextSize(name, NULL, true) + ImVec2(marker_size_x, 0.0f);
+
+ // As a nice touch we try to ensure that centered title text doesn't get affected by visibility of Close/Collapse button,
+ // while uncentered title text will still reach edges correct.
+ if (pad_l > style.FramePadding.x)
+ pad_l += g.Style.ItemInnerSpacing.x;
+ if (pad_r > style.FramePadding.x)
+ pad_r += g.Style.ItemInnerSpacing.x;
+ if (style.WindowTitleAlign.x > 0.0f && style.WindowTitleAlign.x < 1.0f)
+ {
+ float centerness = ImSaturate(1.0f - ImFabs(style.WindowTitleAlign.x - 0.5f) * 2.0f); // 0.0f on either edges, 1.0f on center
+ float pad_extend = ImMin(ImMax(pad_l, pad_r), title_bar_rect.GetWidth() - pad_l - pad_r - text_size.x);
+ pad_l = ImMax(pad_l, pad_extend * centerness);
+ pad_r = ImMax(pad_r, pad_extend * centerness);
+ }
+
+ ImRect layout_r(title_bar_rect.Min.x + pad_l, title_bar_rect.Min.y, title_bar_rect.Max.x - pad_r, title_bar_rect.Max.y);
+ ImRect clip_r(layout_r.Min.x, layout_r.Min.y, layout_r.Max.x + g.Style.ItemInnerSpacing.x, layout_r.Max.y);
+ //if (g.IO.KeyCtrl) window->DrawList->AddRect(layout_r.Min, layout_r.Max, IM_COL32(255, 128, 0, 255)); // [DEBUG]
+ RenderTextClipped(layout_r.Min, layout_r.Max, name, NULL, &text_size, style.WindowTitleAlign, &clip_r);
+ if (flags & ImGuiWindowFlags_UnsavedDocument)
+ {
+ ImVec2 marker_pos = ImVec2(ImMax(layout_r.Min.x, layout_r.Min.x + (layout_r.GetWidth() - text_size.x) * style.WindowTitleAlign.x) + text_size.x, layout_r.Min.y) + ImVec2(2 - marker_size_x, 0.0f);
+ ImVec2 off = ImVec2(0.0f, IM_FLOOR(-g.FontSize * 0.25f));
+ RenderTextClipped(marker_pos + off, layout_r.Max + off, UNSAVED_DOCUMENT_MARKER, NULL, NULL, ImVec2(0, style.WindowTitleAlign.y), &clip_r);
+ }
}
void ImGui::UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window)
@@ -4555,10 +5311,13 @@ void ImGui::UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags
if (parent_window && !(flags & ImGuiWindowFlags_Modal) && (flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup)))
window->RootWindowForTitleBarHighlight = parent_window->RootWindowForTitleBarHighlight;
while (window->RootWindowForNav->Flags & ImGuiWindowFlags_NavFlattened)
+ {
+ IM_ASSERT(window->RootWindowForNav->ParentWindow != NULL);
window->RootWindowForNav = window->RootWindowForNav->ParentWindow;
+ }
}
-// Push a new ImGui window to add widgets to.
+// Push a new Dear ImGui window to add widgets to.
// - A default window called "Debug" is automatically stacked at the beginning of every frame so you can use widgets without explicitly calling a Begin/End pair.
// - Begin/End can be called multiple times during the frame with the same window name to append content.
// - The window name is used as a unique identifier to preserve window information across frames (and save rudimentary information to the .ini file).
@@ -4569,8 +5328,8 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{
ImGuiContext& g = *GImGui;
const ImGuiStyle& style = g.Style;
- IM_ASSERT(name != NULL); // Window name required
- IM_ASSERT(g.FrameScopeActive); // Forgot to call ImGui::NewFrame()
+ IM_ASSERT(name != NULL && name[0] != '\0'); // Window name required
+ IM_ASSERT(g.WithinFrameScope); // Forgot to call ImGui::NewFrame()
IM_ASSERT(g.FrameCountEnded != g.FrameCount); // Called ImGui::Render() or ImGui::EndFrame() and haven't called ImGui::NewFrame() again yet
// Find or create
@@ -4578,7 +5337,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
const bool window_just_created = (window == NULL);
if (window_just_created)
{
- ImVec2 size_on_first_use = (g.NextWindowData.SizeCond != 0) ? g.NextWindowData.SizeVal : ImVec2(0.0f, 0.0f); // Any condition flag will do since we are creating a new window here.
+ ImVec2 size_on_first_use = (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSize) ? g.NextWindowData.SizeVal : ImVec2(0.0f, 0.0f); // Any condition flag will do since we are creating a new window here.
window = CreateNewWindow(name, size_on_first_use, flags);
}
@@ -4591,23 +5350,14 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
const int current_frame = g.FrameCount;
const bool first_begin_of_the_frame = (window->LastFrameActive != current_frame);
- if (first_begin_of_the_frame)
- window->Flags = (ImGuiWindowFlags)flags;
- else
- flags = window->Flags;
-
- // Parent window is latched only on the first call to Begin() of the frame, so further append-calls can be done from a different window stack
- ImGuiWindow* parent_window_in_stack = g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back();
- ImGuiWindow* parent_window = first_begin_of_the_frame ? ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup)) ? parent_window_in_stack : NULL) : window->ParentWindow;
- IM_ASSERT(parent_window != NULL || !(flags & ImGuiWindowFlags_ChildWindow));
- window->HasCloseButton = (p_open != NULL);
+ window->IsFallbackWindow = (g.CurrentWindowStack.Size == 0 && g.WithinFrameScopeWithImplicitWindow);
// Update the Appearing flag
bool window_just_activated_by_user = (window->LastFrameActive < current_frame - 1); // Not using !WasActive because the implicit "Debug" window would always toggle off->on
- const bool window_just_appearing_after_hidden_for_resize = (window->HiddenFramesForResize > 0);
+ const bool window_just_appearing_after_hidden_for_resize = (window->HiddenFramesCannotSkipItems > 0);
if (flags & ImGuiWindowFlags_Popup)
{
- ImGuiPopupRef& popup_ref = g.OpenPopupStack[g.CurrentPopupStack.Size];
+ ImGuiPopupData& popup_ref = g.OpenPopupStack[g.BeginPopupStack.Size];
window_just_activated_by_user |= (window->PopupId != popup_ref.PopupId); // We recycle popups so treat window as activated if popup id changed
window_just_activated_by_user |= (window != popup_ref.Window);
}
@@ -4615,25 +5365,53 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
if (window->Appearing)
SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, true);
+ // Update Flags, LastFrameActive, BeginOrderXXX fields
+ if (first_begin_of_the_frame)
+ {
+ window->Flags = (ImGuiWindowFlags)flags;
+ window->LastFrameActive = current_frame;
+ window->LastTimeActive = (float)g.Time;
+ window->BeginOrderWithinParent = 0;
+ window->BeginOrderWithinContext = (short)(g.WindowsActiveCount++);
+ }
+ else
+ {
+ flags = window->Flags;
+ }
+
+ // Parent window is latched only on the first call to Begin() of the frame, so further append-calls can be done from a different window stack
+ ImGuiWindow* parent_window_in_stack = g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back();
+ ImGuiWindow* parent_window = first_begin_of_the_frame ? ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup)) ? parent_window_in_stack : NULL) : window->ParentWindow;
+ IM_ASSERT(parent_window != NULL || !(flags & ImGuiWindowFlags_ChildWindow));
+
+ // We allow window memory to be compacted so recreate the base stack when needed.
+ if (window->IDStack.Size == 0)
+ window->IDStack.push_back(window->ID);
+
// Add to stack
+ // We intentionally set g.CurrentWindow to NULL to prevent usage until when the viewport is set, then will call SetCurrentWindow()
g.CurrentWindowStack.push_back(window);
- SetCurrentWindow(window);
- CheckStacksSize(window, true);
+ g.CurrentWindow = NULL;
+ ErrorCheckBeginEndCompareStacksSize(window, true);
if (flags & ImGuiWindowFlags_Popup)
{
- ImGuiPopupRef& popup_ref = g.OpenPopupStack[g.CurrentPopupStack.Size];
+ ImGuiPopupData& popup_ref = g.OpenPopupStack[g.BeginPopupStack.Size];
popup_ref.Window = window;
- g.CurrentPopupStack.push_back(popup_ref);
+ g.BeginPopupStack.push_back(popup_ref);
window->PopupId = popup_ref.PopupId;
}
if (window_just_appearing_after_hidden_for_resize && !(flags & ImGuiWindowFlags_ChildWindow))
window->NavLastIds[0] = 0;
+ // Update ->RootWindow and others pointers (before any possible call to FocusWindow)
+ if (first_begin_of_the_frame)
+ UpdateWindowParentAndRootLinks(window, flags, parent_window);
+
// Process SetNextWindow***() calls
bool window_pos_set_by_api = false;
bool window_size_x_set_by_api = false, window_size_y_set_by_api = false;
- if (g.NextWindowData.PosCond)
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos)
{
window_pos_set_by_api = (window->SetWindowPosAllowFlags & g.NextWindowData.PosCond) != 0;
if (window_pos_set_by_api && ImLengthSqr(g.NextWindowData.PosPivotVal) > 0.00001f)
@@ -4649,26 +5427,19 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
SetWindowPos(window, g.NextWindowData.PosVal, g.NextWindowData.PosCond);
}
}
- if (g.NextWindowData.SizeCond)
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSize)
{
window_size_x_set_by_api = (window->SetWindowSizeAllowFlags & g.NextWindowData.SizeCond) != 0 && (g.NextWindowData.SizeVal.x > 0.0f);
window_size_y_set_by_api = (window->SetWindowSizeAllowFlags & g.NextWindowData.SizeCond) != 0 && (g.NextWindowData.SizeVal.y > 0.0f);
SetWindowSize(window, g.NextWindowData.SizeVal, g.NextWindowData.SizeCond);
}
- if (g.NextWindowData.ContentSizeCond)
- {
- // Adjust passed "client size" to become a "window size"
- window->SizeContentsExplicit = g.NextWindowData.ContentSizeVal;
- if (window->SizeContentsExplicit.y != 0.0f)
- window->SizeContentsExplicit.y += window->TitleBarHeight() + window->MenuBarHeight();
- }
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasContentSize)
+ window->ContentSizeExplicit = g.NextWindowData.ContentSizeVal;
else if (first_begin_of_the_frame)
- {
- window->SizeContentsExplicit = ImVec2(0.0f, 0.0f);
- }
- if (g.NextWindowData.CollapsedCond)
+ window->ContentSizeExplicit = ImVec2(0.0f, 0.0f);
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasCollapsed)
SetWindowCollapsed(window, g.NextWindowData.CollapsedVal, g.NextWindowData.CollapsedCond);
- if (g.NextWindowData.FocusCond)
+ if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasFocus)
FocusWindow(window);
if (window->Appearing)
SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, false);
@@ -4678,53 +5449,68 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{
// Initialize
const bool window_is_child_tooltip = (flags & ImGuiWindowFlags_ChildWindow) && (flags & ImGuiWindowFlags_Tooltip); // FIXME-WIP: Undocumented behavior of Child+Tooltip for pinned tooltip (#1345)
- UpdateWindowParentAndRootLinks(window, flags, parent_window);
-
window->Active = true;
- window->BeginOrderWithinParent = 0;
- window->BeginOrderWithinContext = g.WindowsActiveCount++;
- window->BeginCount = 0;
+ window->HasCloseButton = (p_open != NULL);
window->ClipRect = ImVec4(-FLT_MAX,-FLT_MAX,+FLT_MAX,+FLT_MAX);
- window->LastFrameActive = current_frame;
window->IDStack.resize(1);
+ // Restore buffer capacity when woken from a compacted state, to avoid
+ if (window->MemoryCompacted)
+ GcAwakeTransientWindowBuffers(window);
+
+ // Update stored window name when it changes (which can _only_ happen with the "###" operator, so the ID would stay unchanged).
+ // The title bar always display the 'name' parameter, so we only update the string storage if it needs to be visible to the end-user elsewhere.
+ bool window_title_visible_elsewhere = false;
+ if (g.NavWindowingList != NULL && (window->Flags & ImGuiWindowFlags_NoNavFocus) == 0) // Window titles visible when using CTRL+TAB
+ window_title_visible_elsewhere = true;
+ if (window_title_visible_elsewhere && !window_just_created && strcmp(name, window->Name) != 0)
+ {
+ size_t buf_len = (size_t)window->NameBufLen;
+ window->Name = ImStrdupcpy(window->Name, &buf_len, name);
+ window->NameBufLen = (int)buf_len;
+ }
+
// UPDATE CONTENTS SIZE, UPDATE HIDDEN STATUS
// Update contents size from last frame for auto-fitting (or use explicit size)
- window->SizeContents = CalcSizeContents(window);
- if (window->HiddenFramesRegular > 0)
- window->HiddenFramesRegular--;
- if (window->HiddenFramesForResize > 0)
- window->HiddenFramesForResize--;
+ window->ContentSize = CalcWindowContentSize(window);
+ if (window->HiddenFramesCanSkipItems > 0)
+ window->HiddenFramesCanSkipItems--;
+ if (window->HiddenFramesCannotSkipItems > 0)
+ window->HiddenFramesCannotSkipItems--;
// Hide new windows for one frame until they calculate their size
if (window_just_created && (!window_size_x_set_by_api || !window_size_y_set_by_api))
- window->HiddenFramesForResize = 1;
+ window->HiddenFramesCannotSkipItems = 1;
// Hide popup/tooltip window when re-opening while we measure size (because we recycle the windows)
- // We reset Size/SizeContents for reappearing popups/tooltips early in this function, so further code won't be tempted to use the old size.
+ // We reset Size/ContentSize for reappearing popups/tooltips early in this function, so further code won't be tempted to use the old size.
if (window_just_activated_by_user && (flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) != 0)
{
- window->HiddenFramesForResize = 1;
+ window->HiddenFramesCannotSkipItems = 1;
if (flags & ImGuiWindowFlags_AlwaysAutoResize)
{
if (!window_size_x_set_by_api)
window->Size.x = window->SizeFull.x = 0.f;
if (!window_size_y_set_by_api)
window->Size.y = window->SizeFull.y = 0.f;
- window->SizeContents = ImVec2(0.f, 0.f);
+ window->ContentSize = ImVec2(0.f, 0.f);
}
}
+ // SELECT VIEWPORT
+ // FIXME-VIEWPORT: In the docking/viewport branch, this is the point where we select the current viewport (which may affect the style)
SetCurrentWindow(window);
- // Lock border size and padding for the frame (so that altering them doesn't cause inconsistencies)
- window->WindowBorderSize = (flags & ImGuiWindowFlags_ChildWindow) ? style.ChildBorderSize : ((flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupBorderSize : style.WindowBorderSize;
+ // LOCK BORDER SIZE AND PADDING FOR THE FRAME (so that altering them doesn't cause inconsistencies)
+
+ if (flags & ImGuiWindowFlags_ChildWindow)
+ window->WindowBorderSize = style.ChildBorderSize;
+ else
+ window->WindowBorderSize = ((flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupBorderSize : style.WindowBorderSize;
window->WindowPadding = style.WindowPadding;
if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & (ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_Popup)) && window->WindowBorderSize == 0.0f)
window->WindowPadding = ImVec2(0.0f, (flags & ImGuiWindowFlags_MenuBar) ? style.WindowPadding.y : 0.0f);
- window->DC.MenuBarOffset.x = ImMax(ImMax(window->WindowPadding.x, style.ItemSpacing.x), g.NextWindowData.MenuBarOffsetMinVal.x);
- window->DC.MenuBarOffset.y = g.NextWindowData.MenuBarOffsetMinVal.y;
// Collapse window by double-clicking on title bar
// At this point we don't have a clipping rectangle setup yet, so we can use the title bar area for hit detection and drawing
@@ -4750,46 +5536,47 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
// SIZE
// Calculate auto-fit size, handle automatic resize
- const ImVec2 size_auto_fit = CalcSizeAutoFit(window, window->SizeContents);
- ImVec2 size_full_modified(FLT_MAX, FLT_MAX);
+ const ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, window->ContentSize);
+ bool use_current_size_for_scrollbar_x = window_just_created;
+ bool use_current_size_for_scrollbar_y = window_just_created;
if ((flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed)
{
// Using SetNextWindowSize() overrides ImGuiWindowFlags_AlwaysAutoResize, so it can be used on tooltips/popups, etc.
if (!window_size_x_set_by_api)
- window->SizeFull.x = size_full_modified.x = size_auto_fit.x;
+ {
+ window->SizeFull.x = size_auto_fit.x;
+ use_current_size_for_scrollbar_x = true;
+ }
if (!window_size_y_set_by_api)
- window->SizeFull.y = size_full_modified.y = size_auto_fit.y;
+ {
+ window->SizeFull.y = size_auto_fit.y;
+ use_current_size_for_scrollbar_y = true;
+ }
}
else if (window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0)
{
// Auto-fit may only grow window during the first few frames
// We still process initial auto-fit on collapsed windows to get a window width, but otherwise don't honor ImGuiWindowFlags_AlwaysAutoResize when collapsed.
if (!window_size_x_set_by_api && window->AutoFitFramesX > 0)
- window->SizeFull.x = size_full_modified.x = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.x, size_auto_fit.x) : size_auto_fit.x;
+ {
+ window->SizeFull.x = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.x, size_auto_fit.x) : size_auto_fit.x;
+ use_current_size_for_scrollbar_x = true;
+ }
if (!window_size_y_set_by_api && window->AutoFitFramesY > 0)
- window->SizeFull.y = size_full_modified.y = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.y, size_auto_fit.y) : size_auto_fit.y;
+ {
+ window->SizeFull.y = window->AutoFitOnlyGrows ? ImMax(window->SizeFull.y, size_auto_fit.y) : size_auto_fit.y;
+ use_current_size_for_scrollbar_y = true;
+ }
if (!window->Collapsed)
MarkIniSettingsDirty(window);
}
// Apply minimum/maximum window size constraints and final size
- window->SizeFull = CalcSizeAfterConstraint(window, window->SizeFull);
+ window->SizeFull = CalcWindowSizeAfterConstraint(window, window->SizeFull);
window->Size = window->Collapsed && !(flags & ImGuiWindowFlags_ChildWindow) ? window->TitleBarRect().GetSize() : window->SizeFull;
- // SCROLLBAR STATUS
-
- // Update scrollbar status (based on the Size that was effective during last frame or the auto-resized Size).
- if (!window->Collapsed)
- {
- // When reading the current size we need to read it after size constraints have been applied
- float size_x_for_scrollbars = size_full_modified.x != FLT_MAX ? window->SizeFull.x : window->SizeFullAtLastBegin.x;
- float size_y_for_scrollbars = size_full_modified.y != FLT_MAX ? window->SizeFull.y : window->SizeFullAtLastBegin.y;
- window->ScrollbarY = (flags & ImGuiWindowFlags_AlwaysVerticalScrollbar) || ((window->SizeContents.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar));
- window->ScrollbarX = (flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar) || ((window->SizeContents.x > size_x_for_scrollbars - (window->ScrollbarY ? style.ScrollbarSize : 0.0f)) && !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar));
- if (window->ScrollbarX && !window->ScrollbarY)
- window->ScrollbarY = (window->SizeContents.y > size_y_for_scrollbars - style.ScrollbarSize) && !(flags & ImGuiWindowFlags_NoScrollbar);
- window->ScrollbarSizes = ImVec2(window->ScrollbarY ? style.ScrollbarSize : 0.0f, window->ScrollbarX ? style.ScrollbarSize : 0.0f);
- }
+ // Decoration size
+ const float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
// POSITION
@@ -4798,21 +5585,22 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{
window->AutoPosLastDirection = ImGuiDir_None;
if ((flags & ImGuiWindowFlags_Popup) != 0 && !window_pos_set_by_api)
- window->Pos = g.CurrentPopupStack.back().OpenPopupPos;
+ window->Pos = g.BeginPopupStack.back().OpenPopupPos;
}
// Position child window
if (flags & ImGuiWindowFlags_ChildWindow)
{
- window->BeginOrderWithinParent = parent_window->DC.ChildWindows.Size;
+ IM_ASSERT(parent_window && parent_window->Active);
+ window->BeginOrderWithinParent = (short)parent_window->DC.ChildWindows.Size;
parent_window->DC.ChildWindows.push_back(window);
if (!(flags & ImGuiWindowFlags_Popup) && !window_pos_set_by_api && !window_is_child_tooltip)
window->Pos = parent_window->DC.CursorPos;
}
- const bool window_pos_with_pivot = (window->SetWindowPosVal.x != FLT_MAX && window->HiddenFramesForResize == 0);
+ const bool window_pos_with_pivot = (window->SetWindowPosVal.x != FLT_MAX && window->HiddenFramesCannotSkipItems == 0);
if (window_pos_with_pivot)
- SetWindowPos(window, ImMax(style.DisplaySafeAreaPadding, window->SetWindowPosVal - window->SizeFull * window->SetWindowPosPivot), 0); // Position given a pivot (e.g. for centering)
+ SetWindowPos(window, window->SetWindowPosVal - window->SizeFull * window->SetWindowPosPivot, 0); // Position given a pivot (e.g. for centering)
else if ((flags & ImGuiWindowFlags_ChildMenu) != 0)
window->Pos = FindBestWindowPosForPopup(window);
else if ((flags & ImGuiWindowFlags_Popup) != 0 && !window_pos_set_by_api && window_just_appearing_after_hidden_for_resize)
@@ -4820,14 +5608,15 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
else if ((flags & ImGuiWindowFlags_Tooltip) != 0 && !window_pos_set_by_api && !window_is_child_tooltip)
window->Pos = FindBestWindowPosForPopup(window);
- // Clamp position so it stays visible
- if (!(flags & ImGuiWindowFlags_ChildWindow))
+ // Clamp position/size so window stays visible within its viewport or monitor
+ // Ignore zero-sized display explicitly to avoid losing positions if a window manager reports zero-sized window when initializing or minimizing.
+ ImRect viewport_rect(GetViewportRect());
+ if (!window_pos_set_by_api && !(flags & ImGuiWindowFlags_ChildWindow) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
{
- if (!window_pos_set_by_api && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0 && g.IO.DisplaySize.x > 0.0f && g.IO.DisplaySize.y > 0.0f) // Ignore zero-sized display explicitly to avoid losing positions if a window manager reports zero-sized window when initializing or minimizing.
+ ImVec2 clamp_padding = ImMax(style.DisplayWindowPadding, style.DisplaySafeAreaPadding);
+ if (viewport_rect.GetWidth() > 0 && viewport_rect.GetHeight() > 0.0f)
{
- ImVec2 padding = ImMax(style.DisplayWindowPadding, style.DisplaySafeAreaPadding);
- window->Pos = ImMax(window->Pos + window->Size, padding) - window->Size;
- window->Pos = ImMin(window->Pos, g.IO.DisplaySize - padding);
+ ClampWindowRect(window, viewport_rect, clamp_padding);
}
}
window->Pos = ImFloor(window->Pos);
@@ -4835,50 +5624,113 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
// Lock window rounding for the frame (so that altering them doesn't cause inconsistencies)
window->WindowRounding = (flags & ImGuiWindowFlags_ChildWindow) ? style.ChildRounding : ((flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupRounding : style.WindowRounding;
- // Prepare for item focus requests
- window->FocusIdxAllRequestCurrent = (window->FocusIdxAllRequestNext == INT_MAX || window->FocusIdxAllCounter == -1) ? INT_MAX : (window->FocusIdxAllRequestNext + (window->FocusIdxAllCounter+1)) % (window->FocusIdxAllCounter+1);
- window->FocusIdxTabRequestCurrent = (window->FocusIdxTabRequestNext == INT_MAX || window->FocusIdxTabCounter == -1) ? INT_MAX : (window->FocusIdxTabRequestNext + (window->FocusIdxTabCounter+1)) % (window->FocusIdxTabCounter+1);
- window->FocusIdxAllCounter = window->FocusIdxTabCounter = -1;
- window->FocusIdxAllRequestNext = window->FocusIdxTabRequestNext = INT_MAX;
+ // Apply window focus (new and reactivated windows are moved to front)
+ bool want_focus = false;
+ if (window_just_activated_by_user && !(flags & ImGuiWindowFlags_NoFocusOnAppearing))
+ {
+ if (flags & ImGuiWindowFlags_Popup)
+ want_focus = true;
+ else if ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip)) == 0)
+ want_focus = true;
+ }
+
+ // Handle manual resize: Resize Grips, Borders, Gamepad
+ int border_held = -1;
+ ImU32 resize_grip_col[4] = {};
+ const int resize_grip_count = g.IO.ConfigWindowsResizeFromEdges ? 2 : 1; // Allow resize from lower-left if we have the mouse cursor feedback for it.
+ const float resize_grip_draw_size = IM_FLOOR(ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f));
+ if (!window->Collapsed)
+ if (UpdateManualResize(window, size_auto_fit, &border_held, resize_grip_count, &resize_grip_col[0]))
+ use_current_size_for_scrollbar_x = use_current_size_for_scrollbar_y = true;
+ window->ResizeBorderHeld = (signed char)border_held;
+
+ // SCROLLBAR VISIBILITY
+
+ // Update scrollbar visibility (based on the Size that was effective during last frame or the auto-resized Size).
+ if (!window->Collapsed)
+ {
+ // When reading the current size we need to read it after size constraints have been applied.
+ // When we use InnerRect here we are intentionally reading last frame size, same for ScrollbarSizes values before we set them again.
+ ImVec2 avail_size_from_current_frame = ImVec2(window->SizeFull.x, window->SizeFull.y - decoration_up_height);
+ ImVec2 avail_size_from_last_frame = window->InnerRect.GetSize() + window->ScrollbarSizes;
+ ImVec2 needed_size_from_last_frame = window_just_created ? ImVec2(0, 0) : window->ContentSize + window->WindowPadding * 2.0f;
+ float size_x_for_scrollbars = use_current_size_for_scrollbar_x ? avail_size_from_current_frame.x : avail_size_from_last_frame.x;
+ float size_y_for_scrollbars = use_current_size_for_scrollbar_y ? avail_size_from_current_frame.y : avail_size_from_last_frame.y;
+ //bool scrollbar_y_from_last_frame = window->ScrollbarY; // FIXME: May want to use that in the ScrollbarX expression? How many pros vs cons?
+ window->ScrollbarY = (flags & ImGuiWindowFlags_AlwaysVerticalScrollbar) || ((needed_size_from_last_frame.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar));
+ window->ScrollbarX = (flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar) || ((needed_size_from_last_frame.x > size_x_for_scrollbars - (window->ScrollbarY ? style.ScrollbarSize : 0.0f)) && !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar));
+ if (window->ScrollbarX && !window->ScrollbarY)
+ window->ScrollbarY = (needed_size_from_last_frame.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar);
+ window->ScrollbarSizes = ImVec2(window->ScrollbarY ? style.ScrollbarSize : 0.0f, window->ScrollbarX ? style.ScrollbarSize : 0.0f);
+ }
+
+ // UPDATE RECTANGLES (1- THOSE NOT AFFECTED BY SCROLLING)
+ // Update various regions. Variables they depends on should be set above in this function.
+ // We set this up after processing the resize grip so that our rectangles doesn't lag by a frame.
+
+ // Outer rectangle
+ // Not affected by window border size. Used by:
+ // - FindHoveredWindow() (w/ extra padding when border resize is enabled)
+ // - Begin() initial clipping rect for drawing window background and borders.
+ // - Begin() clipping whole child
+ const ImRect host_rect = ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip) ? parent_window->ClipRect : viewport_rect;
+ const ImRect outer_rect = window->Rect();
+ const ImRect title_bar_rect = window->TitleBarRect();
+ window->OuterRectClipped = outer_rect;
+ window->OuterRectClipped.ClipWith(host_rect);
+
+ // Inner rectangle
+ // Not affected by window border size. Used by:
+ // - InnerClipRect
+ // - ScrollToBringRectIntoView()
+ // - NavUpdatePageUpPageDown()
+ // - Scrollbar()
+ window->InnerRect.Min.x = window->Pos.x;
+ window->InnerRect.Min.y = window->Pos.y + decoration_up_height;
+ window->InnerRect.Max.x = window->Pos.x + window->Size.x - window->ScrollbarSizes.x;
+ window->InnerRect.Max.y = window->Pos.y + window->Size.y - window->ScrollbarSizes.y;
+
+ // Inner clipping rectangle.
+ // Will extend a little bit outside the normal work region.
+ // This is to allow e.g. Selectable or CollapsingHeader or some separators to cover that space.
+ // Force round operator last to ensure that e.g. (int)(max.x-min.x) in user's render code produce correct result.
+ // Note that if our window is collapsed we will end up with an inverted (~null) clipping rectangle which is the correct behavior.
+ // Affected by window/frame border size. Used by:
+ // - Begin() initial clip rect
+ float top_border_size = (((flags & ImGuiWindowFlags_MenuBar) || !(flags & ImGuiWindowFlags_NoTitleBar)) ? style.FrameBorderSize : window->WindowBorderSize);
+ window->InnerClipRect.Min.x = ImFloor(0.5f + window->InnerRect.Min.x + ImMax(ImFloor(window->WindowPadding.x * 0.5f), window->WindowBorderSize));
+ window->InnerClipRect.Min.y = ImFloor(0.5f + window->InnerRect.Min.y + top_border_size);
+ window->InnerClipRect.Max.x = ImFloor(0.5f + window->InnerRect.Max.x - ImMax(ImFloor(window->WindowPadding.x * 0.5f), window->WindowBorderSize));
+ window->InnerClipRect.Max.y = ImFloor(0.5f + window->InnerRect.Max.y - window->WindowBorderSize);
+ window->InnerClipRect.ClipWithFull(host_rect);
+
+ // Default item width. Make it proportional to window size if window manually resizes
+ if (window->Size.x > 0.0f && !(flags & ImGuiWindowFlags_Tooltip) && !(flags & ImGuiWindowFlags_AlwaysAutoResize))
+ window->ItemWidthDefault = ImFloor(window->Size.x * 0.65f);
+ else
+ window->ItemWidthDefault = ImFloor(g.FontSize * 16.0f);
+
+ // SCROLLING
+
+ // Lock down maximum scrolling
+ // The value of ScrollMax are ahead from ScrollbarX/ScrollbarY which is intentionally using InnerRect from previous rect in order to accommodate
+ // for right/bottom aligned items without creating a scrollbar.
+ window->ScrollMax.x = ImMax(0.0f, window->ContentSize.x + window->WindowPadding.x * 2.0f - window->InnerRect.GetWidth());
+ window->ScrollMax.y = ImMax(0.0f, window->ContentSize.y + window->WindowPadding.y * 2.0f - window->InnerRect.GetHeight());
// Apply scrolling
window->Scroll = CalcNextScrollFromScrollTargetAndClamp(window, true);
window->ScrollTarget = ImVec2(FLT_MAX, FLT_MAX);
- // Apply window focus (new and reactivated windows are moved to front)
- bool want_focus = false;
- if (window_just_activated_by_user && !(flags & ImGuiWindowFlags_NoFocusOnAppearing))
- if (!(flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip)) || (flags & ImGuiWindowFlags_Popup))
- want_focus = true;
-
- // Handle manual resize: Resize Grips, Borders, Gamepad
- int border_held = -1;
- ImU32 resize_grip_col[4] = { 0 };
- const int resize_grip_count = g.IO.ConfigResizeWindowsFromEdges ? 2 : 1; // 4
- const float grip_draw_size = (float)(int)ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f);
- if (!window->Collapsed)
- UpdateManualResize(window, size_auto_fit, &border_held, resize_grip_count, &resize_grip_col[0]);
-
- // Default item width. Make it proportional to window size if window manually resizes
- if (window->Size.x > 0.0f && !(flags & ImGuiWindowFlags_Tooltip) && !(flags & ImGuiWindowFlags_AlwaysAutoResize))
- window->ItemWidthDefault = (float)(int)(window->Size.x * 0.65f);
- else
- window->ItemWidthDefault = (float)(int)(g.FontSize * 16.0f);
-
// DRAWING
// Setup draw list and outer clipping rectangle
window->DrawList->Clear();
- window->DrawList->Flags = (g.Style.AntiAliasedLines ? ImDrawListFlags_AntiAliasedLines : 0) | (g.Style.AntiAliasedFill ? ImDrawListFlags_AntiAliasedFill : 0);
window->DrawList->PushTextureID(g.Font->ContainerAtlas->TexID);
- ImRect viewport_rect(GetViewportRect());
- if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip)
- PushClipRect(parent_window->ClipRect.Min, parent_window->ClipRect.Max, true);
- else
- PushClipRect(viewport_rect.Min, viewport_rect.Max, true);
+ PushClipRect(host_rect.Min, host_rect.Max, false);
// Draw modal window background (darkens what is behind them, all viewports)
- const bool dim_bg_for_modal = (flags & ImGuiWindowFlags_Modal) && window == GetFrontMostPopupModal() && window->HiddenFramesForResize <= 0;
+ const bool dim_bg_for_modal = (flags & ImGuiWindowFlags_Modal) && window == GetTopMostPopupModal() && window->HiddenFramesCannotSkipItems <= 0;
const bool dim_bg_for_window_list = g.NavWindowingTargetAnim && (window == g.NavWindowingTargetAnim->RootWindow);
if (dim_bg_for_modal || dim_bg_for_window_list)
{
@@ -4895,78 +5747,26 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha * 0.25f), g.Style.WindowRounding);
}
- // Draw window + handle manual resize
- const float window_rounding = window->WindowRounding;
- const float window_border_size = window->WindowBorderSize;
- const ImGuiWindow* window_to_highlight = g.NavWindowingTarget ? g.NavWindowingTarget : g.NavWindow;
- const bool title_bar_is_highlight = want_focus || (window_to_highlight && window->RootWindowForTitleBarHighlight == window_to_highlight->RootWindowForTitleBarHighlight);
- const ImRect title_bar_rect = window->TitleBarRect();
- if (window->Collapsed)
+ // Since 1.71, child window can render their decoration (bg color, border, scrollbars, etc.) within their parent to save a draw call.
+ // When using overlapping child windows, this will break the assumption that child z-order is mapped to submission order.
+ // We disable this when the parent window has zero vertices, which is a common pattern leading to laying out multiple overlapping child.
+ // We also disabled this when we have dimming overlay behind this specific one child.
+ // FIXME: More code may rely on explicit sorting of overlapping child window and would need to disable this somehow. Please get in contact if you are affected.
{
- // Title bar only
- float backup_border_size = style.FrameBorderSize;
- g.Style.FrameBorderSize = window->WindowBorderSize;
- ImU32 title_bar_col = GetColorU32((title_bar_is_highlight && !g.NavDisableHighlight) ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBgCollapsed);
- RenderFrame(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, true, window_rounding);
- g.Style.FrameBorderSize = backup_border_size;
- }
- else
- {
- // Window background
- if (!(flags & ImGuiWindowFlags_NoBackground))
- {
- ImU32 bg_col = GetColorU32(GetWindowBgColorIdxFromFlags(flags));
- if (g.NextWindowData.BgAlphaCond != 0)
- bg_col = (bg_col & ~IM_COL32_A_MASK) | (IM_F32_TO_INT8_SAT(g.NextWindowData.BgAlphaVal) << IM_COL32_A_SHIFT);
- window->DrawList->AddRectFilled(window->Pos + ImVec2(0, window->TitleBarHeight()), window->Pos + window->Size, bg_col, window_rounding, (flags & ImGuiWindowFlags_NoTitleBar) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Bot);
- }
- g.NextWindowData.BgAlphaCond = 0;
+ bool render_decorations_in_parent = false;
+ if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip)
+ if (window->DrawList->CmdBuffer.back().ElemCount == 0 && parent_window->DrawList->VtxBuffer.Size > 0)
+ render_decorations_in_parent = true;
+ if (render_decorations_in_parent)
+ window->DrawList = parent_window->DrawList;
- // Title bar
- ImU32 title_bar_col = GetColorU32(window->Collapsed ? ImGuiCol_TitleBgCollapsed : title_bar_is_highlight ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg);
- if (!(flags & ImGuiWindowFlags_NoTitleBar))
- window->DrawList->AddRectFilled(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, window_rounding, ImDrawCornerFlags_Top);
+ // Handle title bar, scrollbar, resize grips and resize borders
+ const ImGuiWindow* window_to_highlight = g.NavWindowingTarget ? g.NavWindowingTarget : g.NavWindow;
+ const bool title_bar_is_highlight = want_focus || (window_to_highlight && window->RootWindowForTitleBarHighlight == window_to_highlight->RootWindowForTitleBarHighlight);
+ RenderWindowDecorations(window, title_bar_rect, title_bar_is_highlight, resize_grip_count, resize_grip_col, resize_grip_draw_size);
- // Menu bar
- if (flags & ImGuiWindowFlags_MenuBar)
- {
- ImRect menu_bar_rect = window->MenuBarRect();
- menu_bar_rect.ClipWith(window->Rect()); // Soft clipping, in particular child window don't have minimum size covering the menu bar so this is useful for them.
- window->DrawList->AddRectFilled(menu_bar_rect.Min, menu_bar_rect.Max, GetColorU32(ImGuiCol_MenuBarBg), (flags & ImGuiWindowFlags_NoTitleBar) ? window_rounding : 0.0f, ImDrawCornerFlags_Top);
- if (style.FrameBorderSize > 0.0f && menu_bar_rect.Max.y < window->Pos.y + window->Size.y)
- window->DrawList->AddLine(menu_bar_rect.GetBL(), menu_bar_rect.GetBR(), GetColorU32(ImGuiCol_Border), style.FrameBorderSize);
- }
-
- // Scrollbars
- if (window->ScrollbarX)
- Scrollbar(ImGuiLayoutType_Horizontal);
- if (window->ScrollbarY)
- Scrollbar(ImGuiLayoutType_Vertical);
-
- // Render resize grips (after their input handling so we don't have a frame of latency)
- if (!(flags & ImGuiWindowFlags_NoResize))
- {
- for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++)
- {
- const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n];
- const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPos);
- window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(window_border_size, grip_draw_size) : ImVec2(grip_draw_size, window_border_size)));
- window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(grip_draw_size, window_border_size) : ImVec2(window_border_size, grip_draw_size)));
- window->DrawList->PathArcToFast(ImVec2(corner.x + grip.InnerDir.x * (window_rounding + window_border_size), corner.y + grip.InnerDir.y * (window_rounding + window_border_size)), window_rounding, grip.AngleMin12, grip.AngleMax12);
- window->DrawList->PathFillConvex(resize_grip_col[resize_grip_n]);
- }
- }
-
- // Borders
- if (window_border_size > 0.0f && !(flags & ImGuiWindowFlags_NoBackground))
- window->DrawList->AddRect(window->Pos, window->Pos + window->Size, GetColorU32(ImGuiCol_Border), window_rounding, ImDrawCornerFlags_All, window_border_size);
- if (border_held != -1)
- {
- ImRect border = GetResizeBorderRect(window, border_held, grip_draw_size, 0.0f);
- window->DrawList->AddLine(border.Min, border.Max, GetColorU32(ImGuiCol_SeparatorActive), ImMax(1.0f, window_border_size));
- }
- if (style.FrameBorderSize > 0 && !(flags & ImGuiWindowFlags_NoTitleBar))
- window->DrawList->AddLine(title_bar_rect.GetBL() + ImVec2(style.WindowBorderSize, -1), title_bar_rect.GetBR() + ImVec2(-style.WindowBorderSize, -1), GetColorU32(ImGuiCol_Border), style.FrameBorderSize);
+ if (render_decorations_in_parent)
+ window->DrawList = &window->DrawListInst;
}
// Draw navigation selection/windowing rectangle border
@@ -4983,48 +5783,71 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha), rounding, ~0, 3.0f);
}
- // Store a backup of SizeFull which we will use next frame to decide if we need scrollbars.
- window->SizeFullAtLastBegin = window->SizeFull;
+ // UPDATE RECTANGLES (2- THOSE AFFECTED BY SCROLLING)
- // Update various regions. Variables they depends on are set above in this function.
- // FIXME: window->ContentsRegionRect.Max is currently very misleading / partly faulty, but some BeginChild() patterns relies on it.
- window->ContentsRegionRect.Min.x = window->Pos.x - window->Scroll.x + window->WindowPadding.x;
- window->ContentsRegionRect.Min.y = window->Pos.y - window->Scroll.y + window->WindowPadding.y + window->TitleBarHeight() + window->MenuBarHeight();
- window->ContentsRegionRect.Max.x = window->Pos.x - window->Scroll.x - window->WindowPadding.x + (window->SizeContentsExplicit.x != 0.0f ? window->SizeContentsExplicit.x : (window->Size.x - window->ScrollbarSizes.x));
- window->ContentsRegionRect.Max.y = window->Pos.y - window->Scroll.y - window->WindowPadding.y + (window->SizeContentsExplicit.y != 0.0f ? window->SizeContentsExplicit.y : (window->Size.y - window->ScrollbarSizes.y));
+ // Work rectangle.
+ // Affected by window padding and border size. Used by:
+ // - Columns() for right-most edge
+ // - TreeNode(), CollapsingHeader() for right-most edge
+ // - BeginTabBar() for right-most edge
+ const bool allow_scrollbar_x = !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar);
+ const bool allow_scrollbar_y = !(flags & ImGuiWindowFlags_NoScrollbar);
+ const float work_rect_size_x = (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : ImMax(allow_scrollbar_x ? window->ContentSize.x : 0.0f, window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x));
+ const float work_rect_size_y = (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : ImMax(allow_scrollbar_y ? window->ContentSize.y : 0.0f, window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y));
+ window->WorkRect.Min.x = ImFloor(window->InnerRect.Min.x - window->Scroll.x + ImMax(window->WindowPadding.x, window->WindowBorderSize));
+ window->WorkRect.Min.y = ImFloor(window->InnerRect.Min.y - window->Scroll.y + ImMax(window->WindowPadding.y, window->WindowBorderSize));
+ window->WorkRect.Max.x = window->WorkRect.Min.x + work_rect_size_x;
+ window->WorkRect.Max.y = window->WorkRect.Min.y + work_rect_size_y;
+
+ // [LEGACY] Content Region
+ // FIXME-OBSOLETE: window->ContentRegionRect.Max is currently very misleading / partly faulty, but some BeginChild() patterns relies on it.
+ // Used by:
+ // - Mouse wheel scrolling + many other things
+ window->ContentRegionRect.Min.x = window->Pos.x - window->Scroll.x + window->WindowPadding.x;
+ window->ContentRegionRect.Min.y = window->Pos.y - window->Scroll.y + window->WindowPadding.y + decoration_up_height;
+ window->ContentRegionRect.Max.x = window->ContentRegionRect.Min.x + (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : (window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x));
+ window->ContentRegionRect.Max.y = window->ContentRegionRect.Min.y + (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : (window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y));
// Setup drawing context
// (NB: That term "drawing context / DC" lost its meaning a long time ago. Initially was meant to hold transient data only. Nowadays difference between window-> and window->DC-> is dubious.)
window->DC.Indent.x = 0.0f + window->WindowPadding.x - window->Scroll.x;
window->DC.GroupOffset.x = 0.0f;
window->DC.ColumnsOffset.x = 0.0f;
- window->DC.CursorStartPos = window->Pos + ImVec2(window->DC.Indent.x + window->DC.ColumnsOffset.x, window->TitleBarHeight() + window->MenuBarHeight() + window->WindowPadding.y - window->Scroll.y);
+ window->DC.CursorStartPos = window->Pos + ImVec2(window->DC.Indent.x + window->DC.ColumnsOffset.x, decoration_up_height + window->WindowPadding.y - window->Scroll.y);
window->DC.CursorPos = window->DC.CursorStartPos;
window->DC.CursorPosPrevLine = window->DC.CursorPos;
window->DC.CursorMaxPos = window->DC.CursorStartPos;
- window->DC.CurrentLineSize = window->DC.PrevLineSize = ImVec2(0.0f, 0.0f);
- window->DC.CurrentLineTextBaseOffset = window->DC.PrevLineTextBaseOffset = 0.0f;
- window->DC.NavHideHighlightOneFrame = false;
- window->DC.NavHasScroll = (GetScrollMaxY() > 0.0f);
+ window->DC.CurrLineSize = window->DC.PrevLineSize = ImVec2(0.0f, 0.0f);
+ window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset = 0.0f;
+
+ window->DC.NavLayerCurrent = ImGuiNavLayer_Main;
+ window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main);
window->DC.NavLayerActiveMask = window->DC.NavLayerActiveMaskNext;
window->DC.NavLayerActiveMaskNext = 0x00;
+ window->DC.NavFocusScopeIdCurrent = 0;
+ window->DC.NavHideHighlightOneFrame = false;
+ window->DC.NavHasScroll = (window->ScrollMax.y > 0.0f);
+
window->DC.MenuBarAppending = false;
- window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f;
+ window->DC.MenuBarOffset.x = ImMax(ImMax(window->WindowPadding.x, style.ItemSpacing.x), g.NextWindowData.MenuBarOffsetMinVal.x);
+ window->DC.MenuBarOffset.y = g.NextWindowData.MenuBarOffsetMinVal.y;
+ window->DC.MenuColumns.Update(3, style.ItemSpacing.x, window_just_activated_by_user);
+ window->DC.TreeDepth = 0;
+ window->DC.TreeJumpToParentOnPopMask = 0x00;
window->DC.ChildWindows.resize(0);
+ window->DC.StateStorage = &window->StateStorage;
+ window->DC.CurrentColumns = NULL;
window->DC.LayoutType = ImGuiLayoutType_Vertical;
window->DC.ParentLayoutType = parent_window ? parent_window->DC.LayoutType : ImGuiLayoutType_Vertical;
+ window->DC.FocusCounterRegular = window->DC.FocusCounterTabStop = -1;
+
window->DC.ItemFlags = parent_window ? parent_window->DC.ItemFlags : ImGuiItemFlags_Default_;
window->DC.ItemWidth = window->ItemWidthDefault;
window->DC.TextWrapPos = -1.0f; // disabled
window->DC.ItemFlagsStack.resize(0);
window->DC.ItemWidthStack.resize(0);
window->DC.TextWrapPosStack.resize(0);
- window->DC.ColumnsSet = NULL;
- window->DC.TreeDepth = 0;
- window->DC.TreeDepthMayJumpToParentOnPop = 0x00;
- window->DC.StateStorage = &window->StateStorage;
window->DC.GroupStack.resize(0);
- window->MenuColumns.Update(3, style.ItemSpacing.x, window_just_activated_by_user);
if ((flags & ImGuiWindowFlags_ChildWindow) && (window->DC.ItemFlags != parent_window->DC.ItemFlags))
{
@@ -5046,48 +5869,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
// Title bar
if (!(flags & ImGuiWindowFlags_NoTitleBar))
- {
- // Close & collapse button are on layer 1 (same as menus) and don't default focus
- const ImGuiItemFlags item_flags_backup = window->DC.ItemFlags;
- window->DC.ItemFlags |= ImGuiItemFlags_NoNavDefaultFocus;
- window->DC.NavLayerCurrent++;
- window->DC.NavLayerCurrentMask <<= 1;
-
- // Collapse button
- if (!(flags & ImGuiWindowFlags_NoCollapse))
- if (CollapseButton(window->GetID("#COLLAPSE"), window->Pos))
- window->WantCollapseToggle = true; // Defer collapsing to next frame as we are too far in the Begin() function
-
- // Close button
- if (p_open != NULL)
- {
- const float pad = style.FramePadding.y;
- const float rad = g.FontSize * 0.5f;
- if (CloseButton(window->GetID("#CLOSE"), window->Rect().GetTR() + ImVec2(-pad - rad, pad + rad), rad + 1))
- *p_open = false;
- }
-
- window->DC.NavLayerCurrent--;
- window->DC.NavLayerCurrentMask >>= 1;
- window->DC.ItemFlags = item_flags_backup;
-
- // Title text (FIXME: refactor text alignment facilities along with RenderText helpers, this is too much code for what it does.)
- ImVec2 text_size = CalcTextSize(name, NULL, true);
- ImRect text_r = title_bar_rect;
- float pad_left = (flags & ImGuiWindowFlags_NoCollapse) ? style.FramePadding.x : (style.FramePadding.x + g.FontSize + style.ItemInnerSpacing.x);
- float pad_right = (p_open == NULL) ? style.FramePadding.x : (style.FramePadding.x + g.FontSize + style.ItemInnerSpacing.x);
- if (style.WindowTitleAlign.x > 0.0f)
- pad_right = ImLerp(pad_right, pad_left, style.WindowTitleAlign.x);
- text_r.Min.x += pad_left;
- text_r.Max.x -= pad_right;
- ImRect clip_rect = text_r;
- clip_rect.Max.x = window->Pos.x + window->Size.x - (p_open ? title_bar_rect.GetHeight() - 3 : style.FramePadding.x); // Match the size of CloseButton()
- RenderTextClipped(text_r.Min, text_r.Max, name, NULL, &text_size, style.WindowTitleAlign, &clip_rect);
- }
-
- // Save clipped aabb so we can access it in constant-time in FindHoveredWindow()
- window->OuterRectClipped = window->Rect();
- window->OuterRectClipped.ClipWith(window->ClipRect);
+ RenderWindowTitleBarContents(window, title_bar_rect, name, p_open);
// Pressing CTRL+C while holding on a window copy its content to the clipboard
// This works but 1. doesn't handle multiple Begin/End pairs, 2. recursing into another Begin/End pair - so we need to work that out and add better logging scope.
@@ -5095,29 +5877,23 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
/*
if (g.ActiveId == move_id)
if (g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_C))
- ImGui::LogToClipboard();
+ LogToClipboard();
*/
- // Inner rectangle
- // We set this up after processing the resize grip so that our clip rectangle doesn't lag by a frame
- // Note that if our window is collapsed we will end up with an inverted (~null) clipping rectangle which is the correct behavior.
- window->InnerMainRect.Min.x = title_bar_rect.Min.x + window->WindowBorderSize;
- window->InnerMainRect.Min.y = title_bar_rect.Max.y + window->MenuBarHeight() + (((flags & ImGuiWindowFlags_MenuBar) || !(flags & ImGuiWindowFlags_NoTitleBar)) ? style.FrameBorderSize : window->WindowBorderSize);
- window->InnerMainRect.Max.x = window->Pos.x + window->Size.x - window->ScrollbarSizes.x - window->WindowBorderSize;
- window->InnerMainRect.Max.y = window->Pos.y + window->Size.y - window->ScrollbarSizes.y - window->WindowBorderSize;
- //window->DrawList->AddRect(window->InnerRect.Min, window->InnerRect.Max, IM_COL32_WHITE);
-
- // Inner clipping rectangle
- // Force round operator last to ensure that e.g. (int)(max.x-min.x) in user's render code produce correct result.
- window->InnerClipRect.Min.x = ImFloor(0.5f + window->InnerMainRect.Min.x + ImMax(0.0f, ImFloor(window->WindowPadding.x*0.5f - window->WindowBorderSize)));
- window->InnerClipRect.Min.y = ImFloor(0.5f + window->InnerMainRect.Min.y);
- window->InnerClipRect.Max.x = ImFloor(0.5f + window->InnerMainRect.Max.x - ImMax(0.0f, ImFloor(window->WindowPadding.x*0.5f - window->WindowBorderSize)));
- window->InnerClipRect.Max.y = ImFloor(0.5f + window->InnerMainRect.Max.y);
-
- // After Begin() we fill the last item / hovered data based on title bar data. It is a standard behavior (to allow creation of context menus on title bar only, etc.).
+ // We fill last item data based on Title Bar/Tab, in order for IsItemHovered() and IsItemActive() to be usable after Begin().
+ // This is useful to allow creating context menus on title bar only, etc.
window->DC.LastItemId = window->MoveId;
window->DC.LastItemStatusFlags = IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max, false) ? ImGuiItemStatusFlags_HoveredRect : 0;
window->DC.LastItemRect = title_bar_rect;
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+ if (!(window->Flags & ImGuiWindowFlags_NoTitleBar))
+ IMGUI_TEST_ENGINE_ITEM_ADD(window->DC.LastItemRect, window->DC.LastItemId);
+#endif
+ }
+ else
+ {
+ // Append
+ SetCurrentWindow(window);
}
PushClipRect(window->InnerClipRect.Min, window->InnerClipRect.Max, true);
@@ -5127,58 +5903,60 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window->WriteAccessed = false;
window->BeginCount++;
- g.NextWindowData.Clear();
+ g.NextWindowData.ClearFlags();
if (flags & ImGuiWindowFlags_ChildWindow)
{
// Child window can be out of sight and have "negative" clip windows.
// Mark them as collapsed so commands are skipped earlier (we can't manually collapse them because they have no title bar).
IM_ASSERT((flags & ImGuiWindowFlags_NoTitleBar) != 0);
-
if (!(flags & ImGuiWindowFlags_AlwaysAutoResize) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
if (window->OuterRectClipped.Min.x >= window->OuterRectClipped.Max.x || window->OuterRectClipped.Min.y >= window->OuterRectClipped.Max.y)
- window->HiddenFramesRegular = 1;
+ window->HiddenFramesCanSkipItems = 1;
- // Completely hide along with parent or if parent is collapsed
- if (parent_window && (parent_window->Collapsed || parent_window->Hidden))
- window->HiddenFramesRegular = 1;
+ // Hide along with parent or if parent is collapsed
+ if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCanSkipItems > 0))
+ window->HiddenFramesCanSkipItems = 1;
+ if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCannotSkipItems > 0))
+ window->HiddenFramesCannotSkipItems = 1;
}
// Don't render if style alpha is 0.0 at the time of Begin(). This is arbitrary and inconsistent but has been there for a long while (may remove at some point)
if (style.Alpha <= 0.0f)
- window->HiddenFramesRegular = 1;
+ window->HiddenFramesCanSkipItems = 1;
// Update the Hidden flag
- window->Hidden = (window->HiddenFramesRegular > 0) || (window->HiddenFramesForResize);
+ window->Hidden = (window->HiddenFramesCanSkipItems > 0) || (window->HiddenFramesCannotSkipItems > 0);
- // Return false if we don't intend to display anything to allow user to perform an early out optimization
- window->SkipItems = (window->Collapsed || !window->Active || window->Hidden) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0 && window->HiddenFramesForResize <= 0;
+ // Update the SkipItems flag, used to early out of all items functions (no layout required)
+ bool skip_items = false;
+ if (window->Collapsed || !window->Active || window->Hidden)
+ if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0 && window->HiddenFramesCannotSkipItems <= 0)
+ skip_items = true;
+ window->SkipItems = skip_items;
- return !window->SkipItems;
+ return !skip_items;
}
-// Old Begin() API with 5 parameters, avoid calling this version directly! Use SetNextWindowSize()/SetNextWindowBgAlpha() + Begin() instead.
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_first_use, float bg_alpha_override, ImGuiWindowFlags flags)
-{
- // Old API feature: we could pass the initial window size as a parameter. This was misleading because it only had an effect if the window didn't have data in the .ini file.
- if (size_first_use.x != 0.0f || size_first_use.y != 0.0f)
- ImGui::SetNextWindowSize(size_first_use, ImGuiCond_FirstUseEver);
-
- // Old API feature: override the window background alpha with a parameter.
- if (bg_alpha_override >= 0.0f)
- ImGui::SetNextWindowBgAlpha(bg_alpha_override);
-
- return ImGui::Begin(name, p_open, flags);
-}
-#endif // IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-
void ImGui::End()
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
- if (window->DC.ColumnsSet != NULL)
+ // Error checking: verify that user hasn't called End() too many times!
+ if (g.CurrentWindowStack.Size <= 1 && g.WithinFrameScopeWithImplicitWindow)
+ {
+ IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size > 1, "Calling End() too many times!");
+ return;
+ }
+ IM_ASSERT(g.CurrentWindowStack.Size > 0);
+
+ // Error checking: verify that user doesn't directly call End() on a child window.
+ if (window->Flags & ImGuiWindowFlags_ChildWindow)
+ IM_ASSERT_USER_ERROR(g.WithinEndChild, "Must call EndChild() and not End()!");
+
+ // Close anything that is open
+ if (window->DC.CurrentColumns)
EndColumns();
PopClipRect(); // Inner window clip rectangle
@@ -5189,8 +5967,8 @@ void ImGui::End()
// Pop from window stack
g.CurrentWindowStack.pop_back();
if (window->Flags & ImGuiWindowFlags_Popup)
- g.CurrentPopupStack.pop_back();
- CheckStacksSize(window, false);
+ g.BeginPopupStack.pop_back();
+ ErrorCheckBeginEndCompareStacksSize(window, false);
SetCurrentWindow(g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back());
}
@@ -5199,7 +5977,7 @@ void ImGui::BringWindowToFocusFront(ImGuiWindow* window)
ImGuiContext& g = *GImGui;
if (g.WindowsFocusOrder.back() == window)
return;
- for (int i = g.WindowsFocusOrder.Size - 2; i >= 0; i--) // We can ignore the front most window
+ for (int i = g.WindowsFocusOrder.Size - 2; i >= 0; i--) // We can ignore the top-most window
if (g.WindowsFocusOrder[i] == window)
{
memmove(&g.WindowsFocusOrder[i], &g.WindowsFocusOrder[i + 1], (size_t)(g.WindowsFocusOrder.Size - i - 1) * sizeof(ImGuiWindow*));
@@ -5214,7 +5992,7 @@ void ImGui::BringWindowToDisplayFront(ImGuiWindow* window)
ImGuiWindow* current_front_window = g.Windows.back();
if (current_front_window == window || current_front_window->RootWindow == window)
return;
- for (int i = g.Windows.Size - 2; i >= 0; i--) // We can ignore the front most window
+ for (int i = g.Windows.Size - 2; i >= 0; i--) // We can ignore the top-most window
if (g.Windows[i] == window)
{
memmove(&g.Windows[i], &g.Windows[i + 1], (size_t)(g.Windows.Size - i - 1) * sizeof(ImGuiWindow*));
@@ -5249,64 +6027,89 @@ void ImGui::FocusWindow(ImGuiWindow* window)
g.NavMousePosDirty = true;
g.NavInitRequest = false;
g.NavId = window ? window->NavLastIds[0] : 0; // Restore NavId
+ g.NavFocusScopeId = 0;
g.NavIdIsAlive = false;
- g.NavLayer = 0;
- //printf("[%05d] FocusWindow(\"%s\")\n", g.FrameCount, window ? window->Name : NULL);
+ g.NavLayer = ImGuiNavLayer_Main;
+ //IMGUI_DEBUG_LOG("FocusWindow(\"%s\")\n", window ? window->Name : NULL);
}
+ // Close popups if any
+ ClosePopupsOverWindow(window, false);
+
// Passing NULL allow to disable keyboard focus
if (!window)
return;
// Move the root window to the top of the pile
- if (window->RootWindow)
- window = window->RootWindow;
+ IM_ASSERT(window->RootWindow != NULL);
+ ImGuiWindow* focus_front_window = window->RootWindow; // NB: In docking branch this is window->RootWindowDockStop
+ ImGuiWindow* display_front_window = window->RootWindow;
// Steal focus on active widgets
- if (window->Flags & ImGuiWindowFlags_Popup) // FIXME: This statement should be unnecessary. Need further testing before removing it..
- if (g.ActiveId != 0 && g.ActiveIdWindow && g.ActiveIdWindow->RootWindow != window)
+ if (focus_front_window->Flags & ImGuiWindowFlags_Popup) // FIXME: This statement may be unnecessary? Need further testing before removing it..
+ if (g.ActiveId != 0 && g.ActiveIdWindow && g.ActiveIdWindow->RootWindow != focus_front_window)
ClearActiveID();
// Bring to front
- BringWindowToFocusFront(window);
- if (!(window->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus))
- BringWindowToDisplayFront(window);
+ BringWindowToFocusFront(focus_front_window);
+ if (((window->Flags | display_front_window->Flags) & ImGuiWindowFlags_NoBringToFrontOnFocus) == 0)
+ BringWindowToDisplayFront(display_front_window);
}
-void ImGui::FocusPreviousWindowIgnoringOne(ImGuiWindow* ignore_window)
+void ImGui::FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window)
{
ImGuiContext& g = *GImGui;
- for (int i = g.WindowsFocusOrder.Size - 1; i >= 0; i--)
+
+ int start_idx = g.WindowsFocusOrder.Size - 1;
+ if (under_this_window != NULL)
{
+ int under_this_window_idx = FindWindowFocusIndex(under_this_window);
+ if (under_this_window_idx != -1)
+ start_idx = under_this_window_idx - 1;
+ }
+ for (int i = start_idx; i >= 0; i--)
+ {
+ // We may later decide to test for different NoXXXInputs based on the active navigation input (mouse vs nav) but that may feel more confusing to the user.
ImGuiWindow* window = g.WindowsFocusOrder[i];
if (window != ignore_window && window->WasActive && !(window->Flags & ImGuiWindowFlags_ChildWindow))
- {
- ImGuiWindow* focus_window = NavRestoreLastChildNavWindow(window);
- FocusWindow(focus_window);
- return;
- }
+ if ((window->Flags & (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) != (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs))
+ {
+ ImGuiWindow* focus_window = NavRestoreLastChildNavWindow(window);
+ FocusWindow(focus_window);
+ return;
+ }
}
+ FocusWindow(NULL);
+}
+
+void ImGui::SetNextItemWidth(float item_width)
+{
+ ImGuiContext& g = *GImGui;
+ g.NextItemData.Flags |= ImGuiNextItemDataFlags_HasWidth;
+ g.NextItemData.Width = item_width;
}
void ImGui::PushItemWidth(float item_width)
{
- ImGuiWindow* window = GetCurrentWindow();
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
window->DC.ItemWidth = (item_width == 0.0f ? window->ItemWidthDefault : item_width);
window->DC.ItemWidthStack.push_back(window->DC.ItemWidth);
+ g.NextItemData.Flags &= ~ImGuiNextItemDataFlags_HasWidth;
}
void ImGui::PushMultiItemsWidths(int components, float w_full)
{
- ImGuiWindow* window = GetCurrentWindow();
- const ImGuiStyle& style = GImGui->Style;
- if (w_full <= 0.0f)
- w_full = CalcItemWidth();
- const float w_item_one = ImMax(1.0f, (float)(int)((w_full - (style.ItemInnerSpacing.x) * (components-1)) / (float)components));
- const float w_item_last = ImMax(1.0f, (float)(int)(w_full - (w_item_one + style.ItemInnerSpacing.x) * (components-1)));
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ const ImGuiStyle& style = g.Style;
+ const float w_item_one = ImMax(1.0f, IM_FLOOR((w_full - (style.ItemInnerSpacing.x) * (components-1)) / (float)components));
+ const float w_item_last = ImMax(1.0f, IM_FLOOR(w_full - (w_item_one + style.ItemInnerSpacing.x) * (components-1)));
window->DC.ItemWidthStack.push_back(w_item_last);
for (int i = 0; i < components-1; i++)
window->DC.ItemWidthStack.push_back(w_item_one);
window->DC.ItemWidth = window->DC.ItemWidthStack.back();
+ g.NextItemData.Flags &= ~ImGuiNextItemDataFlags_HasWidth;
}
void ImGui::PopItemWidth()
@@ -5316,27 +6119,58 @@ void ImGui::PopItemWidth()
window->DC.ItemWidth = window->DC.ItemWidthStack.empty() ? window->ItemWidthDefault : window->DC.ItemWidthStack.back();
}
+// Calculate default item width given value passed to PushItemWidth() or SetNextItemWidth().
+// The SetNextItemWidth() data is generally cleared/consumed by ItemAdd() or NextItemData.ClearFlags()
float ImGui::CalcItemWidth()
{
- ImGuiWindow* window = GetCurrentWindowRead();
- float w = window->DC.ItemWidth;
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ float w;
+ if (g.NextItemData.Flags & ImGuiNextItemDataFlags_HasWidth)
+ w = g.NextItemData.Width;
+ else
+ w = window->DC.ItemWidth;
if (w < 0.0f)
{
- // Align to a right-side limit. We include 1 frame padding in the calculation because this is how the width is always used (we add 2 frame padding to it), but we could move that responsibility to the widget as well.
- float width_to_right_edge = GetContentRegionAvail().x;
- w = ImMax(1.0f, width_to_right_edge + w);
+ float region_max_x = GetContentRegionMaxAbs().x;
+ w = ImMax(1.0f, region_max_x - window->DC.CursorPos.x + w);
}
- w = (float)(int)w;
+ w = IM_FLOOR(w);
return w;
}
+// [Internal] Calculate full item size given user provided 'size' parameter and default width/height. Default width is often == CalcItemWidth().
+// Those two functions CalcItemWidth vs CalcItemSize are awkwardly named because they are not fully symmetrical.
+// Note that only CalcItemWidth() is publicly exposed.
+// The 4.0f here may be changed to match CalcItemWidth() and/or BeginChild() (right now we have a mismatch which is harmless but undesirable)
+ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_w, float default_h)
+{
+ ImGuiWindow* window = GImGui->CurrentWindow;
+
+ ImVec2 region_max;
+ if (size.x < 0.0f || size.y < 0.0f)
+ region_max = GetContentRegionMaxAbs();
+
+ if (size.x == 0.0f)
+ size.x = default_w;
+ else if (size.x < 0.0f)
+ size.x = ImMax(4.0f, region_max.x - window->DC.CursorPos.x + size.x);
+
+ if (size.y == 0.0f)
+ size.y = default_h;
+ else if (size.y < 0.0f)
+ size.y = ImMax(4.0f, region_max.y - window->DC.CursorPos.y + size.y);
+
+ return size;
+}
+
void ImGui::SetCurrentFont(ImFont* font)
{
ImGuiContext& g = *GImGui;
IM_ASSERT(font && font->IsLoaded()); // Font Atlas not created. Did you call io.Fonts->GetTexDataAsRGBA32 / GetTexDataAsAlpha8 ?
IM_ASSERT(font->Scale > 0.0f);
g.Font = font;
- g.FontBaseSize = g.IO.FontGlobalScale * g.Font->FontSize * g.Font->Scale;
+ g.FontBaseSize = ImMax(1.0f, g.IO.FontGlobalScale * g.Font->FontSize * g.Font->Scale);
g.FontSize = g.CurrentWindow ? g.CurrentWindow->CalcFontSize() : 0.0f;
ImFontAtlas* atlas = g.Font->ContainerAtlas;
@@ -5458,27 +6292,29 @@ struct ImGuiStyleVarInfo
static const ImGuiStyleVarInfo GStyleVarInfo[] =
{
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, Alpha) }, // ImGuiStyleVar_Alpha
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowPadding) }, // ImGuiStyleVar_WindowPadding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowRounding) }, // ImGuiStyleVar_WindowRounding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowBorderSize) }, // ImGuiStyleVar_WindowBorderSize
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowMinSize) }, // ImGuiStyleVar_WindowMinSize
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowTitleAlign) }, // ImGuiStyleVar_WindowTitleAlign
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildRounding) }, // ImGuiStyleVar_ChildRounding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildBorderSize) }, // ImGuiStyleVar_ChildBorderSize
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupRounding) }, // ImGuiStyleVar_PopupRounding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupBorderSize) }, // ImGuiStyleVar_PopupBorderSize
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, FramePadding) }, // ImGuiStyleVar_FramePadding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameRounding) }, // ImGuiStyleVar_FrameRounding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameBorderSize) }, // ImGuiStyleVar_FrameBorderSize
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemSpacing) }, // ImGuiStyleVar_ItemSpacing
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemInnerSpacing) }, // ImGuiStyleVar_ItemInnerSpacing
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, IndentSpacing) }, // ImGuiStyleVar_IndentSpacing
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarSize) }, // ImGuiStyleVar_ScrollbarSize
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarRounding) }, // ImGuiStyleVar_ScrollbarRounding
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabMinSize) }, // ImGuiStyleVar_GrabMinSize
- { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabRounding) }, // ImGuiStyleVar_GrabRounding
- { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ButtonTextAlign) }, // ImGuiStyleVar_ButtonTextAlign
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, Alpha) }, // ImGuiStyleVar_Alpha
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowPadding) }, // ImGuiStyleVar_WindowPadding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowRounding) }, // ImGuiStyleVar_WindowRounding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowBorderSize) }, // ImGuiStyleVar_WindowBorderSize
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowMinSize) }, // ImGuiStyleVar_WindowMinSize
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowTitleAlign) }, // ImGuiStyleVar_WindowTitleAlign
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildRounding) }, // ImGuiStyleVar_ChildRounding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildBorderSize) }, // ImGuiStyleVar_ChildBorderSize
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupRounding) }, // ImGuiStyleVar_PopupRounding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupBorderSize) }, // ImGuiStyleVar_PopupBorderSize
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, FramePadding) }, // ImGuiStyleVar_FramePadding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameRounding) }, // ImGuiStyleVar_FrameRounding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameBorderSize) }, // ImGuiStyleVar_FrameBorderSize
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemSpacing) }, // ImGuiStyleVar_ItemSpacing
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemInnerSpacing) }, // ImGuiStyleVar_ItemInnerSpacing
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, IndentSpacing) }, // ImGuiStyleVar_IndentSpacing
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarSize) }, // ImGuiStyleVar_ScrollbarSize
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarRounding) }, // ImGuiStyleVar_ScrollbarRounding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabMinSize) }, // ImGuiStyleVar_GrabMinSize
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabRounding) }, // ImGuiStyleVar_GrabRounding
+ { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, TabRounding) }, // ImGuiStyleVar_TabRounding
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ButtonTextAlign) }, // ImGuiStyleVar_ButtonTextAlign
+ { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, SelectableTextAlign) }, // ImGuiStyleVar_SelectableTextAlign
};
static const ImGuiStyleVarInfo* GetStyleVarInfo(ImGuiStyleVar idx)
@@ -5499,7 +6335,7 @@ void ImGui::PushStyleVar(ImGuiStyleVar idx, float val)
*pvar = val;
return;
}
- IM_ASSERT(0); // Called function with wrong-type? Variable is not a float.
+ IM_ASSERT(0 && "Called PushStyleVar() float variant but variable is not a float!");
}
void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val)
@@ -5513,7 +6349,7 @@ void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val)
*pvar = val;
return;
}
- IM_ASSERT(0); // Called function with wrong-type? Variable is not a ImVec2.
+ IM_ASSERT(0 && "Called PushStyleVar() ImVec2 variant but variable is not a ImVec2!");
}
void ImGui::PopStyleVar(int count)
@@ -5570,6 +6406,11 @@ const char* ImGui::GetStyleColorName(ImGuiCol idx)
case ImGuiCol_ResizeGrip: return "ResizeGrip";
case ImGuiCol_ResizeGripHovered: return "ResizeGripHovered";
case ImGuiCol_ResizeGripActive: return "ResizeGripActive";
+ case ImGuiCol_Tab: return "Tab";
+ case ImGuiCol_TabHovered: return "TabHovered";
+ case ImGuiCol_TabActive: return "TabActive";
+ case ImGuiCol_TabUnfocused: return "TabUnfocused";
+ case ImGuiCol_TabUnfocusedActive: return "TabUnfocusedActive";
case ImGuiCol_PlotLines: return "PlotLines";
case ImGuiCol_PlotLinesHovered: return "PlotLinesHovered";
case ImGuiCol_PlotHistogram: return "PlotHistogram";
@@ -5631,7 +6472,7 @@ bool ImGui::IsWindowHovered(ImGuiHoveredFlags flags)
}
}
- if (!IsWindowContentHoverable(g.HoveredRootWindow, flags))
+ if (!IsWindowContentHoverable(g.HoveredWindow, flags))
return false;
if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem))
if (g.ActiveId != 0 && !g.ActiveIdAllowOverlap && g.ActiveId != g.HoveredWindow->MoveId)
@@ -5642,11 +6483,11 @@ bool ImGui::IsWindowHovered(ImGuiHoveredFlags flags)
bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags)
{
ImGuiContext& g = *GImGui;
- IM_ASSERT(g.CurrentWindow); // Not inside a Begin()/End()
if (flags & ImGuiFocusedFlags_AnyWindow)
return g.NavWindow != NULL;
+ IM_ASSERT(g.CurrentWindow); // Not inside a Begin()/End()
switch (flags & (ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows))
{
case ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows:
@@ -5661,6 +6502,8 @@ bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags)
}
// Can we focus this window with CTRL+TAB (or PadMenu + PadFocusPrev/PadFocusNext)
+// Note that NoNavFocus makes the window not reachable with CTRL+TAB but it can still be focused with mouse or programmaticaly.
+// If you want a window to never be focused, you may use the e.g. NoInputs flag.
bool ImGui::IsWindowNavFocusable(ImGuiWindow* window)
{
return window->Active && window == window->RootWindow && !(window->Flags & ImGuiWindowFlags_NoNavFocus);
@@ -5685,21 +6528,7 @@ ImVec2 ImGui::GetWindowPos()
return window->Pos;
}
-void ImGui::SetWindowScrollX(ImGuiWindow* window, float new_scroll_x)
-{
- window->DC.CursorMaxPos.x += window->Scroll.x; // SizeContents is generally computed based on CursorMaxPos which is affected by scroll position, so we need to apply our change to it.
- window->Scroll.x = new_scroll_x;
- window->DC.CursorMaxPos.x -= window->Scroll.x;
-}
-
-void ImGui::SetWindowScrollY(ImGuiWindow* window, float new_scroll_y)
-{
- window->DC.CursorMaxPos.y += window->Scroll.y; // SizeContents is generally computed based on CursorMaxPos which is affected by scroll position, so we need to apply our change to it.
- window->Scroll.y = new_scroll_y;
- window->DC.CursorMaxPos.y -= window->Scroll.y;
-}
-
-static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
+void ImGui::SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
{
// Test condition (NB: bit 0 is always true) and clear flags for next time
if (cond && (window->SetWindowPosAllowFlags & cond) == 0)
@@ -5712,8 +6541,10 @@ static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
// Set
const ImVec2 old_pos = window->Pos;
window->Pos = ImFloor(pos);
- window->DC.CursorPos += (window->Pos - old_pos); // As we happen to move the window while it is being appended to (which is a bad idea - will smear) let's at least offset the cursor
- window->DC.CursorMaxPos += (window->Pos - old_pos); // And more importantly we need to adjust this so size calculation doesn't get affected.
+ ImVec2 offset = window->Pos - old_pos;
+ window->DC.CursorPos += offset; // As we happen to move the window while it is being appended to (which is a bad idea - will smear) let's at least offset the cursor
+ window->DC.CursorMaxPos += offset; // And more importantly we need to offset CursorMaxPos/CursorStartPos this so ContentSize calculation doesn't get affected.
+ window->DC.CursorStartPos += offset;
}
void ImGui::SetWindowPos(const ImVec2& pos, ImGuiCond cond)
@@ -5734,7 +6565,7 @@ ImVec2 ImGui::GetWindowSize()
return window->Size;
}
-static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond)
+void ImGui::SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond)
{
// Test condition (NB: bit 0 is always true) and clear flags for next time
if (cond && (window->SetWindowSizeAllowFlags & cond) == 0)
@@ -5747,7 +6578,7 @@ static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond con
if (size.x > 0.0f)
{
window->AutoFitFramesX = 0;
- window->SizeFull.x = ImFloor(size.x);
+ window->SizeFull.x = IM_FLOOR(size.x);
}
else
{
@@ -5757,7 +6588,7 @@ static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond con
if (size.y > 0.0f)
{
window->AutoFitFramesY = 0;
- window->SizeFull.y = ImFloor(size.y);
+ window->SizeFull.y = IM_FLOOR(size.y);
}
else
{
@@ -5777,7 +6608,7 @@ void ImGui::SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond)
SetWindowSize(window, size, cond);
}
-static void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond)
+void ImGui::SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond)
{
// Test condition (NB: bit 0 is always true) and clear flags for next time
if (cond && (window->SetWindowCollapsedAllowFlags & cond) == 0)
@@ -5833,6 +6664,7 @@ void ImGui::SetNextWindowPos(const ImVec2& pos, ImGuiCond cond, const ImVec2& pi
{
ImGuiContext& g = *GImGui;
IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags.
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasPos;
g.NextWindowData.PosVal = pos;
g.NextWindowData.PosPivotVal = pivot;
g.NextWindowData.PosCond = cond ? cond : ImGuiCond_Always;
@@ -5842,6 +6674,7 @@ void ImGui::SetNextWindowSize(const ImVec2& size, ImGuiCond cond)
{
ImGuiContext& g = *GImGui;
IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags.
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSize;
g.NextWindowData.SizeVal = size;
g.NextWindowData.SizeCond = cond ? cond : ImGuiCond_Always;
}
@@ -5849,23 +6682,26 @@ void ImGui::SetNextWindowSize(const ImVec2& size, ImGuiCond cond)
void ImGui::SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback, void* custom_callback_user_data)
{
ImGuiContext& g = *GImGui;
- g.NextWindowData.SizeConstraintCond = ImGuiCond_Always;
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSizeConstraint;
g.NextWindowData.SizeConstraintRect = ImRect(size_min, size_max);
g.NextWindowData.SizeCallback = custom_callback;
g.NextWindowData.SizeCallbackUserData = custom_callback_user_data;
}
+// Content size = inner scrollable rectangle, padded with WindowPadding.
+// SetNextWindowContentSize(ImVec2(100,100) + ImGuiWindowFlags_AlwaysAutoResize will always allow submitting a 100x100 item.
void ImGui::SetNextWindowContentSize(const ImVec2& size)
{
ImGuiContext& g = *GImGui;
- g.NextWindowData.ContentSizeVal = size; // In Begin() we will add the size of window decorations (title bar, menu etc.) to that to form a SizeContents value.
- g.NextWindowData.ContentSizeCond = ImGuiCond_Always;
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasContentSize;
+ g.NextWindowData.ContentSizeVal = size;
}
void ImGui::SetNextWindowCollapsed(bool collapsed, ImGuiCond cond)
{
ImGuiContext& g = *GImGui;
IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags.
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasCollapsed;
g.NextWindowData.CollapsedVal = collapsed;
g.NextWindowData.CollapsedCond = cond ? cond : ImGuiCond_Always;
}
@@ -5873,54 +6709,61 @@ void ImGui::SetNextWindowCollapsed(bool collapsed, ImGuiCond cond)
void ImGui::SetNextWindowFocus()
{
ImGuiContext& g = *GImGui;
- g.NextWindowData.FocusCond = ImGuiCond_Always; // Using a Cond member for consistency (may transition all of them to single flag set for fast Clear() op)
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasFocus;
}
void ImGui::SetNextWindowBgAlpha(float alpha)
{
ImGuiContext& g = *GImGui;
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasBgAlpha;
g.NextWindowData.BgAlphaVal = alpha;
- g.NextWindowData.BgAlphaCond = ImGuiCond_Always; // Using a Cond member for consistency (may transition all of them to single flag set for fast Clear() op)
}
-// In window space (not screen space!)
+// FIXME: This is in window space (not screen space!). We should try to obsolete all those functions.
ImVec2 ImGui::GetContentRegionMax()
{
- ImGuiWindow* window = GetCurrentWindowRead();
- ImVec2 mx = window->ContentsRegionRect.Max - window->Pos;
- if (window->DC.ColumnsSet)
- mx.x = GetColumnOffset(window->DC.ColumnsSet->Current + 1) - window->WindowPadding.x;
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ ImVec2 mx = window->ContentRegionRect.Max - window->Pos;
+ if (window->DC.CurrentColumns)
+ mx.x = window->WorkRect.Max.x - window->Pos.x;
+ return mx;
+}
+
+// [Internal] Absolute coordinate. Saner. This is not exposed until we finishing refactoring work rect features.
+ImVec2 ImGui::GetContentRegionMaxAbs()
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ ImVec2 mx = window->ContentRegionRect.Max;
+ if (window->DC.CurrentColumns)
+ mx.x = window->WorkRect.Max.x;
return mx;
}
ImVec2 ImGui::GetContentRegionAvail()
{
- ImGuiWindow* window = GetCurrentWindowRead();
- return GetContentRegionMax() - (window->DC.CursorPos - window->Pos);
-}
-
-float ImGui::GetContentRegionAvailWidth()
-{
- return GetContentRegionAvail().x;
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return GetContentRegionMaxAbs() - window->DC.CursorPos;
}
// In window space (not screen space!)
ImVec2 ImGui::GetWindowContentRegionMin()
{
- ImGuiWindow* window = GetCurrentWindowRead();
- return window->ContentsRegionRect.Min - window->Pos;
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->ContentRegionRect.Min - window->Pos;
}
ImVec2 ImGui::GetWindowContentRegionMax()
{
- ImGuiWindow* window = GetCurrentWindowRead();
- return window->ContentsRegionRect.Max - window->Pos;
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->ContentRegionRect.Max - window->Pos;
}
float ImGui::GetWindowContentRegionWidth()
{
- ImGuiWindow* window = GetCurrentWindowRead();
- return window->ContentsRegionRect.GetWidth();
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->ContentRegionRect.GetWidth();
}
float ImGui::GetTextLineHeight()
@@ -6029,77 +6872,43 @@ ImVec2 ImGui::GetCursorScreenPos()
return window->DC.CursorPos;
}
-void ImGui::SetCursorScreenPos(const ImVec2& screen_pos)
+void ImGui::SetCursorScreenPos(const ImVec2& pos)
{
ImGuiWindow* window = GetCurrentWindow();
- window->DC.CursorPos = screen_pos;
+ window->DC.CursorPos = pos;
window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos);
}
-float ImGui::GetScrollX()
-{
- return GImGui->CurrentWindow->Scroll.x;
-}
-
-float ImGui::GetScrollY()
-{
- return GImGui->CurrentWindow->Scroll.y;
-}
-
-float ImGui::GetScrollMaxX()
-{
- return GetWindowScrollMaxX(GImGui->CurrentWindow);
-}
-
-float ImGui::GetScrollMaxY()
-{
- return GetWindowScrollMaxY(GImGui->CurrentWindow);
-}
-
-void ImGui::SetScrollX(float scroll_x)
-{
- ImGuiWindow* window = GetCurrentWindow();
- window->ScrollTarget.x = scroll_x;
- window->ScrollTargetCenterRatio.x = 0.0f;
-}
-
-void ImGui::SetScrollY(float scroll_y)
-{
- ImGuiWindow* window = GetCurrentWindow();
- window->ScrollTarget.y = scroll_y + window->TitleBarHeight() + window->MenuBarHeight(); // title bar height canceled out when using ScrollTargetRelY
- window->ScrollTargetCenterRatio.y = 0.0f;
-}
-
-void ImGui::SetScrollFromPosY(float pos_y, float center_y_ratio)
-{
- // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
- ImGuiWindow* window = GetCurrentWindow();
- IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
- window->ScrollTarget.y = (float)(int)(pos_y + window->Scroll.y);
- window->ScrollTargetCenterRatio.y = center_y_ratio;
-}
-
-// center_y_ratio: 0.0f top of last item, 0.5f vertical center of last item, 1.0f bottom of last item.
-void ImGui::SetScrollHereY(float center_y_ratio)
-{
- ImGuiWindow* window = GetCurrentWindow();
- float target_y = window->DC.CursorPosPrevLine.y - window->Pos.y; // Top of last item, in window space
- target_y += (window->DC.PrevLineSize.y * center_y_ratio) + (GImGui->Style.ItemSpacing.y * (center_y_ratio - 0.5f) * 2.0f); // Precisely aim above, in the middle or below the last line.
- SetScrollFromPosY(target_y, center_y_ratio);
-}
-
void ImGui::ActivateItem(ImGuiID id)
{
ImGuiContext& g = *GImGui;
g.NavNextActivateId = id;
}
+void ImGui::PushFocusScope(ImGuiID id)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ window->IDStack.push_back(window->DC.NavFocusScopeIdCurrent);
+ window->DC.NavFocusScopeIdCurrent = id;
+}
+
+void ImGui::PopFocusScope()
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ window->DC.NavFocusScopeIdCurrent = window->IDStack.back();
+ window->IDStack.pop_back();
+}
+
void ImGui::SetKeyboardFocusHere(int offset)
{
IM_ASSERT(offset >= -1); // -1 is allowed but not below
- ImGuiWindow* window = GetCurrentWindow();
- window->FocusIdxAllRequestNext = window->FocusIdxAllCounter + 1 + offset;
- window->FocusIdxTabRequestNext = INT_MAX;
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ g.FocusRequestNextWindow = window;
+ g.FocusRequestNextCounterRegular = window->DC.FocusCounterRegular + 1 + offset;
+ g.FocusRequestNextCounterTabStop = INT_MAX;
}
void ImGui::SetItemDefaultFocus()
@@ -6121,71 +6930,80 @@ void ImGui::SetItemDefaultFocus()
void ImGui::SetStateStorage(ImGuiStorage* tree)
{
- ImGuiWindow* window = GetCurrentWindow();
+ ImGuiWindow* window = GImGui->CurrentWindow;
window->DC.StateStorage = tree ? tree : &window->StateStorage;
}
ImGuiStorage* ImGui::GetStateStorage()
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
return window->DC.StateStorage;
}
void ImGui::PushID(const char* str_id)
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
window->IDStack.push_back(window->GetIDNoKeepAlive(str_id));
}
void ImGui::PushID(const char* str_id_begin, const char* str_id_end)
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
window->IDStack.push_back(window->GetIDNoKeepAlive(str_id_begin, str_id_end));
}
void ImGui::PushID(const void* ptr_id)
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
window->IDStack.push_back(window->GetIDNoKeepAlive(ptr_id));
}
void ImGui::PushID(int int_id)
{
- const void* ptr_id = (void*)(intptr_t)int_id;
- ImGuiWindow* window = GetCurrentWindowRead();
- window->IDStack.push_back(window->GetIDNoKeepAlive(ptr_id));
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ window->IDStack.push_back(window->GetIDNoKeepAlive(int_id));
+}
+
+// Push a given id value ignoring the ID stack as a seed.
+void ImGui::PushOverrideID(ImGuiID id)
+{
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ window->IDStack.push_back(id);
}
void ImGui::PopID()
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
window->IDStack.pop_back();
}
ImGuiID ImGui::GetID(const char* str_id)
{
- return GImGui->CurrentWindow->GetID(str_id);
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->GetID(str_id);
}
ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end)
{
- return GImGui->CurrentWindow->GetID(str_id_begin, str_id_end);
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->GetID(str_id_begin, str_id_end);
}
ImGuiID ImGui::GetID(const void* ptr_id)
{
- return GImGui->CurrentWindow->GetID(ptr_id);
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->GetID(ptr_id);
}
bool ImGui::IsRectVisible(const ImVec2& size)
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
return window->ClipRect.Overlaps(ImRect(window->DC.CursorPos, window->DC.CursorPos + size));
}
bool ImGui::IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max)
{
- ImGuiWindow* window = GetCurrentWindowRead();
+ ImGuiWindow* window = GImGui->CurrentWindow;
return window->ClipRect.Overlaps(ImRect(rect_min, rect_max));
}
@@ -6201,76 +7019,90 @@ void ImGui::BeginGroup()
group_data.BackupCursorMaxPos = window->DC.CursorMaxPos;
group_data.BackupIndent = window->DC.Indent;
group_data.BackupGroupOffset = window->DC.GroupOffset;
- group_data.BackupCurrentLineSize = window->DC.CurrentLineSize;
- group_data.BackupCurrentLineTextBaseOffset = window->DC.CurrentLineTextBaseOffset;
- group_data.BackupLogLinePosY = window->DC.LogLinePosY;
+ group_data.BackupCurrLineSize = window->DC.CurrLineSize;
+ group_data.BackupCurrLineTextBaseOffset = window->DC.CurrLineTextBaseOffset;
group_data.BackupActiveIdIsAlive = g.ActiveIdIsAlive;
group_data.BackupActiveIdPreviousFrameIsAlive = g.ActiveIdPreviousFrameIsAlive;
- group_data.AdvanceCursor = true;
+ group_data.EmitItem = true;
window->DC.GroupOffset.x = window->DC.CursorPos.x - window->Pos.x - window->DC.ColumnsOffset.x;
window->DC.Indent = window->DC.GroupOffset;
window->DC.CursorMaxPos = window->DC.CursorPos;
- window->DC.CurrentLineSize = ImVec2(0.0f, 0.0f);
- window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f; // To enforce Log carriage return
+ window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
+ if (g.LogEnabled)
+ g.LogLinePosY = -FLT_MAX; // To enforce Log carriage return
}
void ImGui::EndGroup()
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow();
- IM_ASSERT(!window->DC.GroupStack.empty()); // Mismatched BeginGroup()/EndGroup() calls
+ IM_ASSERT(!window->DC.GroupStack.empty()); // Mismatched BeginGroup()/EndGroup() calls
ImGuiGroupData& group_data = window->DC.GroupStack.back();
- ImRect group_bb(group_data.BackupCursorPos, window->DC.CursorMaxPos);
- group_bb.Max = ImMax(group_bb.Min, group_bb.Max);
+ ImRect group_bb(group_data.BackupCursorPos, ImMax(window->DC.CursorMaxPos, group_data.BackupCursorPos));
window->DC.CursorPos = group_data.BackupCursorPos;
window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, window->DC.CursorMaxPos);
window->DC.Indent = group_data.BackupIndent;
window->DC.GroupOffset = group_data.BackupGroupOffset;
- window->DC.CurrentLineSize = group_data.BackupCurrentLineSize;
- window->DC.CurrentLineTextBaseOffset = group_data.BackupCurrentLineTextBaseOffset;
- window->DC.LogLinePosY = window->DC.CursorPos.y - 9999.0f; // To enforce Log carriage return
+ window->DC.CurrLineSize = group_data.BackupCurrLineSize;
+ window->DC.CurrLineTextBaseOffset = group_data.BackupCurrLineTextBaseOffset;
+ if (g.LogEnabled)
+ g.LogLinePosY = -FLT_MAX; // To enforce Log carriage return
- if (group_data.AdvanceCursor)
+ if (!group_data.EmitItem)
{
- window->DC.CurrentLineTextBaseOffset = ImMax(window->DC.PrevLineTextBaseOffset, group_data.BackupCurrentLineTextBaseOffset); // FIXME: Incorrect, we should grab the base offset from the *first line* of the group but it is hard to obtain now.
- ItemSize(group_bb.GetSize(), group_data.BackupCurrentLineTextBaseOffset);
- ItemAdd(group_bb, 0);
+ window->DC.GroupStack.pop_back();
+ return;
}
+ window->DC.CurrLineTextBaseOffset = ImMax(window->DC.PrevLineTextBaseOffset, group_data.BackupCurrLineTextBaseOffset); // FIXME: Incorrect, we should grab the base offset from the *first line* of the group but it is hard to obtain now.
+ ItemSize(group_bb.GetSize());
+ ItemAdd(group_bb, 0);
+
// If the current ActiveId was declared within the boundary of our group, we copy it to LastItemId so IsItemActive(), IsItemDeactivated() etc. will be functional on the entire group.
// It would be be neater if we replaced window.DC.LastItemId by e.g. 'bool LastItemIsActive', but would put a little more burden on individual widgets.
- // (and if you grep for LastItemId you'll notice it is only used in that context.
- if ((group_data.BackupActiveIdIsAlive != g.ActiveId) && (g.ActiveIdIsAlive == g.ActiveId) && g.ActiveId) // && g.ActiveIdWindow->RootWindow == window->RootWindow)
+ // Also if you grep for LastItemId you'll notice it is only used in that context.
+ // (The tests not symmetrical because ActiveIdIsAlive is an ID itself, in order to be able to handle ActiveId being overwritten during the frame.)
+ const bool group_contains_curr_active_id = (group_data.BackupActiveIdIsAlive != g.ActiveId) && (g.ActiveIdIsAlive == g.ActiveId) && g.ActiveId;
+ const bool group_contains_prev_active_id = !group_data.BackupActiveIdPreviousFrameIsAlive && g.ActiveIdPreviousFrameIsAlive;
+ if (group_contains_curr_active_id)
window->DC.LastItemId = g.ActiveId;
- else if (!group_data.BackupActiveIdPreviousFrameIsAlive && g.ActiveIdPreviousFrameIsAlive) // && g.ActiveIdPreviousFrameWindow->RootWindow == window->RootWindow)
+ else if (group_contains_prev_active_id)
window->DC.LastItemId = g.ActiveIdPreviousFrame;
window->DC.LastItemRect = group_bb;
- window->DC.GroupStack.pop_back();
+ // Forward Edited flag
+ if (group_contains_curr_active_id && g.ActiveIdHasBeenEditedThisFrame)
+ window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Edited;
+ // Forward Deactivated flag
+ window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HasDeactivated;
+ if (group_contains_prev_active_id && g.ActiveId != g.ActiveIdPreviousFrame)
+ window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Deactivated;
+
+ window->DC.GroupStack.pop_back();
//window->DrawList->AddRect(group_bb.Min, group_bb.Max, IM_COL32(255,0,255,255)); // [Debug]
}
// Gets back to previous line and continue with horizontal layout
-// pos_x == 0 : follow right after previous item
-// pos_x != 0 : align to specified x position (relative to window/group left)
-// spacing_w < 0 : use default spacing if pos_x == 0, no spacing if pos_x != 0
-// spacing_w >= 0 : enforce spacing amount
-void ImGui::SameLine(float pos_x, float spacing_w)
+// offset_from_start_x == 0 : follow right after previous item
+// offset_from_start_x != 0 : align to specified x position (relative to window/group left)
+// spacing_w < 0 : use default spacing if pos_x == 0, no spacing if pos_x != 0
+// spacing_w >= 0 : enforce spacing amount
+void ImGui::SameLine(float offset_from_start_x, float spacing_w)
{
ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems)
return;
ImGuiContext& g = *GImGui;
- if (pos_x != 0.0f)
+ if (offset_from_start_x != 0.0f)
{
if (spacing_w < 0.0f) spacing_w = 0.0f;
- window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + pos_x + spacing_w + window->DC.GroupOffset.x + window->DC.ColumnsOffset.x;
+ window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + offset_from_start_x + spacing_w + window->DC.GroupOffset.x + window->DC.ColumnsOffset.x;
window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y;
}
else
@@ -6279,8 +7111,8 @@ void ImGui::SameLine(float pos_x, float spacing_w)
window->DC.CursorPos.x = window->DC.CursorPosPrevLine.x + spacing_w;
window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y;
}
- window->DC.CurrentLineSize = window->DC.PrevLineSize;
- window->DC.CurrentLineTextBaseOffset = window->DC.PrevLineTextBaseOffset;
+ window->DC.CurrLineSize = window->DC.PrevLineSize;
+ window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset;
}
void ImGui::Indent(float indent_w)
@@ -6299,13 +7131,239 @@ void ImGui::Unindent(float indent_w)
window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
}
+
+//-----------------------------------------------------------------------------
+// [SECTION] ERROR CHECKING
+//-----------------------------------------------------------------------------
+
+static void ImGui::ErrorCheckEndFrame()
+{
+ // Report when there is a mismatch of Begin/BeginChild vs End/EndChild calls. Important: Remember that the Begin/BeginChild API requires you
+ // to always call End/EndChild even if Begin/BeginChild returns false! (this is unfortunately inconsistent with most other Begin* API).
+ ImGuiContext& g = *GImGui;
+ if (g.CurrentWindowStack.Size != 1)
+ {
+ if (g.CurrentWindowStack.Size > 1)
+ {
+ IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size == 1, "Mismatched Begin/BeginChild vs End/EndChild calls: did you forget to call End/EndChild?");
+ while (g.CurrentWindowStack.Size > 1)
+ End();
+ }
+ else
+ {
+ IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size == 1, "Mismatched Begin/BeginChild vs End/EndChild calls: did you call End/EndChild too much?");
+ }
+ }
+
+}
+
+// Save and compare stack sizes on Begin()/End() to detect usage errors
+// Begin() calls this with write=true
+// End() calls this with write=false
+static void ImGui::ErrorCheckBeginEndCompareStacksSize(ImGuiWindow* window, bool write)
+{
+ ImGuiContext& g = *GImGui;
+ short* p = &window->DC.StackSizesBackup[0];
+
+ // Window stacks
+ // NOT checking: DC.ItemWidth, DC.AllowKeyboardFocus, DC.ButtonRepeat, DC.TextWrapPos (per window) to allow user to conveniently push once and not pop (they are cleared on Begin)
+ { int n = window->IDStack.Size; if (write) *p = (short)n; else IM_ASSERT(*p == n && "PushID/PopID or TreeNode/TreePop Mismatch!"); p++; } // Too few or too many PopID()/TreePop()
+ { int n = window->DC.GroupStack.Size; if (write) *p = (short)n; else IM_ASSERT(*p == n && "BeginGroup/EndGroup Mismatch!"); p++; } // Too few or too many EndGroup()
+
+ // Global stacks
+ // For color, style and font stacks there is an incentive to use Push/Begin/Pop/.../End patterns, so we relax our checks a little to allow them.
+ { int n = g.BeginPopupStack.Size; if (write) *p = (short)n; else IM_ASSERT(*p == n && "BeginMenu/EndMenu or BeginPopup/EndPopup Mismatch!"); p++; }// Too few or too many EndMenu()/EndPopup()
+ { int n = g.ColorModifiers.Size; if (write) *p = (short)n; else IM_ASSERT(*p >= n && "PushStyleColor/PopStyleColor Mismatch!"); p++; } // Too few or too many PopStyleColor()
+ { int n = g.StyleModifiers.Size; if (write) *p = (short)n; else IM_ASSERT(*p >= n && "PushStyleVar/PopStyleVar Mismatch!"); p++; } // Too few or too many PopStyleVar()
+ { int n = g.FontStack.Size; if (write) *p = (short)n; else IM_ASSERT(*p >= n && "PushFont/PopFont Mismatch!"); p++; } // Too few or too many PopFont()
+ IM_ASSERT(p == window->DC.StackSizesBackup + IM_ARRAYSIZE(window->DC.StackSizesBackup));
+}
+
+
+//-----------------------------------------------------------------------------
+// [SECTION] SCROLLING
+//-----------------------------------------------------------------------------
+
+static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges)
+{
+ ImGuiContext& g = *GImGui;
+ ImVec2 scroll = window->Scroll;
+ if (window->ScrollTarget.x < FLT_MAX)
+ {
+ float cr_x = window->ScrollTargetCenterRatio.x;
+ float target_x = window->ScrollTarget.x;
+ if (snap_on_edges && cr_x <= 0.0f && target_x <= window->WindowPadding.x)
+ target_x = 0.0f;
+ else if (snap_on_edges && cr_x >= 1.0f && target_x >= window->ContentSize.x + window->WindowPadding.x + g.Style.ItemSpacing.x)
+ target_x = window->ContentSize.x + window->WindowPadding.x * 2.0f;
+ scroll.x = target_x - cr_x * (window->SizeFull.x - window->ScrollbarSizes.x);
+ }
+ if (window->ScrollTarget.y < FLT_MAX)
+ {
+ // 'snap_on_edges' allows for a discontinuity at the edge of scrolling limits to take account of WindowPadding so that scrolling to make the last item visible scroll far enough to see the padding.
+ float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
+ float cr_y = window->ScrollTargetCenterRatio.y;
+ float target_y = window->ScrollTarget.y;
+ if (snap_on_edges && cr_y <= 0.0f && target_y <= window->WindowPadding.y)
+ target_y = 0.0f;
+ if (snap_on_edges && cr_y >= 1.0f && target_y >= window->ContentSize.y + window->WindowPadding.y + g.Style.ItemSpacing.y)
+ target_y = window->ContentSize.y + window->WindowPadding.y * 2.0f;
+ scroll.y = target_y - cr_y * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height);
+ }
+ scroll = ImMax(scroll, ImVec2(0.0f, 0.0f));
+ if (!window->Collapsed && !window->SkipItems)
+ {
+ scroll.x = ImMin(scroll.x, window->ScrollMax.x);
+ scroll.y = ImMin(scroll.y, window->ScrollMax.y);
+ }
+ return scroll;
+}
+
+// Scroll to keep newly navigated item fully into view
+ImVec2 ImGui::ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect)
+{
+ ImGuiContext& g = *GImGui;
+ ImRect window_rect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1));
+ //GetForegroundDrawList(window)->AddRect(window_rect.Min, window_rect.Max, IM_COL32_WHITE); // [DEBUG]
+
+ ImVec2 delta_scroll;
+ if (!window_rect.Contains(item_rect))
+ {
+ if (window->ScrollbarX && item_rect.Min.x < window_rect.Min.x)
+ SetScrollFromPosX(window, item_rect.Min.x - window->Pos.x + g.Style.ItemSpacing.x, 0.0f);
+ else if (window->ScrollbarX && item_rect.Max.x >= window_rect.Max.x)
+ SetScrollFromPosX(window, item_rect.Max.x - window->Pos.x + g.Style.ItemSpacing.x, 1.0f);
+ if (item_rect.Min.y < window_rect.Min.y)
+ SetScrollFromPosY(window, item_rect.Min.y - window->Pos.y - g.Style.ItemSpacing.y, 0.0f);
+ else if (item_rect.Max.y >= window_rect.Max.y)
+ SetScrollFromPosY(window, item_rect.Max.y - window->Pos.y + g.Style.ItemSpacing.y, 1.0f);
+
+ ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(window, false);
+ delta_scroll = next_scroll - window->Scroll;
+ }
+
+ // Also scroll parent window to keep us into view if necessary
+ if (window->Flags & ImGuiWindowFlags_ChildWindow)
+ delta_scroll += ScrollToBringRectIntoView(window->ParentWindow, ImRect(item_rect.Min - delta_scroll, item_rect.Max - delta_scroll));
+
+ return delta_scroll;
+}
+
+float ImGui::GetScrollX()
+{
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->Scroll.x;
+}
+
+float ImGui::GetScrollY()
+{
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->Scroll.y;
+}
+
+float ImGui::GetScrollMaxX()
+{
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->ScrollMax.x;
+}
+
+float ImGui::GetScrollMaxY()
+{
+ ImGuiWindow* window = GImGui->CurrentWindow;
+ return window->ScrollMax.y;
+}
+
+void ImGui::SetScrollX(float scroll_x)
+{
+ ImGuiWindow* window = GetCurrentWindow();
+ window->ScrollTarget.x = scroll_x;
+ window->ScrollTargetCenterRatio.x = 0.0f;
+}
+
+void ImGui::SetScrollY(float scroll_y)
+{
+ ImGuiWindow* window = GetCurrentWindow();
+ window->ScrollTarget.y = scroll_y;
+ window->ScrollTargetCenterRatio.y = 0.0f;
+}
+
+void ImGui::SetScrollX(ImGuiWindow* window, float new_scroll_x)
+{
+ window->ScrollTarget.x = new_scroll_x;
+ window->ScrollTargetCenterRatio.x = 0.0f;
+}
+
+void ImGui::SetScrollY(ImGuiWindow* window, float new_scroll_y)
+{
+ window->ScrollTarget.y = new_scroll_y;
+ window->ScrollTargetCenterRatio.y = 0.0f;
+}
+
+
+void ImGui::SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio)
+{
+ // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
+ IM_ASSERT(center_x_ratio >= 0.0f && center_x_ratio <= 1.0f);
+ window->ScrollTarget.x = IM_FLOOR(local_x + window->Scroll.x);
+ window->ScrollTargetCenterRatio.x = center_x_ratio;
+}
+
+void ImGui::SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio)
+{
+ // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
+ IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
+ const float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
+ local_y -= decoration_up_height;
+ window->ScrollTarget.y = IM_FLOOR(local_y + window->Scroll.y);
+ window->ScrollTargetCenterRatio.y = center_y_ratio;
+}
+
+void ImGui::SetScrollFromPosX(float local_x, float center_x_ratio)
+{
+ ImGuiContext& g = *GImGui;
+ SetScrollFromPosX(g.CurrentWindow, local_x, center_x_ratio);
+}
+
+void ImGui::SetScrollFromPosY(float local_y, float center_y_ratio)
+{
+ ImGuiContext& g = *GImGui;
+ SetScrollFromPosY(g.CurrentWindow, local_y, center_y_ratio);
+}
+
+// center_x_ratio: 0.0f left of last item, 0.5f horizontal center of last item, 1.0f right of last item.
+void ImGui::SetScrollHereX(float center_x_ratio)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ float target_x = window->DC.LastItemRect.Min.x - window->Pos.x; // Left of last item, in window space
+ float last_item_width = window->DC.LastItemRect.GetWidth();
+ target_x += (last_item_width * center_x_ratio) + (g.Style.ItemSpacing.x * (center_x_ratio - 0.5f) * 2.0f); // Precisely aim before, in the middle or after the last item.
+ SetScrollFromPosX(target_x, center_x_ratio);
+}
+
+// center_y_ratio: 0.0f top of last item, 0.5f vertical center of last item, 1.0f bottom of last item.
+void ImGui::SetScrollHereY(float center_y_ratio)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ float target_y = window->DC.CursorPosPrevLine.y - window->Pos.y; // Top of last item, in window space
+ target_y += (window->DC.PrevLineSize.y * center_y_ratio) + (g.Style.ItemSpacing.y * (center_y_ratio - 0.5f) * 2.0f); // Precisely aim above, in the middle or below the last line.
+ SetScrollFromPosY(target_y, center_y_ratio);
+}
+
//-----------------------------------------------------------------------------
// [SECTION] TOOLTIPS
//-----------------------------------------------------------------------------
void ImGui::BeginTooltip()
+{
+ BeginTooltipEx(ImGuiWindowFlags_None, ImGuiTooltipFlags_None);
+}
+
+void ImGui::BeginTooltipEx(ImGuiWindowFlags extra_flags, ImGuiTooltipFlags tooltip_flags)
{
ImGuiContext& g = *GImGui;
+
if (g.DragDropWithinSourceOrTarget)
{
// The default tooltip position is a little offset to give space to see the context menu (it's also clamped within the current viewport/monitor)
@@ -6316,27 +7374,18 @@ void ImGui::BeginTooltip()
SetNextWindowPos(tooltip_pos);
SetNextWindowBgAlpha(g.Style.Colors[ImGuiCol_PopupBg].w * 0.60f);
//PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * 0.60f); // This would be nice but e.g ColorButton with checkboard has issue with transparent colors :(
- BeginTooltipEx(0, true);
+ tooltip_flags |= ImGuiTooltipFlags_OverridePreviousTooltip;
}
- else
- {
- BeginTooltipEx(0, false);
- }
-}
-// Not exposed publicly as BeginTooltip() because bool parameters are evil. Let's see if other needs arise first.
-void ImGui::BeginTooltipEx(ImGuiWindowFlags extra_flags, bool override_previous_tooltip)
-{
- ImGuiContext& g = *GImGui;
char window_name[16];
ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", g.TooltipOverrideCount);
- if (override_previous_tooltip)
+ if (tooltip_flags & ImGuiTooltipFlags_OverridePreviousTooltip)
if (ImGuiWindow* window = FindWindowByName(window_name))
if (window->Active)
{
// Hide previous tooltip from being displayed. We can't easily "reset" the content of a window so we create a new one.
window->Hidden = true;
- window->HiddenFramesRegular = 1;
+ window->HiddenFramesCanSkipItems = 1;
ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", ++g.TooltipOverrideCount);
}
ImGuiWindowFlags flags = ImGuiWindowFlags_Tooltip|ImGuiWindowFlags_NoInputs|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize;
@@ -6351,11 +7400,7 @@ void ImGui::EndTooltip()
void ImGui::SetTooltipV(const char* fmt, va_list args)
{
- ImGuiContext& g = *GImGui;
- if (g.DragDropWithinSourceOrTarget)
- BeginTooltip();
- else
- BeginTooltipEx(0, true);
+ BeginTooltipEx(0, ImGuiTooltipFlags_OverridePreviousTooltip);
TextV(fmt, args);
EndTooltip();
}
@@ -6375,16 +7420,16 @@ void ImGui::SetTooltip(const char* fmt, ...)
bool ImGui::IsPopupOpen(ImGuiID id)
{
ImGuiContext& g = *GImGui;
- return g.OpenPopupStack.Size > g.CurrentPopupStack.Size && g.OpenPopupStack[g.CurrentPopupStack.Size].PopupId == id;
+ return g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].PopupId == id;
}
bool ImGui::IsPopupOpen(const char* str_id)
{
ImGuiContext& g = *GImGui;
- return g.OpenPopupStack.Size > g.CurrentPopupStack.Size && g.OpenPopupStack[g.CurrentPopupStack.Size].PopupId == g.CurrentWindow->GetID(str_id);
+ return g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].PopupId == g.CurrentWindow->GetID(str_id);
}
-ImGuiWindow* ImGui::GetFrontMostPopupModal()
+ImGuiWindow* ImGui::GetTopMostPopupModal()
{
ImGuiContext& g = *GImGui;
for (int n = g.OpenPopupStack.Size-1; n >= 0; n--)
@@ -6408,17 +7453,17 @@ void ImGui::OpenPopupEx(ImGuiID id)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* parent_window = g.CurrentWindow;
- int current_stack_size = g.CurrentPopupStack.Size;
- ImGuiPopupRef popup_ref; // Tagged as new ref as Window will be set back to NULL if we write this into OpenPopupStack.
+ int current_stack_size = g.BeginPopupStack.Size;
+ ImGuiPopupData popup_ref; // Tagged as new ref as Window will be set back to NULL if we write this into OpenPopupStack.
popup_ref.PopupId = id;
popup_ref.Window = NULL;
- popup_ref.ParentWindow = parent_window;
+ popup_ref.SourceWindow = g.NavWindow;
popup_ref.OpenFrameCount = g.FrameCount;
popup_ref.OpenParentId = parent_window->IDStack.back();
- popup_ref.OpenMousePos = g.IO.MousePos;
popup_ref.OpenPopupPos = NavCalcPreferredRefPos();
+ popup_ref.OpenMousePos = IsMousePosValid(&g.IO.MousePos) ? g.IO.MousePos : popup_ref.OpenPopupPos;
- //printf("[%05d] OpenPopupEx(0x%08X)\n", g.FrameCount, id);
+ //IMGUI_DEBUG_LOG("OpenPopupEx(0x%08X)\n", g.FrameCount, id);
if (g.OpenPopupStack.Size < current_stack_size + 1)
{
g.OpenPopupStack.push_back(popup_ref);
@@ -6446,7 +7491,183 @@ void ImGui::OpenPopupEx(ImGuiID id)
}
}
-bool ImGui::OpenPopupOnItemClick(const char* str_id, int mouse_button)
+void ImGui::ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to_window_under_popup)
+{
+ ImGuiContext& g = *GImGui;
+ if (g.OpenPopupStack.empty())
+ return;
+
+ // When popups are stacked, clicking on a lower level popups puts focus back to it and close popups above it.
+ // Don't close our own child popup windows.
+ int popup_count_to_keep = 0;
+ if (ref_window)
+ {
+ // Find the highest popup which is a descendant of the reference window (generally reference window = NavWindow)
+ for (; popup_count_to_keep < g.OpenPopupStack.Size; popup_count_to_keep++)
+ {
+ ImGuiPopupData& popup = g.OpenPopupStack[popup_count_to_keep];
+ if (!popup.Window)
+ continue;
+ IM_ASSERT((popup.Window->Flags & ImGuiWindowFlags_Popup) != 0);
+ if (popup.Window->Flags & ImGuiWindowFlags_ChildWindow)
+ continue;
+
+ // Trim the stack when popups are not direct descendant of the reference window (the reference window is often the NavWindow)
+ bool popup_or_descendent_is_ref_window = false;
+ for (int m = popup_count_to_keep; m < g.OpenPopupStack.Size && !popup_or_descendent_is_ref_window; m++)
+ if (ImGuiWindow* popup_window = g.OpenPopupStack[m].Window)
+ if (popup_window->RootWindow == ref_window->RootWindow)
+ popup_or_descendent_is_ref_window = true;
+ if (!popup_or_descendent_is_ref_window)
+ break;
+ }
+ }
+ if (popup_count_to_keep < g.OpenPopupStack.Size) // This test is not required but it allows to set a convenient breakpoint on the statement below
+ {
+ //IMGUI_DEBUG_LOG("ClosePopupsOverWindow(%s) -> ClosePopupToLevel(%d)\n", ref_window->Name, popup_count_to_keep);
+ ClosePopupToLevel(popup_count_to_keep, restore_focus_to_window_under_popup);
+ }
+}
+
+void ImGui::ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_popup)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(remaining >= 0 && remaining < g.OpenPopupStack.Size);
+ ImGuiWindow* focus_window = g.OpenPopupStack[remaining].SourceWindow;
+ ImGuiWindow* popup_window = g.OpenPopupStack[remaining].Window;
+ g.OpenPopupStack.resize(remaining);
+
+ if (restore_focus_to_window_under_popup)
+ {
+ if (focus_window && !focus_window->WasActive && popup_window)
+ {
+ // Fallback
+ FocusTopMostWindowUnderOne(popup_window, NULL);
+ }
+ else
+ {
+ if (g.NavLayer == 0 && focus_window)
+ focus_window = NavRestoreLastChildNavWindow(focus_window);
+ FocusWindow(focus_window);
+ }
+ }
+}
+
+// Close the popup we have begin-ed into.
+void ImGui::CloseCurrentPopup()
+{
+ ImGuiContext& g = *GImGui;
+ int popup_idx = g.BeginPopupStack.Size - 1;
+ if (popup_idx < 0 || popup_idx >= g.OpenPopupStack.Size || g.BeginPopupStack[popup_idx].PopupId != g.OpenPopupStack[popup_idx].PopupId)
+ return;
+
+ // Closing a menu closes its top-most parent popup (unless a modal)
+ while (popup_idx > 0)
+ {
+ ImGuiWindow* popup_window = g.OpenPopupStack[popup_idx].Window;
+ ImGuiWindow* parent_popup_window = g.OpenPopupStack[popup_idx - 1].Window;
+ bool close_parent = false;
+ if (popup_window && (popup_window->Flags & ImGuiWindowFlags_ChildMenu))
+ if (parent_popup_window == NULL || !(parent_popup_window->Flags & ImGuiWindowFlags_Modal))
+ close_parent = true;
+ if (!close_parent)
+ break;
+ popup_idx--;
+ }
+ //IMGUI_DEBUG_LOG("CloseCurrentPopup %d -> %d\n", g.BeginPopupStack.Size - 1, popup_idx);
+ ClosePopupToLevel(popup_idx, true);
+
+ // A common pattern is to close a popup when selecting a menu item/selectable that will open another window.
+ // To improve this usage pattern, we avoid nav highlight for a single frame in the parent window.
+ // Similarly, we could avoid mouse hover highlight in this window but it is less visually problematic.
+ if (ImGuiWindow* window = g.NavWindow)
+ window->DC.NavHideHighlightOneFrame = true;
+}
+
+bool ImGui::BeginPopupEx(ImGuiID id, ImGuiWindowFlags flags)
+{
+ ImGuiContext& g = *GImGui;
+ if (!IsPopupOpen(id))
+ {
+ g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values
+ return false;
+ }
+
+ char name[20];
+ if (flags & ImGuiWindowFlags_ChildMenu)
+ ImFormatString(name, IM_ARRAYSIZE(name), "##Menu_%02d", g.BeginPopupStack.Size); // Recycle windows based on depth
+ else
+ ImFormatString(name, IM_ARRAYSIZE(name), "##Popup_%08x", id); // Not recycling, so we can close/open during the same frame
+
+ flags |= ImGuiWindowFlags_Popup;
+ bool is_open = Begin(name, NULL, flags);
+ if (!is_open) // NB: Begin can return false when the popup is completely clipped (e.g. zero size display)
+ EndPopup();
+
+ return is_open;
+}
+
+bool ImGui::BeginPopup(const char* str_id, ImGuiWindowFlags flags)
+{
+ ImGuiContext& g = *GImGui;
+ if (g.OpenPopupStack.Size <= g.BeginPopupStack.Size) // Early out for performance
+ {
+ g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values
+ return false;
+ }
+ flags |= ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings;
+ return BeginPopupEx(g.CurrentWindow->GetID(str_id), flags);
+}
+
+// If 'p_open' is specified for a modal popup window, the popup will have a regular close button which will close the popup.
+// Note that popup visibility status is owned by Dear ImGui (and manipulated with e.g. OpenPopup) so the actual value of *p_open is meaningless here.
+bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags flags)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ const ImGuiID id = window->GetID(name);
+ if (!IsPopupOpen(id))
+ {
+ g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values
+ return false;
+ }
+
+ // Center modal windows by default
+ // FIXME: Should test for (PosCond & window->SetWindowPosAllowFlags) with the upcoming window.
+ if ((g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos) == 0)
+ SetNextWindowPos(g.IO.DisplaySize * 0.5f, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
+
+ flags |= ImGuiWindowFlags_Popup | ImGuiWindowFlags_Modal | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings;
+ const bool is_open = Begin(name, p_open, flags);
+ if (!is_open || (p_open && !*p_open)) // NB: is_open can be 'false' when the popup is completely clipped (e.g. zero size display)
+ {
+ EndPopup();
+ if (is_open)
+ ClosePopupToLevel(g.BeginPopupStack.Size, true);
+ return false;
+ }
+ return is_open;
+}
+
+void ImGui::EndPopup()
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ IM_ASSERT(window->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginPopup()/EndPopup() calls
+ IM_ASSERT(g.BeginPopupStack.Size > 0);
+
+ // Make all menus and popups wrap around for now, may need to expose that policy.
+ NavMoveRequestTryWrapping(window, ImGuiNavMoveFlags_LoopY);
+
+ // Child-popups don't need to be layed out
+ IM_ASSERT(g.WithinEndChild == false);
+ if (window->Flags & ImGuiWindowFlags_ChildWindow)
+ g.WithinEndChild = true;
+ End();
+ g.WithinEndChild = false;
+}
+
+bool ImGui::OpenPopupOnItemClick(const char* str_id, ImGuiMouseButton mouse_button)
{
ImGuiWindow* window = GImGui->CurrentWindow;
if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup))
@@ -6459,148 +7680,14 @@ bool ImGui::OpenPopupOnItemClick(const char* str_id, int mouse_button)
return false;
}
-void ImGui::ClosePopupsOverWindow(ImGuiWindow* ref_window)
-{
- ImGuiContext& g = *GImGui;
- if (g.OpenPopupStack.empty())
- return;
-
- // When popups are stacked, clicking on a lower level popups puts focus back to it and close popups above it.
- // Don't close our own child popup windows.
- int n = 0;
- if (ref_window)
- {
- for (n = 0; n < g.OpenPopupStack.Size; n++)
- {
- ImGuiPopupRef& popup = g.OpenPopupStack[n];
- if (!popup.Window)
- continue;
- IM_ASSERT((popup.Window->Flags & ImGuiWindowFlags_Popup) != 0);
- if (popup.Window->Flags & ImGuiWindowFlags_ChildWindow)
- continue;
-
- // Trim the stack if popups are not direct descendant of the reference window (which is often the NavWindow)
- bool has_focus = false;
- for (int m = n; m < g.OpenPopupStack.Size && !has_focus; m++)
- has_focus = (g.OpenPopupStack[m].Window && g.OpenPopupStack[m].Window->RootWindow == ref_window->RootWindow);
- if (!has_focus)
- break;
- }
- }
- if (n < g.OpenPopupStack.Size) // This test is not required but it allows to set a convenient breakpoint on the block below
- ClosePopupToLevel(n);
-}
-
-void ImGui::ClosePopupToLevel(int remaining)
-{
- IM_ASSERT(remaining >= 0);
- ImGuiContext& g = *GImGui;
- ImGuiWindow* focus_window = (remaining > 0) ? g.OpenPopupStack[remaining-1].Window : g.OpenPopupStack[0].ParentWindow;
- if (g.NavLayer == 0)
- focus_window = NavRestoreLastChildNavWindow(focus_window);
- FocusWindow(focus_window);
- focus_window->DC.NavHideHighlightOneFrame = true;
- g.OpenPopupStack.resize(remaining);
-}
-
-void ImGui::ClosePopup(ImGuiID id)
-{
- if (!IsPopupOpen(id))
- return;
- ImGuiContext& g = *GImGui;
- ClosePopupToLevel(g.OpenPopupStack.Size - 1);
-}
-
-// Close the popup we have begin-ed into.
-void ImGui::CloseCurrentPopup()
-{
- ImGuiContext& g = *GImGui;
- int popup_idx = g.CurrentPopupStack.Size - 1;
- if (popup_idx < 0 || popup_idx >= g.OpenPopupStack.Size || g.CurrentPopupStack[popup_idx].PopupId != g.OpenPopupStack[popup_idx].PopupId)
- return;
- while (popup_idx > 0 && g.OpenPopupStack[popup_idx].Window && (g.OpenPopupStack[popup_idx].Window->Flags & ImGuiWindowFlags_ChildMenu))
- popup_idx--;
- ClosePopupToLevel(popup_idx);
-}
-
-bool ImGui::BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_flags)
-{
- ImGuiContext& g = *GImGui;
- if (!IsPopupOpen(id))
- {
- g.NextWindowData.Clear(); // We behave like Begin() and need to consume those values
- return false;
- }
-
- char name[20];
- if (extra_flags & ImGuiWindowFlags_ChildMenu)
- ImFormatString(name, IM_ARRAYSIZE(name), "##Menu_%02d", g.CurrentPopupStack.Size); // Recycle windows based on depth
- else
- ImFormatString(name, IM_ARRAYSIZE(name), "##Popup_%08x", id); // Not recycling, so we can close/open during the same frame
-
- bool is_open = Begin(name, NULL, extra_flags | ImGuiWindowFlags_Popup);
- if (!is_open) // NB: Begin can return false when the popup is completely clipped (e.g. zero size display)
- EndPopup();
-
- return is_open;
-}
-
-bool ImGui::BeginPopup(const char* str_id, ImGuiWindowFlags flags)
-{
- ImGuiContext& g = *GImGui;
- if (g.OpenPopupStack.Size <= g.CurrentPopupStack.Size) // Early out for performance
- {
- g.NextWindowData.Clear(); // We behave like Begin() and need to consume those values
- return false;
- }
- return BeginPopupEx(g.CurrentWindow->GetID(str_id), flags|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings);
-}
-
-bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags flags)
-{
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = g.CurrentWindow;
- const ImGuiID id = window->GetID(name);
- if (!IsPopupOpen(id))
- {
- g.NextWindowData.Clear(); // We behave like Begin() and need to consume those values
- return false;
- }
-
- // Center modal windows by default
- // FIXME: Should test for (PosCond & window->SetWindowPosAllowFlags) with the upcoming window.
- if (g.NextWindowData.PosCond == 0)
- SetNextWindowPos(g.IO.DisplaySize * 0.5f, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
-
- bool is_open = Begin(name, p_open, flags | ImGuiWindowFlags_Popup | ImGuiWindowFlags_Modal | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings);
- if (!is_open || (p_open && !*p_open)) // NB: is_open can be 'false' when the popup is completely clipped (e.g. zero size display)
- {
- EndPopup();
- if (is_open)
- ClosePopup(id);
- return false;
- }
- return is_open;
-}
-
-void ImGui::EndPopup()
-{
- ImGuiContext& g = *GImGui; (void)g;
- IM_ASSERT(g.CurrentWindow->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginPopup()/EndPopup() calls
- IM_ASSERT(g.CurrentPopupStack.Size > 0);
-
- // Make all menus and popups wrap around for now, may need to expose that policy.
- NavMoveRequestTryWrapping(g.CurrentWindow, ImGuiNavMoveFlags_LoopY);
-
- End();
-}
-
// This is a helper to handle the simplest case of associating one named popup to one given widget.
// You may want to handle this on user side if you have specific needs (e.g. tweaking IsItemHovered() parameters).
// You can pass a NULL str_id to use the identifier of the last item.
-bool ImGui::BeginPopupContextItem(const char* str_id, int mouse_button)
+bool ImGui::BeginPopupContextItem(const char* str_id, ImGuiMouseButton mouse_button)
{
ImGuiWindow* window = GImGui->CurrentWindow;
+ if (window->SkipItems)
+ return false;
ImGuiID id = str_id ? window->GetID(str_id) : window->DC.LastItemId; // If user hasn't passed an ID, we can use the LastItemID. Using LastItemID as a Popup ID won't conflict!
IM_ASSERT(id != 0); // You cannot pass a NULL str_id if the last item has no identifier (e.g. a Text() item)
if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup))
@@ -6608,7 +7695,7 @@ bool ImGui::BeginPopupContextItem(const char* str_id, int mouse_button)
return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings);
}
-bool ImGui::BeginPopupContextWindow(const char* str_id, int mouse_button, bool also_over_items)
+bool ImGui::BeginPopupContextWindow(const char* str_id, ImGuiMouseButton mouse_button, bool also_over_items)
{
if (!str_id)
str_id = "window_context";
@@ -6619,7 +7706,7 @@ bool ImGui::BeginPopupContextWindow(const char* str_id, int mouse_button, bool a
return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings);
}
-bool ImGui::BeginPopupContextVoid(const char* str_id, int mouse_button)
+bool ImGui::BeginPopupContextVoid(const char* str_id, ImGuiMouseButton mouse_button)
{
if (!str_id)
str_id = "void_context";
@@ -6629,21 +7716,13 @@ bool ImGui::BeginPopupContextVoid(const char* str_id, int mouse_button)
return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings);
}
-ImRect ImGui::GetWindowAllowedExtentRect(ImGuiWindow*)
-{
- ImVec2 padding = GImGui->Style.DisplaySafeAreaPadding;
- ImRect r_screen = GetViewportRect();
- r_screen.Expand(ImVec2((r_screen.GetWidth() > padding.x * 2) ? -padding.x : 0.0f, (r_screen.GetHeight() > padding.y * 2) ? -padding.y : 0.0f));
- return r_screen;
-}
-
// r_avoid = the rectangle to avoid (e.g. for tooltip it is a rectangle around the mouse cursor which we want to avoid. for popups it's a small point around the cursor.)
// r_outer = the visible area rectangle, minus safe area padding. If our popup size won't fit because of safe area padding we ignore it.
ImVec2 ImGui::FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy)
{
ImVec2 base_pos_clamped = ImClamp(ref_pos, r_outer.Min, r_outer.Max - size);
- //GImGui->OverlayDrawList.AddRect(r_avoid.Min, r_avoid.Max, IM_COL32(255,0,0,255));
- //GImGui->OverlayDrawList.AddRect(r_outer.Min, r_outer.Max, IM_COL32(0,255,0,255));
+ //GetForegroundDrawList()->AddRect(r_avoid.Min, r_avoid.Max, IM_COL32(255,0,0,255));
+ //GetForegroundDrawList()->AddRect(r_outer.Min, r_outer.Max, IM_COL32(0,255,0,255));
// Combo Box policy (we want a connecting edge)
if (policy == ImGuiPopupPositionPolicy_ComboBox)
@@ -6692,6 +7771,15 @@ ImVec2 ImGui::FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& s
return pos;
}
+ImRect ImGui::GetWindowAllowedExtentRect(ImGuiWindow* window)
+{
+ IM_UNUSED(window);
+ ImVec2 padding = GImGui->Style.DisplaySafeAreaPadding;
+ ImRect r_screen = GetViewportRect();
+ r_screen.Expand(ImVec2((r_screen.GetWidth() > padding.x * 2) ? -padding.x : 0.0f, (r_screen.GetHeight() > padding.y * 2) ? -padding.y : 0.0f));
+ return r_screen;
+}
+
ImVec2 ImGui::FindBestWindowPosForPopup(ImGuiWindow* window)
{
ImGuiContext& g = *GImGui;
@@ -6699,11 +7787,11 @@ ImVec2 ImGui::FindBestWindowPosForPopup(ImGuiWindow* window)
ImRect r_outer = GetWindowAllowedExtentRect(window);
if (window->Flags & ImGuiWindowFlags_ChildMenu)
{
- // Child menus typically request _any_ position within the parent menu item, and then our FindBestWindowPosForPopup() function will move the new menu outside the parent bounds.
+ // Child menus typically request _any_ position within the parent menu item, and then we move the new menu outside the parent bounds.
// This is how we end up with child menus appearing (most-commonly) on the right of the parent menu.
IM_ASSERT(g.CurrentWindow == window);
ImGuiWindow* parent_window = g.CurrentWindowStack[g.CurrentWindowStack.Size - 2];
- float horizontal_overlap = g.Style.ItemSpacing.x; // We want some overlap to convey the relative depth of each menu (currently the amount of overlap is hard-coded to style.ItemSpacing.x).
+ float horizontal_overlap = g.Style.ItemInnerSpacing.x; // We want some overlap to convey the relative depth of each menu (currently the amount of overlap is hard-coded to style.ItemSpacing.x).
ImRect r_avoid;
if (parent_window->DC.MenuBarAppending)
r_avoid = ImRect(-FLT_MAX, parent_window->Pos.y + parent_window->TitleBarHeight(), FLT_MAX, parent_window->Pos.y + parent_window->TitleBarHeight() + parent_window->MenuBarHeight());
@@ -6735,10 +7823,57 @@ ImVec2 ImGui::FindBestWindowPosForPopup(ImGuiWindow* window)
return window->Pos;
}
+
//-----------------------------------------------------------------------------
// [SECTION] KEYBOARD/GAMEPAD NAVIGATION
//-----------------------------------------------------------------------------
+// FIXME-NAV: The existence of SetNavID vs SetNavIDWithRectRel vs SetFocusID is incredibly messy and confusing,
+// and needs some explanation or serious refactoring.
+void ImGui::SetNavID(ImGuiID id, int nav_layer, ImGuiID focus_scope_id)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(g.NavWindow);
+ IM_ASSERT(nav_layer == 0 || nav_layer == 1);
+ g.NavId = id;
+ g.NavFocusScopeId = focus_scope_id;
+ g.NavWindow->NavLastIds[nav_layer] = id;
+}
+
+void ImGui::SetNavIDWithRectRel(ImGuiID id, int nav_layer, ImGuiID focus_scope_id, const ImRect& rect_rel)
+{
+ ImGuiContext& g = *GImGui;
+ SetNavID(id, nav_layer, focus_scope_id);
+ g.NavWindow->NavRectRel[nav_layer] = rect_rel;
+ g.NavMousePosDirty = true;
+ g.NavDisableHighlight = false;
+ g.NavDisableMouseHover = true;
+}
+
+void ImGui::SetFocusID(ImGuiID id, ImGuiWindow* window)
+{
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(id != 0);
+
+ // Assume that SetFocusID() is called in the context where its window->DC.NavLayerCurrent and window->DC.NavFocusScopeIdCurrent are valid.
+ // Note that window may be != g.CurrentWindow (e.g. SetFocusID call in InputTextEx for multi-line text)
+ const ImGuiNavLayer nav_layer = window->DC.NavLayerCurrent;
+ if (g.NavWindow != window)
+ g.NavInitRequest = false;
+ g.NavWindow = window;
+ g.NavId = id;
+ g.NavLayer = nav_layer;
+ g.NavFocusScopeId = window->DC.NavFocusScopeIdCurrent;
+ window->NavLastIds[nav_layer] = id;
+ if (window->DC.LastItemId == id)
+ window->NavRectRel[nav_layer] = ImRect(window->DC.LastItemRect.Min - window->Pos, window->DC.LastItemRect.Max - window->Pos);
+
+ if (g.ActiveIdSource == ImGuiInputSource_Nav)
+ g.NavDisableMouseHover = true;
+ else
+ g.NavDisableHighlight = true;
+}
+
ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy)
{
if (ImFabs(dx) > ImFabs(dy))
@@ -6770,7 +7905,7 @@ static void inline NavClampRectToVisibleAreaForMoveDir(ImGuiDir move_dir, ImRect
}
// Scoring function for directional navigation. Based on https://gist.github.com/rygorous/6981057
-static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
+static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
@@ -6784,7 +7919,7 @@ static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
if (window->ParentWindow == g.NavWindow)
{
IM_ASSERT((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened);
- if (!window->ClipRect.Contains(cand))
+ if (!window->ClipRect.Overlaps(cand))
return false;
cand.ClipWithFull(window->ClipRect); // This allows the scored item to not overlap other candidates in the parent window
}
@@ -6833,13 +7968,13 @@ static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
#if IMGUI_DEBUG_NAV_SCORING
char buf[128];
- if (ImGui::IsMouseHoveringRect(cand.Min, cand.Max))
+ if (IsMouseHoveringRect(cand.Min, cand.Max))
{
ImFormatString(buf, IM_ARRAYSIZE(buf), "dbox (%.2f,%.2f->%.4f)\ndcen (%.2f,%.2f->%.4f)\nd (%.2f,%.2f->%.4f)\nnav %c, quadrant %c", dbx, dby, dist_box, dcx, dcy, dist_center, dax, day, dist_axial, "WENS"[g.NavMoveDir], "WENS"[quadrant]);
- ImDrawList* draw_list = ImGui::GetOverlayDrawList();
+ ImDrawList* draw_list = GetForegroundDrawList(window);
draw_list->AddRect(curr.Min, curr.Max, IM_COL32(255,200,0,100));
draw_list->AddRect(cand.Min, cand.Max, IM_COL32(255,255,0,200));
- draw_list->AddRectFilled(cand.Max-ImVec2(4,4), cand.Max+ImGui::CalcTextSize(buf)+ImVec2(4,4), IM_COL32(40,0,0,150));
+ draw_list->AddRectFilled(cand.Max - ImVec2(4,4), cand.Max + CalcTextSize(buf) + ImVec2(4,4), IM_COL32(40,0,0,150));
draw_list->AddText(g.IO.FontDefault, 13.0f, cand.Max, ~0U, buf);
}
else if (g.IO.KeyCtrl) // Hold to preview score in matching quadrant. Press C to rotate.
@@ -6848,7 +7983,7 @@ static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
if (quadrant == g.NavMoveDir)
{
ImFormatString(buf, IM_ARRAYSIZE(buf), "%.0f/%.0f", dist_box, dist_center);
- ImDrawList* draw_list = ImGui::GetOverlayDrawList();
+ ImDrawList* draw_list = GetForegroundDrawList(window);
draw_list->AddRectFilled(cand.Min, cand.Max, IM_COL32(255, 0, 0, 200));
draw_list->AddText(g.IO.FontDefault, 13.0f, cand.Min, IM_COL32(255, 255, 255, 255), buf);
}
@@ -6929,7 +8064,7 @@ static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, con
// Process Move Request (scoring for navigation)
// FIXME-NAV: Consider policy for double scoring (scoring from NavScoringRectScreen + scoring from a rect wrapped according to current wrapping policy)
- if ((g.NavId != id || (g.NavMoveRequestFlags & ImGuiNavMoveFlags_AllowCurrentNavId)) && !(item_flags & ImGuiItemFlags_NoNav))
+ if ((g.NavId != id || (g.NavMoveRequestFlags & ImGuiNavMoveFlags_AllowCurrentNavId)) && !(item_flags & (ImGuiItemFlags_Disabled|ImGuiItemFlags_NoNav)))
{
ImGuiNavMoveResult* result = (window == g.NavWindow) ? &g.NavMoveResultLocal : &g.NavMoveResultOther;
#if IMGUI_DEBUG_NAV_SCORING
@@ -6942,19 +8077,22 @@ static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, con
#endif
if (new_best)
{
- result->ID = id;
result->Window = window;
+ result->ID = id;
+ result->FocusScopeId = window->DC.NavFocusScopeIdCurrent;
result->RectRel = nav_bb_rel;
}
+ // Features like PageUp/PageDown need to maintain a separate score for the visible set of items.
const float VISIBLE_RATIO = 0.70f;
if ((g.NavMoveRequestFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet) && window->ClipRect.Overlaps(nav_bb))
if (ImClamp(nav_bb.Max.y, window->ClipRect.Min.y, window->ClipRect.Max.y) - ImClamp(nav_bb.Min.y, window->ClipRect.Min.y, window->ClipRect.Max.y) >= (nav_bb.Max.y - nav_bb.Min.y) * VISIBLE_RATIO)
if (NavScoreItem(&g.NavMoveResultLocalVisibleSet, nav_bb))
{
result = &g.NavMoveResultLocalVisibleSet;
- result->ID = id;
result->Window = window;
+ result->ID = id;
+ result->FocusScopeId = window->DC.NavFocusScopeIdCurrent;
result->RectRel = nav_bb_rel;
}
}
@@ -6964,8 +8102,9 @@ static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, con
{
g.NavWindow = window; // Always refresh g.NavWindow, because some operations such as FocusItem() don't have a window.
g.NavLayer = window->DC.NavLayerCurrent;
+ g.NavFocusScopeId = window->DC.NavFocusScopeIdCurrent;
g.NavIdIsAlive = true;
- g.NavIdTabCounter = window->FocusIdxTabCounter;
+ g.NavIdTabCounter = window->DC.FocusCounterTabStop;
window->NavRectRel[window->DC.NavLayerCurrent] = nav_bb_rel; // Store item bounding box (relative to window position)
}
}
@@ -6987,7 +8126,7 @@ void ImGui::NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, const Im
{
ImGuiContext& g = *GImGui;
IM_ASSERT(g.NavMoveRequestForward == ImGuiNavForward_None);
- ImGui::NavMoveRequestCancel();
+ NavMoveRequestCancel();
g.NavMoveDir = move_dir;
g.NavMoveClipDir = clip_dir;
g.NavMoveRequestForward = ImGuiNavForward_ForwardQueued;
@@ -7006,7 +8145,7 @@ void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags mov
ImGuiDir clip_dir = g.NavMoveDir;
if (g.NavMoveDir == ImGuiDir_Left && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX)))
{
- bb_rel.Min.x = bb_rel.Max.x = ImMax(window->SizeFull.x, window->SizeContents.x) - window->Scroll.x;
+ bb_rel.Min.x = bb_rel.Max.x = ImMax(window->SizeFull.x, window->ContentSize.x + window->WindowPadding.x * 2.0f) - window->Scroll.x;
if (move_flags & ImGuiNavMoveFlags_WrapX) { bb_rel.TranslateY(-bb_rel.GetHeight()); clip_dir = ImGuiDir_Up; }
NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags);
}
@@ -7018,7 +8157,7 @@ void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags mov
}
if (g.NavMoveDir == ImGuiDir_Up && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY)))
{
- bb_rel.Min.y = bb_rel.Max.y = ImMax(window->SizeFull.y, window->SizeContents.y) - window->Scroll.y;
+ bb_rel.Min.y = bb_rel.Max.y = ImMax(window->SizeFull.y, window->ContentSize.y + window->WindowPadding.y * 2.0f) - window->Scroll.y;
if (move_flags & ImGuiNavMoveFlags_WrapY) { bb_rel.TranslateX(-bb_rel.GetWidth()); clip_dir = ImGuiDir_Left; }
NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags);
}
@@ -7030,7 +8169,9 @@ void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags mov
}
}
-static void ImGui::NavSaveLastChildNavWindow(ImGuiWindow* nav_window)
+// FIXME: This could be replaced by updating a frame number in each window when (window == NavWindow) and (NavLayer == 0).
+// This way we could find the last focused window among our children. It would be much less confusing this way?
+static void ImGui::NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window)
{
ImGuiWindow* parent_window = nav_window;
while (parent_window && (parent_window->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (parent_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0)
@@ -7039,22 +8180,24 @@ static void ImGui::NavSaveLastChildNavWindow(ImGuiWindow* nav_window)
parent_window->NavLastChildNavWindow = nav_window;
}
-// Call when we are expected to land on Layer 0 after FocusWindow()
+// Restore the last focused child.
+// Call when we are expected to land on the Main Layer (0) after FocusWindow()
static ImGuiWindow* ImGui::NavRestoreLastChildNavWindow(ImGuiWindow* window)
{
return window->NavLastChildNavWindow ? window->NavLastChildNavWindow : window;
}
-static void NavRestoreLayer(int layer)
+static void NavRestoreLayer(ImGuiNavLayer layer)
{
ImGuiContext& g = *GImGui;
g.NavLayer = layer;
if (layer == 0)
g.NavWindow = ImGui::NavRestoreLastChildNavWindow(g.NavWindow);
- if (layer == 0 && g.NavWindow->NavLastIds[0] != 0)
- ImGui::SetNavIDWithRectRel(g.NavWindow->NavLastIds[0], layer, g.NavWindow->NavRectRel[0]);
+ ImGuiWindow* window = g.NavWindow;
+ if (layer == 0 && window->NavLastIds[0] != 0)
+ ImGui::SetNavIDWithRectRel(window->NavLastIds[0], layer, 0, window->NavRectRel[0]);
else
- ImGui::NavInitWindow(g.NavWindow, true);
+ ImGui::NavInitWindow(window, true);
}
static inline void ImGui::NavUpdateAnyRequestFlag()
@@ -7074,9 +8217,10 @@ void ImGui::NavInitWindow(ImGuiWindow* window, bool force_reinit)
if (!(window->Flags & ImGuiWindowFlags_NoNavInputs))
if (!(window->Flags & ImGuiWindowFlags_ChildWindow) || (window->Flags & ImGuiWindowFlags_Popup) || (window->NavLastIds[0] == 0) || force_reinit)
init_for_nav = true;
+ //IMGUI_DEBUG_LOG("[Nav] NavInitWindow() init_for_nav=%d, window=\"%s\", layer=%d\n", init_for_nav, window->Name, g.NavLayer);
if (init_for_nav)
{
- SetNavID(0, g.NavLayer);
+ SetNavID(0, g.NavLayer, 0);
g.NavInitRequest = true;
g.NavInitRequestFromMove = false;
g.NavInitResultId = 0;
@@ -7086,6 +8230,7 @@ void ImGui::NavInitWindow(ImGuiWindow* window, bool force_reinit)
else
{
g.NavId = window->NavLastIds[0];
+ g.NavFocusScopeId = 0;
}
}
@@ -7093,13 +8238,20 @@ static ImVec2 ImGui::NavCalcPreferredRefPos()
{
ImGuiContext& g = *GImGui;
if (g.NavDisableHighlight || !g.NavDisableMouseHover || !g.NavWindow)
- return ImFloor(g.IO.MousePos);
-
- // When navigation is active and mouse is disabled, decide on an arbitrary position around the bottom left of the currently navigated item
- const ImRect& rect_rel = g.NavWindow->NavRectRel[g.NavLayer];
- ImVec2 pos = g.NavWindow->Pos + ImVec2(rect_rel.Min.x + ImMin(g.Style.FramePadding.x*4, rect_rel.GetWidth()), rect_rel.Max.y - ImMin(g.Style.FramePadding.y, rect_rel.GetHeight()));
- ImRect visible_rect = GetViewportRect();
- return ImFloor(ImClamp(pos, visible_rect.Min, visible_rect.Max)); // ImFloor() is important because non-integer mouse position application in back-end might be lossy and result in undesirable non-zero delta.
+ {
+ // Mouse (we need a fallback in case the mouse becomes invalid after being used)
+ if (IsMousePosValid(&g.IO.MousePos))
+ return g.IO.MousePos;
+ return g.LastValidMousePos;
+ }
+ else
+ {
+ // When navigation is active and mouse is disabled, decide on an arbitrary position around the bottom left of the currently navigated item.
+ const ImRect& rect_rel = g.NavWindow->NavRectRel[g.NavLayer];
+ ImVec2 pos = g.NavWindow->Pos + ImVec2(rect_rel.Min.x + ImMin(g.Style.FramePadding.x * 4, rect_rel.GetWidth()), rect_rel.Max.y - ImMin(g.Style.FramePadding.y, rect_rel.GetHeight()));
+ ImRect visible_rect = GetViewportRect();
+ return ImFloor(ImClamp(pos, visible_rect.Min, visible_rect.Max)); // ImFloor() is important because non-integer mouse position application in back-end might be lossy and result in undesirable non-zero delta.
+ }
}
float ImGui::GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode)
@@ -7116,11 +8268,11 @@ float ImGui::GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode)
if (mode == ImGuiInputReadMode_Pressed) // Return 1.0f when just pressed, no repeat, ignore analog input.
return (t == 0.0f) ? 1.0f : 0.0f;
if (mode == ImGuiInputReadMode_Repeat)
- return (float)CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay * 0.80f, g.IO.KeyRepeatRate * 0.80f);
+ return (float)CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay * 0.72f, g.IO.KeyRepeatRate * 0.80f);
if (mode == ImGuiInputReadMode_RepeatSlow)
- return (float)CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay * 1.00f, g.IO.KeyRepeatRate * 2.00f);
+ return (float)CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay * 1.25f, g.IO.KeyRepeatRate * 2.00f);
if (mode == ImGuiInputReadMode_RepeatFast)
- return (float)CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay * 0.80f, g.IO.KeyRepeatRate * 0.30f);
+ return (float)CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay * 0.72f, g.IO.KeyRepeatRate * 0.30f);
return 0.0f;
}
@@ -7140,47 +8292,16 @@ ImVec2 ImGui::GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInput
return delta;
}
-// Scroll to keep newly navigated item fully into view
-// NB: We modify rect_rel by the amount we scrolled for, so it is immediately updated.
-static void NavScrollToBringItemIntoView(ImGuiWindow* window, const ImRect& item_rect)
-{
- ImRect window_rect(window->InnerMainRect.Min - ImVec2(1, 1), window->InnerMainRect.Max + ImVec2(1, 1));
- //g.OverlayDrawList.AddRect(window_rect.Min, window_rect.Max, IM_COL32_WHITE); // [DEBUG]
- if (window_rect.Contains(item_rect))
- return;
-
- ImGuiContext& g = *GImGui;
- if (window->ScrollbarX && item_rect.Min.x < window_rect.Min.x)
- {
- window->ScrollTarget.x = item_rect.Min.x - window->Pos.x + window->Scroll.x - g.Style.ItemSpacing.x;
- window->ScrollTargetCenterRatio.x = 0.0f;
- }
- else if (window->ScrollbarX && item_rect.Max.x >= window_rect.Max.x)
- {
- window->ScrollTarget.x = item_rect.Max.x - window->Pos.x + window->Scroll.x + g.Style.ItemSpacing.x;
- window->ScrollTargetCenterRatio.x = 1.0f;
- }
- if (item_rect.Min.y < window_rect.Min.y)
- {
- window->ScrollTarget.y = item_rect.Min.y - window->Pos.y + window->Scroll.y - g.Style.ItemSpacing.y;
- window->ScrollTargetCenterRatio.y = 0.0f;
- }
- else if (item_rect.Max.y >= window_rect.Max.y)
- {
- window->ScrollTarget.y = item_rect.Max.y - window->Pos.y + window->Scroll.y + g.Style.ItemSpacing.y;
- window->ScrollTargetCenterRatio.y = 1.0f;
- }
-}
-
static void ImGui::NavUpdate()
{
ImGuiContext& g = *GImGui;
g.IO.WantSetMousePos = false;
#if 0
- if (g.NavScoringCount > 0) printf("[%05d] NavScoringCount %d for '%s' layer %d (Init:%d, Move:%d)\n", g.FrameCount, g.NavScoringCount, g.NavWindow ? g.NavWindow->Name : "NULL", g.NavLayer, g.NavInitRequest || g.NavInitResultId != 0, g.NavMoveRequest);
+ if (g.NavScoringCount > 0) IMGUI_DEBUG_LOG("NavScoringCount %d for '%s' layer %d (Init:%d, Move:%d)\n", g.FrameCount, g.NavScoringCount, g.NavWindow ? g.NavWindow->Name : "NULL", g.NavLayer, g.NavInitRequest || g.NavInitResultId != 0, g.NavMoveRequest);
#endif
- // Set input source as Gamepad when buttons are pressed before we map Keyboard (some features differs when used with Gamepad vs Keyboard)
+ // Set input source as Gamepad when buttons are pressed (as some features differs when used with Gamepad vs Keyboard)
+ // (do it before we map Keyboard input!)
bool nav_keyboard_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0;
bool nav_gamepad_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (g.IO.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0;
if (nav_gamepad_active)
@@ -7190,7 +8311,7 @@ static void ImGui::NavUpdate()
// Update Keyboard->Nav inputs mapping
if (nav_keyboard_active)
{
- #define NAV_MAP_KEY(_KEY, _NAV_INPUT) if (IsKeyDown(g.IO.KeyMap[_KEY])) { g.IO.NavInputs[_NAV_INPUT] = 1.0f; g.NavInputSource = ImGuiInputSource_NavKeyboard; }
+ #define NAV_MAP_KEY(_KEY, _NAV_INPUT) do { if (IsKeyDown(g.IO.KeyMap[_KEY])) { g.IO.NavInputs[_NAV_INPUT] = 1.0f; g.NavInputSource = ImGuiInputSource_NavKeyboard; } } while (0)
NAV_MAP_KEY(ImGuiKey_Space, ImGuiNavInput_Activate );
NAV_MAP_KEY(ImGuiKey_Enter, ImGuiNavInput_Input );
NAV_MAP_KEY(ImGuiKey_Escape, ImGuiNavInput_Cancel );
@@ -7198,9 +8319,12 @@ static void ImGui::NavUpdate()
NAV_MAP_KEY(ImGuiKey_RightArrow,ImGuiNavInput_KeyRight_);
NAV_MAP_KEY(ImGuiKey_UpArrow, ImGuiNavInput_KeyUp_ );
NAV_MAP_KEY(ImGuiKey_DownArrow, ImGuiNavInput_KeyDown_ );
- if (g.IO.KeyCtrl) g.IO.NavInputs[ImGuiNavInput_TweakSlow] = 1.0f;
- if (g.IO.KeyShift) g.IO.NavInputs[ImGuiNavInput_TweakFast] = 1.0f;
- if (g.IO.KeyAlt) g.IO.NavInputs[ImGuiNavInput_KeyMenu_] = 1.0f;
+ if (g.IO.KeyCtrl)
+ g.IO.NavInputs[ImGuiNavInput_TweakSlow] = 1.0f;
+ if (g.IO.KeyShift)
+ g.IO.NavInputs[ImGuiNavInput_TweakFast] = 1.0f;
+ if (g.IO.KeyAlt && !g.IO.KeyCtrl) // AltGR is Alt+Ctrl, also even on keyboards without AltGR we don't want Alt+Ctrl to open menu.
+ g.IO.NavInputs[ImGuiNavInput_KeyMenu_] = 1.0f;
#undef NAV_MAP_KEY
}
memcpy(g.IO.NavInputsDownDurationPrev, g.IO.NavInputsDownDuration, sizeof(g.IO.NavInputsDownDuration));
@@ -7208,14 +8332,15 @@ static void ImGui::NavUpdate()
g.IO.NavInputsDownDuration[i] = (g.IO.NavInputs[i] > 0.0f) ? (g.IO.NavInputsDownDuration[i] < 0.0f ? 0.0f : g.IO.NavInputsDownDuration[i] + g.IO.DeltaTime) : -1.0f;
// Process navigation init request (select first/default focus)
- if (g.NavInitResultId != 0 && (!g.NavDisableHighlight || g.NavInitRequestFromMove))
+ // In very rare cases g.NavWindow may be null (e.g. clearing focus after requesting an init request, which does happen when releasing Alt while clicking on void)
+ if (g.NavInitResultId != 0 && (!g.NavDisableHighlight || g.NavInitRequestFromMove) && g.NavWindow)
{
// Apply result from previous navigation init request (will typically select the first item, unless SetItemDefaultFocus() has been called)
- IM_ASSERT(g.NavWindow);
+ //IMGUI_DEBUG_LOG("[Nav] Apply NavInitRequest result: 0x%08X Layer %d in \"%s\"\n", g.NavInitResultId, g.NavLayer, g.NavWindow->Name);
if (g.NavInitRequestFromMove)
- SetNavIDWithRectRel(g.NavInitResultId, g.NavLayer, g.NavInitResultRectRel);
+ SetNavIDWithRectRel(g.NavInitResultId, g.NavLayer, 0, g.NavInitResultRectRel);
else
- SetNavID(g.NavInitResultId, g.NavLayer);
+ SetNavID(g.NavInitResultId, g.NavLayer, 0);
g.NavWindow->NavRectRel[g.NavLayer] = g.NavInitResultRectRel;
}
g.NavInitRequest = false;
@@ -7224,7 +8349,7 @@ static void ImGui::NavUpdate()
g.NavJustMovedToId = 0;
// Process navigation move request
- if (g.NavMoveRequest && (g.NavMoveResultLocal.ID != 0 || g.NavMoveResultOther.ID != 0))
+ if (g.NavMoveRequest)
NavUpdateMoveResult();
// When a forwarded move request failed, we restore the highlight that we disabled during the forward frame
@@ -7256,7 +8381,7 @@ static void ImGui::NavUpdate()
// Store our return window (for returning from Layer 1 to Layer 0) and clear it as soon as we step back in our own Layer 0
if (g.NavWindow)
- NavSaveLastChildNavWindow(g.NavWindow);
+ NavSaveLastChildNavWindowIntoParent(g.NavWindow);
if (g.NavWindow && g.NavWindow->NavLastChildNavWindow != NULL && g.NavLayer == 0)
g.NavWindow->NavLastChildNavWindow = NULL;
@@ -7265,14 +8390,15 @@ static void ImGui::NavUpdate()
// Set output flags for user application
g.IO.NavActive = (nav_keyboard_active || nav_gamepad_active) && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs);
- g.IO.NavVisible = (g.IO.NavActive && g.NavId != 0 && !g.NavDisableHighlight) || (g.NavWindowingTarget != NULL) || g.NavInitRequest;
+ g.IO.NavVisible = (g.IO.NavActive && g.NavId != 0 && !g.NavDisableHighlight) || (g.NavWindowingTarget != NULL);
// Process NavCancel input (to close a popup, get back to parent, clear focus)
- if (IsNavInputPressed(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed))
+ if (IsNavInputTest(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed))
{
if (g.ActiveId != 0)
{
- ClearActiveID();
+ if (!IsActiveIdUsingNavInput(ImGuiNavInput_Cancel))
+ ClearActiveID();
}
else if (g.NavWindow && (g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow) && !(g.NavWindow->Flags & ImGuiWindowFlags_Popup) && g.NavWindow->ParentWindow)
{
@@ -7281,8 +8407,9 @@ static void ImGui::NavUpdate()
ImGuiWindow* parent_window = g.NavWindow->ParentWindow;
IM_ASSERT(child_window->ChildId != 0);
FocusWindow(parent_window);
- SetNavID(child_window->ChildId, 0);
- g.NavIdIsAlive = false;
+ SetNavID(child_window->ChildId, 0, 0);
+ // Reassigning with same value, we're being explicit here.
+ g.NavIdIsAlive = false; // -V1048
if (g.NavDisableMouseHover)
g.NavMousePosDirty = true;
}
@@ -7290,19 +8417,19 @@ static void ImGui::NavUpdate()
{
// Close open popup/menu
if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
- ClosePopupToLevel(g.OpenPopupStack.Size - 1);
+ ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
}
else if (g.NavLayer != 0)
{
// Leave the "menu" layer
- NavRestoreLayer(0);
+ NavRestoreLayer(ImGuiNavLayer_Main);
}
else
{
// Clear NavLastId for popups but keep it for regular child window so we can leave one and come back where we were
if (g.NavWindow && ((g.NavWindow->Flags & ImGuiWindowFlags_Popup) || !(g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow)))
g.NavWindow->NavLastIds[0] = 0;
- g.NavId = 0;
+ g.NavId = g.NavFocusScopeId = 0;
}
}
@@ -7311,14 +8438,14 @@ static void ImGui::NavUpdate()
if (g.NavId != 0 && !g.NavDisableHighlight && !g.NavWindowingTarget && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
{
bool activate_down = IsNavInputDown(ImGuiNavInput_Activate);
- bool activate_pressed = activate_down && IsNavInputPressed(ImGuiNavInput_Activate, ImGuiInputReadMode_Pressed);
+ bool activate_pressed = activate_down && IsNavInputTest(ImGuiNavInput_Activate, ImGuiInputReadMode_Pressed);
if (g.ActiveId == 0 && activate_pressed)
g.NavActivateId = g.NavId;
if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && activate_down)
g.NavActivateDownId = g.NavId;
if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && activate_pressed)
g.NavActivatePressedId = g.NavId;
- if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && IsNavInputPressed(ImGuiNavInput_Input, ImGuiInputReadMode_Pressed))
+ if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && IsNavInputTest(ImGuiNavInput_Input, ImGuiInputReadMode_Pressed))
g.NavInputId = g.NavId;
}
if (g.NavWindow && (g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
@@ -7333,17 +8460,17 @@ static void ImGui::NavUpdate()
g.NavNextActivateId = 0;
// Initiate directional inputs request
- const int allowed_dir_flags = (g.ActiveId == 0) ? ~0 : g.ActiveIdAllowNavDirFlags;
if (g.NavMoveRequestForward == ImGuiNavForward_None)
{
g.NavMoveDir = ImGuiDir_None;
- g.NavMoveRequestFlags = 0;
- if (g.NavWindow && !g.NavWindowingTarget && allowed_dir_flags && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
+ g.NavMoveRequestFlags = ImGuiNavMoveFlags_None;
+ if (g.NavWindow && !g.NavWindowingTarget && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs))
{
- if ((allowed_dir_flags & (1<Name, g.NavLayer);
g.NavInitRequest = g.NavInitRequestFromMove = true;
- g.NavInitResultId = 0;
+ // Reassigning with same value, we're being explicit here.
+ g.NavInitResultId = 0; // -V1048
g.NavDisableHighlight = false;
}
NavUpdateAnyRequestFlag();
@@ -7380,13 +8510,13 @@ static void ImGui::NavUpdate()
{
// *Fallback* manual-scroll with Nav directional keys when window has no navigable item
ImGuiWindow* window = g.NavWindow;
- const float scroll_speed = ImFloor(window->CalcFontSize() * 100 * g.IO.DeltaTime + 0.5f); // We need round the scrolling speed because sub-pixel scroll isn't reliably supported.
+ const float scroll_speed = IM_ROUND(window->CalcFontSize() * 100 * g.IO.DeltaTime); // We need round the scrolling speed because sub-pixel scroll isn't reliably supported.
if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll && g.NavMoveRequest)
{
if (g.NavMoveDir == ImGuiDir_Left || g.NavMoveDir == ImGuiDir_Right)
- SetWindowScrollX(window, ImFloor(window->Scroll.x + ((g.NavMoveDir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed));
+ SetScrollX(window, ImFloor(window->Scroll.x + ((g.NavMoveDir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed));
if (g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down)
- SetWindowScrollY(window, ImFloor(window->Scroll.y + ((g.NavMoveDir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed));
+ SetScrollY(window, ImFloor(window->Scroll.y + ((g.NavMoveDir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed));
}
// *Normal* Manual scroll with NavScrollXXX keys
@@ -7394,12 +8524,12 @@ static void ImGui::NavUpdate()
ImVec2 scroll_dir = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadLStick, ImGuiInputReadMode_Down, 1.0f/10.0f, 10.0f);
if (scroll_dir.x != 0.0f && window->ScrollbarX)
{
- SetWindowScrollX(window, ImFloor(window->Scroll.x + scroll_dir.x * scroll_speed));
+ SetScrollX(window, ImFloor(window->Scroll.x + scroll_dir.x * scroll_speed));
g.NavMoveFromClampedRefRect = true;
}
if (scroll_dir.y != 0.0f)
{
- SetWindowScrollY(window, ImFloor(window->Scroll.y + scroll_dir.y * scroll_speed));
+ SetScrollY(window, ImFloor(window->Scroll.y + scroll_dir.y * scroll_speed));
g.NavMoveFromClampedRefRect = true;
}
}
@@ -7413,13 +8543,13 @@ static void ImGui::NavUpdate()
if (g.NavMoveRequest && g.NavMoveFromClampedRefRect && g.NavLayer == 0)
{
ImGuiWindow* window = g.NavWindow;
- ImRect window_rect_rel(window->InnerMainRect.Min - window->Pos - ImVec2(1,1), window->InnerMainRect.Max - window->Pos + ImVec2(1,1));
+ ImRect window_rect_rel(window->InnerRect.Min - window->Pos - ImVec2(1,1), window->InnerRect.Max - window->Pos + ImVec2(1,1));
if (!window_rect_rel.Contains(window->NavRectRel[g.NavLayer]))
{
float pad = window->CalcFontSize() * 0.5f;
window_rect_rel.Expand(ImVec2(-ImMin(window_rect_rel.GetWidth(), pad), -ImMin(window_rect_rel.GetHeight(), pad))); // Terrible approximation for the intent of starting navigation from first fully visible item
window->NavRectRel[g.NavLayer].ClipWith(window_rect_rel);
- g.NavId = 0;
+ g.NavId = g.NavFocusScopeId = 0;
}
g.NavMoveFromClampedRefRect = false;
}
@@ -7431,18 +8561,34 @@ static void ImGui::NavUpdate()
g.NavScoringRectScreen.Min.x = ImMin(g.NavScoringRectScreen.Min.x + 1.0f, g.NavScoringRectScreen.Max.x);
g.NavScoringRectScreen.Max.x = g.NavScoringRectScreen.Min.x;
IM_ASSERT(!g.NavScoringRectScreen.IsInverted()); // Ensure if we have a finite, non-inverted bounding box here will allows us to remove extraneous ImFabs() calls in NavScoreItem().
- //g.OverlayDrawList.AddRect(g.NavScoringRectScreen.Min, g.NavScoringRectScreen.Max, IM_COL32(255,200,0,255)); // [DEBUG]
+ //GetForegroundDrawList()->AddRect(g.NavScoringRectScreen.Min, g.NavScoringRectScreen.Max, IM_COL32(255,200,0,255)); // [DEBUG]
g.NavScoringCount = 0;
#if IMGUI_DEBUG_NAV_RECTS
- if (g.NavWindow) { for (int layer = 0; layer < 2; layer++) GetOverlayDrawList()->AddRect(g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Min, g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Max, IM_COL32(255,200,0,255)); } // [DEBUG]
- if (g.NavWindow) { ImU32 col = (g.NavWindow->HiddenFrames == 0) ? IM_COL32(255,0,255,255) : IM_COL32(255,0,0,255); ImVec2 p = NavCalcPreferredRefPos(); char buf[32]; ImFormatString(buf, 32, "%d", g.NavLayer); g.OverlayDrawList.AddCircleFilled(p, 3.0f, col); g.OverlayDrawList.AddText(NULL, 13.0f, p + ImVec2(8,-4), col, buf); }
+ if (g.NavWindow)
+ {
+ ImDrawList* draw_list = GetForegroundDrawList(g.NavWindow);
+ if (1) { for (int layer = 0; layer < 2; layer++) draw_list->AddRect(g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Min, g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Max, IM_COL32(255,200,0,255)); } // [DEBUG]
+ if (1) { ImU32 col = (!g.NavWindow->Hidden) ? IM_COL32(255,0,255,255) : IM_COL32(255,0,0,255); ImVec2 p = NavCalcPreferredRefPos(); char buf[32]; ImFormatString(buf, 32, "%d", g.NavLayer); draw_list->AddCircleFilled(p, 3.0f, col); draw_list->AddText(NULL, 13.0f, p + ImVec2(8,-4), col, buf); }
+ }
#endif
}
+// Apply result from previous frame navigation directional move request
static void ImGui::NavUpdateMoveResult()
{
- // Select which result to use
ImGuiContext& g = *GImGui;
+ if (g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0)
+ {
+ // In a situation when there is no results but NavId != 0, re-enable the Navigation highlight (because g.NavId is not considered as a possible result)
+ if (g.NavId != 0)
+ {
+ g.NavDisableHighlight = false;
+ g.NavDisableMouseHover = true;
+ }
+ return;
+ }
+
+ // Select which result to use
ImGuiNavMoveResult* result = (g.NavMoveResultLocal.ID != 0) ? &g.NavMoveResultLocal : &g.NavMoveResultOther;
// PageUp/PageDown behavior first jumps to the bottom/top mostly visible item, _otherwise_ use the result from the previous/next page.
@@ -7459,72 +8605,110 @@ static void ImGui::NavUpdateMoveResult()
// Scroll to keep newly navigated item fully into view.
if (g.NavLayer == 0)
{
- ImRect rect_abs = ImRect(result->RectRel.Min + result->Window->Pos, result->RectRel.Max + result->Window->Pos);
- NavScrollToBringItemIntoView(result->Window, rect_abs);
+ ImVec2 delta_scroll;
+ if (g.NavMoveRequestFlags & ImGuiNavMoveFlags_ScrollToEdge)
+ {
+ float scroll_target = (g.NavMoveDir == ImGuiDir_Up) ? result->Window->ScrollMax.y : 0.0f;
+ delta_scroll.y = result->Window->Scroll.y - scroll_target;
+ SetScrollY(result->Window, scroll_target);
+ }
+ else
+ {
+ ImRect rect_abs = ImRect(result->RectRel.Min + result->Window->Pos, result->RectRel.Max + result->Window->Pos);
+ delta_scroll = ScrollToBringRectIntoView(result->Window, rect_abs);
+ }
- // Estimate upcoming scroll so we can offset our result position so mouse position can be applied immediately after in NavUpdate()
- ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(result->Window, false);
- ImVec2 delta_scroll = result->Window->Scroll - next_scroll;
- result->RectRel.Translate(delta_scroll);
-
- // Also scroll parent window to keep us into view if necessary (we could/should technically recurse back the whole the parent hierarchy).
- if (result->Window->Flags & ImGuiWindowFlags_ChildWindow)
- NavScrollToBringItemIntoView(result->Window->ParentWindow, ImRect(rect_abs.Min + delta_scroll, rect_abs.Max + delta_scroll));
+ // Offset our result position so mouse position can be applied immediately after in NavUpdate()
+ result->RectRel.TranslateX(-delta_scroll.x);
+ result->RectRel.TranslateY(-delta_scroll.y);
}
- // Apply result from previous frame navigation directional move request
ClearActiveID();
g.NavWindow = result->Window;
- SetNavIDWithRectRel(result->ID, g.NavLayer, result->RectRel);
- g.NavJustMovedToId = result->ID;
+ if (g.NavId != result->ID)
+ {
+ // Don't set NavJustMovedToId if just landed on the same spot (which may happen with ImGuiNavMoveFlags_AllowCurrentNavId)
+ g.NavJustMovedToId = result->ID;
+ g.NavJustMovedToFocusScopeId = result->FocusScopeId;
+
+ }
+ SetNavIDWithRectRel(result->ID, g.NavLayer, result->FocusScopeId, result->RectRel);
g.NavMoveFromClampedRefRect = false;
}
-static float ImGui::NavUpdatePageUpPageDown(int allowed_dir_flags)
+// Handle PageUp/PageDown/Home/End keys
+static float ImGui::NavUpdatePageUpPageDown()
{
ImGuiContext& g = *GImGui;
- if (g.NavMoveDir == ImGuiDir_None && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.NavWindowingTarget && g.NavLayer == 0)
+ if (g.NavMoveDir != ImGuiDir_None || g.NavWindow == NULL)
+ return 0.0f;
+ if ((g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) || g.NavWindowingTarget != NULL || g.NavLayer != 0)
+ return 0.0f;
+
+ ImGuiWindow* window = g.NavWindow;
+ const bool page_up_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageUp]) && !IsActiveIdUsingKey(ImGuiKey_PageUp);
+ const bool page_down_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageDown]) && !IsActiveIdUsingKey(ImGuiKey_PageDown);
+ const bool home_pressed = IsKeyPressed(g.IO.KeyMap[ImGuiKey_Home]) && !IsActiveIdUsingKey(ImGuiKey_Home);
+ const bool end_pressed = IsKeyPressed(g.IO.KeyMap[ImGuiKey_End]) && !IsActiveIdUsingKey(ImGuiKey_End);
+ if (page_up_held != page_down_held || home_pressed != end_pressed) // If either (not both) are pressed
{
- ImGuiWindow* window = g.NavWindow;
- bool page_up_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageUp]) && (allowed_dir_flags & (1 << ImGuiDir_Up));
- bool page_down_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageDown]) && (allowed_dir_flags & (1 << ImGuiDir_Down));
- if ((page_up_held && !page_down_held) || (page_down_held && !page_up_held))
+ if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll)
{
- if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll)
+ // Fallback manual-scroll when window has no navigable item
+ if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
+ SetScrollY(window, window->Scroll.y - window->InnerRect.GetHeight());
+ else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
+ SetScrollY(window, window->Scroll.y + window->InnerRect.GetHeight());
+ else if (home_pressed)
+ SetScrollY(window, 0.0f);
+ else if (end_pressed)
+ SetScrollY(window, window->ScrollMax.y);
+ }
+ else
+ {
+ ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer];
+ const float page_offset_y = ImMax(0.0f, window->InnerRect.GetHeight() - window->CalcFontSize() * 1.0f + nav_rect_rel.GetHeight());
+ float nav_scoring_rect_offset_y = 0.0f;
+ if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
{
- // Fallback manual-scroll when window has no navigable item
- if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
- SetWindowScrollY(window, window->Scroll.y - window->InnerClipRect.GetHeight());
- else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
- SetWindowScrollY(window, window->Scroll.y + window->InnerClipRect.GetHeight());
+ nav_scoring_rect_offset_y = -page_offset_y;
+ g.NavMoveDir = ImGuiDir_Down; // Because our scoring rect is offset up, we request the down direction (so we can always land on the last item)
+ g.NavMoveClipDir = ImGuiDir_Up;
+ g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
}
- else
+ else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
{
- const ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer];
- const float page_offset_y = ImMax(0.0f, window->InnerClipRect.GetHeight() - window->CalcFontSize() * 1.0f + nav_rect_rel.GetHeight());
- float nav_scoring_rect_offset_y = 0.0f;
- if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
- {
- nav_scoring_rect_offset_y = -page_offset_y;
- g.NavMoveDir = ImGuiDir_Down; // Because our scoring rect is offset, we intentionally request the opposite direction (so we can always land on the last item)
- g.NavMoveClipDir = ImGuiDir_Up;
- g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
- }
- else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
- {
- nav_scoring_rect_offset_y = +page_offset_y;
- g.NavMoveDir = ImGuiDir_Up; // Because our scoring rect is offset, we intentionally request the opposite direction (so we can always land on the last item)
- g.NavMoveClipDir = ImGuiDir_Down;
- g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
- }
- return nav_scoring_rect_offset_y;
+ nav_scoring_rect_offset_y = +page_offset_y;
+ g.NavMoveDir = ImGuiDir_Up; // Because our scoring rect is offset down, we request the up direction (so we can always land on the last item)
+ g.NavMoveClipDir = ImGuiDir_Down;
+ g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
}
+ else if (home_pressed)
+ {
+ // FIXME-NAV: handling of Home/End is assuming that the top/bottom most item will be visible with Scroll.y == 0/ScrollMax.y
+ // Scrolling will be handled via the ImGuiNavMoveFlags_ScrollToEdge flag, we don't scroll immediately to avoid scrolling happening before nav result.
+ // Preserve current horizontal position if we have any.
+ nav_rect_rel.Min.y = nav_rect_rel.Max.y = -window->Scroll.y;
+ if (nav_rect_rel.IsInverted())
+ nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f;
+ g.NavMoveDir = ImGuiDir_Down;
+ g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdge;
+ }
+ else if (end_pressed)
+ {
+ nav_rect_rel.Min.y = nav_rect_rel.Max.y = window->ScrollMax.y + window->SizeFull.y - window->Scroll.y;
+ if (nav_rect_rel.IsInverted())
+ nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f;
+ g.NavMoveDir = ImGuiDir_Up;
+ g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdge;
+ }
+ return nav_scoring_rect_offset_y;
}
}
return 0.0f;
}
-static int FindWindowFocusIndex(ImGuiWindow* window) // FIXME-OPT O(N)
+static int ImGui::FindWindowFocusIndex(ImGuiWindow* window) // FIXME-OPT O(N)
{
ImGuiContext& g = *GImGui;
for (int i = g.WindowsFocusOrder.Size-1; i >= 0; i--)
@@ -7549,7 +8733,7 @@ static void NavUpdateWindowingHighlightWindow(int focus_change_dir)
if (g.NavWindowingTarget->Flags & ImGuiWindowFlags_Modal)
return;
- const int i_current = FindWindowFocusIndex(g.NavWindowingTarget);
+ const int i_current = ImGui::FindWindowFocusIndex(g.NavWindowingTarget);
ImGuiWindow* window_target = FindWindowNavFocusable(i_current + focus_change_dir, -INT_MAX, focus_change_dir);
if (!window_target)
window_target = FindWindowNavFocusable((focus_change_dir < 0) ? (g.WindowsFocusOrder.Size - 1) : 0, i_current, focus_change_dir);
@@ -7558,14 +8742,16 @@ static void NavUpdateWindowingHighlightWindow(int focus_change_dir)
g.NavWindowingToggleLayer = false;
}
-// Window management mode (hold to: change focus/move/resize, tap to: toggle menu layer)
+// Windowing management mode
+// Keyboard: CTRL+Tab (change focus/move/resize), Alt (toggle menu layer)
+// Gamepad: Hold Menu/Square (change focus/move/resize), Tap Menu/Square (toggle menu layer)
static void ImGui::NavUpdateWindowing()
{
ImGuiContext& g = *GImGui;
ImGuiWindow* apply_focus_window = NULL;
bool apply_toggle_layer = false;
- ImGuiWindow* modal_window = GetFrontMostPopupModal();
+ ImGuiWindow* modal_window = GetTopMostPopupModal();
if (modal_window != NULL)
{
g.NavWindowingTarget = NULL;
@@ -7581,12 +8767,12 @@ static void ImGui::NavUpdateWindowing()
}
// Start CTRL-TAB or Square+L/R window selection
- bool start_windowing_with_gamepad = !g.NavWindowingTarget && IsNavInputPressed(ImGuiNavInput_Menu, ImGuiInputReadMode_Pressed);
+ bool start_windowing_with_gamepad = !g.NavWindowingTarget && IsNavInputTest(ImGuiNavInput_Menu, ImGuiInputReadMode_Pressed);
bool start_windowing_with_keyboard = !g.NavWindowingTarget && g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab) && (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard);
if (start_windowing_with_gamepad || start_windowing_with_keyboard)
if (ImGuiWindow* window = g.NavWindow ? g.NavWindow : FindWindowNavFocusable(g.WindowsFocusOrder.Size - 1, -INT_MAX, -1))
{
- g.NavWindowingTarget = g.NavWindowingTargetAnim = window;
+ g.NavWindowingTarget = g.NavWindowingTargetAnim = window->RootWindow; // FIXME-DOCK: Will need to use RootWindowDockStop
g.NavWindowingTimer = g.NavWindowingHighlightAlpha = 0.0f;
g.NavWindowingToggleLayer = start_windowing_with_keyboard ? false : true;
g.NavInputSource = start_windowing_with_keyboard ? ImGuiInputSource_NavKeyboard : ImGuiInputSource_NavGamepad;
@@ -7600,14 +8786,14 @@ static void ImGui::NavUpdateWindowing()
g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha, ImSaturate((g.NavWindowingTimer - NAV_WINDOWING_HIGHLIGHT_DELAY) / 0.05f));
// Select window to focus
- const int focus_change_dir = (int)IsNavInputPressed(ImGuiNavInput_FocusPrev, ImGuiInputReadMode_RepeatSlow) - (int)IsNavInputPressed(ImGuiNavInput_FocusNext, ImGuiInputReadMode_RepeatSlow);
+ const int focus_change_dir = (int)IsNavInputTest(ImGuiNavInput_FocusPrev, ImGuiInputReadMode_RepeatSlow) - (int)IsNavInputTest(ImGuiNavInput_FocusNext, ImGuiInputReadMode_RepeatSlow);
if (focus_change_dir != 0)
{
NavUpdateWindowingHighlightWindow(focus_change_dir);
g.NavWindowingHighlightAlpha = 1.0f;
}
- // Single press toggles NavLayer, long press with L/R apply actual focus on release (until then the window was merely rendered front-most)
+ // Single press toggles NavLayer, long press with L/R apply actual focus on release (until then the window was merely rendered top-most)
if (!IsNavInputDown(ImGuiNavInput_Menu))
{
g.NavWindowingToggleLayer &= (g.NavWindowingHighlightAlpha < 1.0f); // Once button was held long enough we don't consider it a tap-to-toggle-layer press anymore.
@@ -7632,7 +8818,9 @@ static void ImGui::NavUpdateWindowing()
// Keyboard: Press and Release ALT to toggle menu layer
// FIXME: We lack an explicit IO variable for "is the imgui window focused", so compare mouse validity to detect the common case of back-end clearing releases all keys on ALT-TAB
- if ((g.ActiveId == 0 || g.ActiveIdAllowOverlap) && IsNavInputPressed(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Released))
+ if (IsNavInputTest(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Pressed))
+ g.NavWindowingToggleLayer = true;
+ if ((g.ActiveId == 0 || g.ActiveIdAllowOverlap) && g.NavWindowingToggleLayer && IsNavInputTest(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Released))
if (IsMousePosValid(&g.IO.MousePos) == IsMousePosValid(&g.IO.MousePosPrev))
apply_toggle_layer = true;
@@ -7648,7 +8836,7 @@ static void ImGui::NavUpdateWindowing()
{
const float NAV_MOVE_SPEED = 800.0f;
const float move_speed = ImFloor(NAV_MOVE_SPEED * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y)); // FIXME: Doesn't code variable framerate very well
- g.NavWindowingTarget->RootWindow->Pos += move_delta * move_speed;
+ SetWindowPos(g.NavWindowingTarget->RootWindow, g.NavWindowingTarget->RootWindow->Pos + move_delta * move_speed, ImGuiCond_Always);
g.NavDisableMouseHover = true;
MarkIniSettingsDirty(g.NavWindowingTarget);
}
@@ -7657,17 +8845,18 @@ static void ImGui::NavUpdateWindowing()
// Apply final focus
if (apply_focus_window && (g.NavWindow == NULL || apply_focus_window != g.NavWindow->RootWindow))
{
+ ClearActiveID();
g.NavDisableHighlight = false;
g.NavDisableMouseHover = true;
apply_focus_window = NavRestoreLastChildNavWindow(apply_focus_window);
- ClosePopupsOverWindow(apply_focus_window);
+ ClosePopupsOverWindow(apply_focus_window, false);
FocusWindow(apply_focus_window);
if (apply_focus_window->NavLastIds[0] == 0)
NavInitWindow(apply_focus_window, false);
// If the window only has a menu layer, select it directly
- if (apply_focus_window->DC.NavLayerActiveMask == (1 << 1))
- g.NavLayer = 1;
+ if (apply_focus_window->DC.NavLayerActiveMask == (1 << ImGuiNavLayer_Menu))
+ g.NavLayer = ImGuiNavLayer_Menu;
}
if (apply_focus_window)
g.NavWindowingTarget = NULL;
@@ -7677,7 +8866,10 @@ static void ImGui::NavUpdateWindowing()
{
// Move to parent menu if necessary
ImGuiWindow* new_nav_window = g.NavWindow;
- while ((new_nav_window->DC.NavLayerActiveMask & (1 << 1)) == 0 && (new_nav_window->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (new_nav_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0)
+ while (new_nav_window->ParentWindow
+ && (new_nav_window->DC.NavLayerActiveMask & (1 << ImGuiNavLayer_Menu)) == 0
+ && (new_nav_window->Flags & ImGuiWindowFlags_ChildWindow) != 0
+ && (new_nav_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0)
new_nav_window = new_nav_window->ParentWindow;
if (new_nav_window != g.NavWindow)
{
@@ -7687,7 +8879,10 @@ static void ImGui::NavUpdateWindowing()
}
g.NavDisableHighlight = false;
g.NavDisableMouseHover = true;
- NavRestoreLayer((g.NavWindow->DC.NavLayerActiveMask & (1 << 1)) ? (g.NavLayer ^ 1) : 0);
+
+ // When entering a regular menu bar with the Alt key, we always reinitialize the navigation ID.
+ const ImGuiNavLayer new_nav_layer = (g.NavWindow->DC.NavLayerActiveMask & (1 << ImGuiNavLayer_Menu)) ? (ImGuiNavLayer)((int)g.NavLayer ^ 1) : ImGuiNavLayer_Main;
+ NavRestoreLayer(new_nav_layer);
}
}
@@ -7702,7 +8897,7 @@ static const char* GetFallbackWindowNameForWindowingList(ImGuiWindow* window)
}
// Overlay displayed when using CTRL+TAB. Called by EndFrame().
-void ImGui::NavUpdateWindowingList()
+void ImGui::NavUpdateWindowingOverlay()
{
ImGuiContext& g = *GImGui;
IM_ASSERT(g.NavWindowingTarget != NULL);
@@ -7730,328 +8925,6 @@ void ImGui::NavUpdateWindowingList()
PopStyleVar();
}
-//-----------------------------------------------------------------------------
-// [SECTION] COLUMNS
-// In the current version, Columns are very weak. Needs to be replaced with a more full-featured system.
-//-----------------------------------------------------------------------------
-
-void ImGui::NextColumn()
-{
- ImGuiWindow* window = GetCurrentWindow();
- if (window->SkipItems || window->DC.ColumnsSet == NULL)
- return;
-
- ImGuiContext& g = *GImGui;
- PopItemWidth();
- PopClipRect();
-
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
- if (++columns->Current < columns->Count)
- {
- // Columns 1+ cancel out IndentX
- window->DC.ColumnsOffset.x = GetColumnOffset(columns->Current) - window->DC.Indent.x + g.Style.ItemSpacing.x;
- window->DrawList->ChannelsSetCurrent(columns->Current);
- }
- else
- {
- window->DC.ColumnsOffset.x = 0.0f;
- window->DrawList->ChannelsSetCurrent(0);
- columns->Current = 0;
- columns->LineMinY = columns->LineMaxY;
- }
- window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
- window->DC.CursorPos.y = columns->LineMinY;
- window->DC.CurrentLineSize = ImVec2(0.0f, 0.0f);
- window->DC.CurrentLineTextBaseOffset = 0.0f;
-
- PushColumnClipRect();
- PushItemWidth(GetColumnWidth() * 0.65f); // FIXME: Move on columns setup
-}
-
-int ImGui::GetColumnIndex()
-{
- ImGuiWindow* window = GetCurrentWindowRead();
- return window->DC.ColumnsSet ? window->DC.ColumnsSet->Current : 0;
-}
-
-int ImGui::GetColumnsCount()
-{
- ImGuiWindow* window = GetCurrentWindowRead();
- return window->DC.ColumnsSet ? window->DC.ColumnsSet->Count : 1;
-}
-
-static float OffsetNormToPixels(const ImGuiColumnsSet* columns, float offset_norm)
-{
- return offset_norm * (columns->MaxX - columns->MinX);
-}
-
-static float PixelsToOffsetNorm(const ImGuiColumnsSet* columns, float offset)
-{
- return offset / (columns->MaxX - columns->MinX);
-}
-
-static inline float GetColumnsRectHalfWidth() { return 4.0f; }
-
-static float GetDraggedColumnOffset(ImGuiColumnsSet* columns, int column_index)
-{
- // Active (dragged) column always follow mouse. The reason we need this is that dragging a column to the right edge of an auto-resizing
- // window creates a feedback loop because we store normalized positions. So while dragging we enforce absolute positioning.
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = g.CurrentWindow;
- IM_ASSERT(column_index > 0); // We are not supposed to drag column 0.
- IM_ASSERT(g.ActiveId == columns->ID + ImGuiID(column_index));
-
- float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x + GetColumnsRectHalfWidth() - window->Pos.x;
- x = ImMax(x, ImGui::GetColumnOffset(column_index - 1) + g.Style.ColumnsMinSpacing);
- if ((columns->Flags & ImGuiColumnsFlags_NoPreserveWidths))
- x = ImMin(x, ImGui::GetColumnOffset(column_index + 1) - g.Style.ColumnsMinSpacing);
-
- return x;
-}
-
-float ImGui::GetColumnOffset(int column_index)
-{
- ImGuiWindow* window = GetCurrentWindowRead();
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- IM_ASSERT(columns != NULL);
-
- if (column_index < 0)
- column_index = columns->Current;
- IM_ASSERT(column_index < columns->Columns.Size);
-
- const float t = columns->Columns[column_index].OffsetNorm;
- const float x_offset = ImLerp(columns->MinX, columns->MaxX, t);
- return x_offset;
-}
-
-static float GetColumnWidthEx(ImGuiColumnsSet* columns, int column_index, bool before_resize = false)
-{
- if (column_index < 0)
- column_index = columns->Current;
-
- float offset_norm;
- if (before_resize)
- offset_norm = columns->Columns[column_index + 1].OffsetNormBeforeResize - columns->Columns[column_index].OffsetNormBeforeResize;
- else
- offset_norm = columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm;
- return OffsetNormToPixels(columns, offset_norm);
-}
-
-float ImGui::GetColumnWidth(int column_index)
-{
- ImGuiWindow* window = GetCurrentWindowRead();
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- IM_ASSERT(columns != NULL);
-
- if (column_index < 0)
- column_index = columns->Current;
- return OffsetNormToPixels(columns, columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm);
-}
-
-void ImGui::SetColumnOffset(int column_index, float offset)
-{
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = g.CurrentWindow;
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- IM_ASSERT(columns != NULL);
-
- if (column_index < 0)
- column_index = columns->Current;
- IM_ASSERT(column_index < columns->Columns.Size);
-
- const bool preserve_width = !(columns->Flags & ImGuiColumnsFlags_NoPreserveWidths) && (column_index < columns->Count-1);
- const float width = preserve_width ? GetColumnWidthEx(columns, column_index, columns->IsBeingResized) : 0.0f;
-
- if (!(columns->Flags & ImGuiColumnsFlags_NoForceWithinWindow))
- offset = ImMin(offset, columns->MaxX - g.Style.ColumnsMinSpacing * (columns->Count - column_index));
- columns->Columns[column_index].OffsetNorm = PixelsToOffsetNorm(columns, offset - columns->MinX);
-
- if (preserve_width)
- SetColumnOffset(column_index + 1, offset + ImMax(g.Style.ColumnsMinSpacing, width));
-}
-
-void ImGui::SetColumnWidth(int column_index, float width)
-{
- ImGuiWindow* window = GetCurrentWindowRead();
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- IM_ASSERT(columns != NULL);
-
- if (column_index < 0)
- column_index = columns->Current;
- SetColumnOffset(column_index + 1, GetColumnOffset(column_index) + width);
-}
-
-void ImGui::PushColumnClipRect(int column_index)
-{
- ImGuiWindow* window = GetCurrentWindowRead();
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- if (column_index < 0)
- column_index = columns->Current;
-
- PushClipRect(columns->Columns[column_index].ClipRect.Min, columns->Columns[column_index].ClipRect.Max, false);
-}
-
-static ImGuiColumnsSet* FindOrAddColumnsSet(ImGuiWindow* window, ImGuiID id)
-{
- for (int n = 0; n < window->ColumnsStorage.Size; n++)
- if (window->ColumnsStorage[n].ID == id)
- return &window->ColumnsStorage[n];
-
- window->ColumnsStorage.push_back(ImGuiColumnsSet());
- ImGuiColumnsSet* columns = &window->ColumnsStorage.back();
- columns->ID = id;
- return columns;
-}
-
-void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiColumnsFlags flags)
-{
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = GetCurrentWindow();
-
- IM_ASSERT(columns_count > 1);
- IM_ASSERT(window->DC.ColumnsSet == NULL); // Nested columns are currently not supported
-
- // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget.
- // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer.
- PushID(0x11223347 + (str_id ? 0 : columns_count));
- ImGuiID id = window->GetID(str_id ? str_id : "columns");
- PopID();
-
- // Acquire storage for the columns set
- ImGuiColumnsSet* columns = FindOrAddColumnsSet(window, id);
- IM_ASSERT(columns->ID == id);
- columns->Current = 0;
- columns->Count = columns_count;
- columns->Flags = flags;
- window->DC.ColumnsSet = columns;
-
- // Set state for first column
- const float content_region_width = (window->SizeContentsExplicit.x != 0.0f) ? (window->SizeContentsExplicit.x) : (window->InnerClipRect.Max.x - window->Pos.x);
- columns->MinX = window->DC.Indent.x - g.Style.ItemSpacing.x; // Lock our horizontal range
- columns->MaxX = ImMax(content_region_width - window->Scroll.x, columns->MinX + 1.0f);
- columns->StartPosY = window->DC.CursorPos.y;
- columns->StartMaxPosX = window->DC.CursorMaxPos.x;
- columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y;
- window->DC.ColumnsOffset.x = 0.0f;
- window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-
- // Clear data if columns count changed
- if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1)
- columns->Columns.resize(0);
-
- // Initialize defaults
- columns->IsFirstFrame = (columns->Columns.Size == 0);
- if (columns->Columns.Size == 0)
- {
- columns->Columns.reserve(columns_count + 1);
- for (int n = 0; n < columns_count + 1; n++)
- {
- ImGuiColumnData column;
- column.OffsetNorm = n / (float)columns_count;
- columns->Columns.push_back(column);
- }
- }
-
- for (int n = 0; n < columns_count; n++)
- {
- // Compute clipping rectangle
- ImGuiColumnData* column = &columns->Columns[n];
- float clip_x1 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n) - 1.0f);
- float clip_x2 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n + 1) - 1.0f);
- column->ClipRect = ImRect(clip_x1, -FLT_MAX, clip_x2, +FLT_MAX);
- column->ClipRect.ClipWith(window->ClipRect);
- }
-
- window->DrawList->ChannelsSplit(columns->Count);
- PushColumnClipRect();
- PushItemWidth(GetColumnWidth() * 0.65f);
-}
-
-void ImGui::EndColumns()
-{
- ImGuiContext& g = *GImGui;
- ImGuiWindow* window = GetCurrentWindow();
- ImGuiColumnsSet* columns = window->DC.ColumnsSet;
- IM_ASSERT(columns != NULL);
-
- PopItemWidth();
- PopClipRect();
- window->DrawList->ChannelsMerge();
-
- columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
- window->DC.CursorPos.y = columns->LineMaxY;
- if (!(columns->Flags & ImGuiColumnsFlags_GrowParentContentsSize))
- window->DC.CursorMaxPos.x = columns->StartMaxPosX; // Restore cursor max pos, as columns don't grow parent
-
- // Draw columns borders and handle resize
- bool is_being_resized = false;
- if (!(columns->Flags & ImGuiColumnsFlags_NoBorder) && !window->SkipItems)
- {
- const float y1 = columns->StartPosY;
- const float y2 = window->DC.CursorPos.y;
- int dragging_column = -1;
- for (int n = 1; n < columns->Count; n++)
- {
- float x = window->Pos.x + GetColumnOffset(n);
- const ImGuiID column_id = columns->ID + ImGuiID(n);
- const float column_hw = GetColumnsRectHalfWidth(); // Half-width for interaction
- const ImRect column_rect(ImVec2(x - column_hw, y1), ImVec2(x + column_hw, y2));
- KeepAliveID(column_id);
- if (IsClippedEx(column_rect, column_id, false))
- continue;
-
- bool hovered = false, held = false;
- if (!(columns->Flags & ImGuiColumnsFlags_NoResize))
- {
- ButtonBehavior(column_rect, column_id, &hovered, &held);
- if (hovered || held)
- g.MouseCursor = ImGuiMouseCursor_ResizeEW;
- if (held && !(columns->Columns[n].Flags & ImGuiColumnsFlags_NoResize))
- dragging_column = n;
- }
-
- // Draw column (we clip the Y boundaries CPU side because very long triangles are mishandled by some GPU drivers.)
- const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : hovered ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator);
- const float xi = (float)(int)x;
- window->DrawList->AddLine(ImVec2(xi, ImMax(y1 + 1.0f, window->ClipRect.Min.y)), ImVec2(xi, ImMin(y2, window->ClipRect.Max.y)), col);
- }
-
- // Apply dragging after drawing the column lines, so our rendered lines are in sync with how items were displayed during the frame.
- if (dragging_column != -1)
- {
- if (!columns->IsBeingResized)
- for (int n = 0; n < columns->Count + 1; n++)
- columns->Columns[n].OffsetNormBeforeResize = columns->Columns[n].OffsetNorm;
- columns->IsBeingResized = is_being_resized = true;
- float x = GetDraggedColumnOffset(columns, dragging_column);
- SetColumnOffset(dragging_column, x);
- }
- }
- columns->IsBeingResized = is_being_resized;
-
- window->DC.ColumnsSet = NULL;
- window->DC.ColumnsOffset.x = 0.0f;
- window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-}
-
-// [2018-03: This is currently the only public API, while we are working on making BeginColumns/EndColumns user-facing]
-void ImGui::Columns(int columns_count, const char* id, bool border)
-{
- ImGuiWindow* window = GetCurrentWindow();
- IM_ASSERT(columns_count >= 1);
-
- ImGuiColumnsFlags flags = (border ? 0 : ImGuiColumnsFlags_NoBorder);
- //flags |= ImGuiColumnsFlags_NoPreserveWidths; // NB: Legacy behavior
- if (window->DC.ColumnsSet != NULL && window->DC.ColumnsSet->Count == columns_count && window->DC.ColumnsSet->Flags == flags)
- return;
-
- if (window->DC.ColumnsSet != NULL)
- EndColumns();
-
- if (columns_count != 1)
- BeginColumns(id, columns_count, flags);
-}
//-----------------------------------------------------------------------------
// [SECTION] DRAG AND DROP
@@ -8062,7 +8935,7 @@ void ImGui::ClearDragDrop()
ImGuiContext& g = *GImGui;
g.DragDropActive = false;
g.DragDropPayload.Clear();
- g.DragDropAcceptFlags = 0;
+ g.DragDropAcceptFlags = ImGuiDragDropFlags_None;
g.DragDropAcceptIdCurr = g.DragDropAcceptIdPrev = 0;
g.DragDropAcceptIdCurrRectSurface = FLT_MAX;
g.DragDropAcceptFrameCount = -1;
@@ -8081,7 +8954,7 @@ bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags)
bool source_drag_active = false;
ImGuiID source_id = 0;
ImGuiID source_parent_id = 0;
- int mouse_button = 0;
+ ImGuiMouseButton mouse_button = ImGuiMouseButton_Left;
if (!(flags & ImGuiDragDropFlags_SourceExtern))
{
source_id = window->DC.LastItemId;
@@ -8100,16 +8973,16 @@ bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags)
return false;
}
+ // Early out
+ if ((window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect) == 0 && (g.ActiveId == 0 || g.ActiveIdWindow != window))
+ return false;
+
// Magic fallback (=somehow reprehensible) to handle items with no assigned ID, e.g. Text(), Image()
// We build a throwaway ID based on current ID stack + relative AABB of items in window.
// THE IDENTIFIER WON'T SURVIVE ANY REPOSITIONING OF THE WIDGET, so if your widget moves your dragging operation will be canceled.
// We don't need to maintain/call ClearActiveID() as releasing the button will early out this function and trigger !ActiveIdIsAlive.
- bool is_hovered = (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect) != 0;
- if (!is_hovered && (g.ActiveId == 0 || g.ActiveIdWindow != window))
- return false;
source_id = window->DC.LastItemId = window->GetIDFromRectangle(window->DC.LastItemRect);
- if (is_hovered)
- SetHoveredID(source_id);
+ bool is_hovered = ItemHoverable(window->DC.LastItemRect, source_id);
if (is_hovered && g.IO.MouseClicked[mouse_button])
{
SetActiveID(source_id, window);
@@ -8130,7 +9003,7 @@ bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags)
else
{
window = NULL;
- source_id = ImHash("#SourceExtern", 0);
+ source_id = ImHashStr("#SourceExtern");
source_drag_active = true;
}
@@ -8153,13 +9026,13 @@ bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags)
if (!(flags & ImGuiDragDropFlags_SourceNoPreviewTooltip))
{
// Target can request the Source to not display its tooltip (we use a dedicated flag to make this request explicit)
- // We unfortunately can't just modify the source flags and skip the call to BeginTooltip, as caller may be emitting contents.
+ // We unfortunately can't just modify the source flags and skip the call to BeginTooltip, as caller may be emitting contents.
BeginTooltip();
- if (g.DragDropActive && g.DragDropAcceptIdPrev && (g.DragDropAcceptFlags & ImGuiDragDropFlags_AcceptNoPreviewTooltip))
+ if (g.DragDropAcceptIdPrev && (g.DragDropAcceptFlags & ImGuiDragDropFlags_AcceptNoPreviewTooltip))
{
ImGuiWindow* tooltip_window = g.CurrentWindow;
tooltip_window->SkipItems = true;
- tooltip_window->HiddenFramesRegular = 1;
+ tooltip_window->HiddenFramesCanSkipItems = 1;
}
}
@@ -8346,9 +9219,13 @@ void ImGui::EndDragDropTarget()
g.DragDropWithinSourceOrTarget = false;
}
+
//-----------------------------------------------------------------------------
// [SECTION] LOGGING/CAPTURING
//-----------------------------------------------------------------------------
+// All text output from the interface can be captured into tty/file/clipboard.
+// By default, tree nodes are automatically opened during logging.
+//-----------------------------------------------------------------------------
// Pass text data straight to log (without being displayed)
void ImGui::LogText(const char* fmt, ...)
@@ -8360,9 +9237,15 @@ void ImGui::LogText(const char* fmt, ...)
va_list args;
va_start(args, fmt);
if (g.LogFile)
- vfprintf(g.LogFile, fmt, args);
+ {
+ g.LogBuffer.Buf.resize(0);
+ g.LogBuffer.appendfv(fmt, args);
+ ImFileWrite(g.LogBuffer.c_str(), sizeof(char), (ImU64)g.LogBuffer.size(), g.LogFile);
+ }
else
- g.LogClipboard.appendfv(fmt, args);
+ {
+ g.LogBuffer.appendfv(fmt, args);
+ }
va_end(args);
}
@@ -8376,17 +9259,20 @@ void ImGui::LogRenderedText(const ImVec2* ref_pos, const char* text, const char*
if (!text_end)
text_end = FindRenderedTextEnd(text, text_end);
- const bool log_new_line = ref_pos && (ref_pos->y > window->DC.LogLinePosY + 1);
+ const bool log_new_line = ref_pos && (ref_pos->y > g.LogLinePosY + 1);
if (ref_pos)
- window->DC.LogLinePosY = ref_pos->y;
+ g.LogLinePosY = ref_pos->y;
+ if (log_new_line)
+ g.LogLineFirstItem = true;
const char* text_remaining = text;
- if (g.LogStartDepth > window->DC.TreeDepth) // Re-adjust padding if we have popped out of our starting depth
- g.LogStartDepth = window->DC.TreeDepth;
- const int tree_depth = (window->DC.TreeDepth - g.LogStartDepth);
+ if (g.LogDepthRef > window->DC.TreeDepth) // Re-adjust padding if we have popped out of our starting depth
+ g.LogDepthRef = window->DC.TreeDepth;
+ const int tree_depth = (window->DC.TreeDepth - g.LogDepthRef);
for (;;)
{
// Split the string. Each new line (after a '\n') is followed by spacing corresponding to the current depth of our log entry.
+ // We don't add a trailing \n to allow a subsequent item on the same line to be captured.
const char* line_start = text_remaining;
const char* line_end = ImStreolRange(line_start, text_end);
const bool is_first_line = (line_start == text);
@@ -8395,9 +9281,18 @@ void ImGui::LogRenderedText(const ImVec2* ref_pos, const char* text, const char*
{
const int char_count = (int)(line_end - line_start);
if (log_new_line || !is_first_line)
- LogText(IM_NEWLINE "%*s%.*s", tree_depth*4, "", char_count, line_start);
+ LogText(IM_NEWLINE "%*s%.*s", tree_depth * 4, "", char_count, line_start);
+ else if (g.LogLineFirstItem)
+ LogText("%*s%.*s", tree_depth * 4, "", char_count, line_start);
else
LogText(" %.*s", char_count, line_start);
+ g.LogLineFirstItem = false;
+ }
+ else if (log_new_line)
+ {
+ // An empty "" string at a different Y position should output a carriage return.
+ LogText(IM_NEWLINE);
+ break;
}
if (is_last_line)
@@ -8406,64 +9301,74 @@ void ImGui::LogRenderedText(const ImVec2* ref_pos, const char* text, const char*
}
}
-// Start logging ImGui output to TTY
-void ImGui::LogToTTY(int max_depth)
+// Start logging/capturing text output
+void ImGui::LogBegin(ImGuiLogType type, int auto_open_depth)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+ IM_ASSERT(g.LogEnabled == false);
+ IM_ASSERT(g.LogFile == NULL);
+ IM_ASSERT(g.LogBuffer.empty());
+ g.LogEnabled = true;
+ g.LogType = type;
+ g.LogDepthRef = window->DC.TreeDepth;
+ g.LogDepthToExpand = ((auto_open_depth >= 0) ? auto_open_depth : g.LogDepthToExpandDefault);
+ g.LogLinePosY = FLT_MAX;
+ g.LogLineFirstItem = true;
+}
+
+void ImGui::LogToTTY(int auto_open_depth)
{
ImGuiContext& g = *GImGui;
if (g.LogEnabled)
return;
- ImGuiWindow* window = g.CurrentWindow;
-
- IM_ASSERT(g.LogFile == NULL);
+ IM_UNUSED(auto_open_depth);
+#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
+ LogBegin(ImGuiLogType_TTY, auto_open_depth);
g.LogFile = stdout;
- g.LogEnabled = true;
- g.LogStartDepth = window->DC.TreeDepth;
- if (max_depth >= 0)
- g.LogAutoExpandMaxDepth = max_depth;
+#endif
}
-// Start logging ImGui output to given file
-void ImGui::LogToFile(int max_depth, const char* filename)
+// Start logging/capturing text output to given file
+void ImGui::LogToFile(int auto_open_depth, const char* filename)
{
ImGuiContext& g = *GImGui;
if (g.LogEnabled)
return;
- ImGuiWindow* window = g.CurrentWindow;
+ // FIXME: We could probably open the file in text mode "at", however note that clipboard/buffer logging will still
+ // be subject to outputting OS-incompatible carriage return if within strings the user doesn't use IM_NEWLINE.
+ // By opening the file in binary mode "ab" we have consistent output everywhere.
if (!filename)
- {
filename = g.IO.LogFilename;
- if (!filename)
- return;
- }
-
- IM_ASSERT(g.LogFile == NULL);
- g.LogFile = ImFileOpen(filename, "ab");
- if (!g.LogFile)
+ if (!filename || !filename[0])
+ return;
+ ImFileHandle f = ImFileOpen(filename, "ab");
+ if (!f)
{
- IM_ASSERT(g.LogFile != NULL); // Consider this an error
+ IM_ASSERT(0);
return;
}
- g.LogEnabled = true;
- g.LogStartDepth = window->DC.TreeDepth;
- if (max_depth >= 0)
- g.LogAutoExpandMaxDepth = max_depth;
+
+ LogBegin(ImGuiLogType_File, auto_open_depth);
+ g.LogFile = f;
}
-// Start logging ImGui output to clipboard
-void ImGui::LogToClipboard(int max_depth)
+// Start logging/capturing text output to clipboard
+void ImGui::LogToClipboard(int auto_open_depth)
{
ImGuiContext& g = *GImGui;
if (g.LogEnabled)
return;
- ImGuiWindow* window = g.CurrentWindow;
+ LogBegin(ImGuiLogType_Clipboard, auto_open_depth);
+}
- IM_ASSERT(g.LogFile == NULL);
- g.LogFile = NULL;
- g.LogEnabled = true;
- g.LogStartDepth = window->DC.TreeDepth;
- if (max_depth >= 0)
- g.LogAutoExpandMaxDepth = max_depth;
+void ImGui::LogToBuffer(int auto_open_depth)
+{
+ ImGuiContext& g = *GImGui;
+ if (g.LogEnabled)
+ return;
+ LogBegin(ImGuiLogType_Buffer, auto_open_depth);
}
void ImGui::LogFinish()
@@ -8473,45 +9378,60 @@ void ImGui::LogFinish()
return;
LogText(IM_NEWLINE);
- if (g.LogFile != NULL)
+ switch (g.LogType)
{
- if (g.LogFile == stdout)
- fflush(g.LogFile);
- else
- fclose(g.LogFile);
- g.LogFile = NULL;
- }
- if (g.LogClipboard.size() > 1)
- {
- SetClipboardText(g.LogClipboard.begin());
- g.LogClipboard.clear();
+ case ImGuiLogType_TTY:
+#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
+ fflush(g.LogFile);
+#endif
+ break;
+ case ImGuiLogType_File:
+ ImFileClose(g.LogFile);
+ break;
+ case ImGuiLogType_Buffer:
+ break;
+ case ImGuiLogType_Clipboard:
+ if (!g.LogBuffer.empty())
+ SetClipboardText(g.LogBuffer.begin());
+ break;
+ case ImGuiLogType_None:
+ IM_ASSERT(0);
+ break;
}
+
g.LogEnabled = false;
+ g.LogType = ImGuiLogType_None;
+ g.LogFile = NULL;
+ g.LogBuffer.clear();
}
// Helper to display logging buttons
+// FIXME-OBSOLETE: We should probably obsolete this and let the user have their own helper (this is one of the oldest function alive!)
void ImGui::LogButtons()
{
ImGuiContext& g = *GImGui;
PushID("LogButtons");
+#ifndef IMGUI_DISABLE_TTY_FUNCTIONS
const bool log_to_tty = Button("Log To TTY"); SameLine();
+#else
+ const bool log_to_tty = false;
+#endif
const bool log_to_file = Button("Log To File"); SameLine();
const bool log_to_clipboard = Button("Log To Clipboard"); SameLine();
- PushItemWidth(80.0f);
PushAllowKeyboardFocus(false);
- SliderInt("Depth", &g.LogAutoExpandMaxDepth, 0, 9, NULL);
+ SetNextItemWidth(80.0f);
+ SliderInt("Default Depth", &g.LogDepthToExpandDefault, 0, 9, NULL);
PopAllowKeyboardFocus();
- PopItemWidth();
PopID();
// Start logging at the end of the function so that the buttons don't appear in the log
if (log_to_tty)
- LogToTTY(g.LogAutoExpandMaxDepth);
+ LogToTTY();
if (log_to_file)
- LogToFile(g.LogAutoExpandMaxDepth, g.IO.LogFilename);
+ LogToFile();
if (log_to_clipboard)
- LogToClipboard(g.LogAutoExpandMaxDepth);
+ LogToClipboard();
}
//-----------------------------------------------------------------------------
@@ -8536,22 +9456,41 @@ void ImGui::MarkIniSettingsDirty(ImGuiWindow* window)
ImGuiWindowSettings* ImGui::CreateNewWindowSettings(const char* name)
{
ImGuiContext& g = *GImGui;
- g.SettingsWindows.push_back(ImGuiWindowSettings());
- ImGuiWindowSettings* settings = &g.SettingsWindows.back();
- settings->Name = ImStrdup(name);
- settings->ID = ImHash(name, 0);
+
+#if !IMGUI_DEBUG_INI_SETTINGS
+ // Skip to the "###" marker if any. We don't skip past to match the behavior of GetID()
+ // Preserve the full string when IMGUI_DEBUG_INI_SETTINGS is set to make .ini inspection easier.
+ if (const char* p = strstr(name, "###"))
+ name = p;
+#endif
+ const size_t name_len = strlen(name);
+
+ // Allocate chunk
+ const size_t chunk_size = sizeof(ImGuiWindowSettings) + name_len + 1;
+ ImGuiWindowSettings* settings = g.SettingsWindows.alloc_chunk(chunk_size);
+ IM_PLACEMENT_NEW(settings) ImGuiWindowSettings();
+ settings->ID = ImHashStr(name, name_len);
+ memcpy(settings->GetName(), name, name_len + 1); // Store with zero terminator
+
return settings;
}
ImGuiWindowSettings* ImGui::FindWindowSettings(ImGuiID id)
{
ImGuiContext& g = *GImGui;
- for (int i = 0; i != g.SettingsWindows.Size; i++)
- if (g.SettingsWindows[i].ID == id)
- return &g.SettingsWindows[i];
+ for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
+ if (settings->ID == id)
+ return settings;
return NULL;
}
+ImGuiWindowSettings* ImGui::FindOrCreateWindowSettings(const char* name)
+{
+ if (ImGuiWindowSettings* settings = FindWindowSettings(ImHashStr(name)))
+ return settings;
+ return CreateNewWindowSettings(name);
+}
+
void ImGui::LoadIniSettingsFromDisk(const char* ini_filename)
{
size_t file_data_size = 0;
@@ -8559,13 +9498,13 @@ void ImGui::LoadIniSettingsFromDisk(const char* ini_filename)
if (!file_data)
return;
LoadIniSettingsFromMemory(file_data, (size_t)file_data_size);
- ImGui::MemFree(file_data);
+ IM_FREE(file_data);
}
ImGuiSettingsHandler* ImGui::FindSettingsHandler(const char* type_name)
{
ImGuiContext& g = *GImGui;
- const ImGuiID type_hash = ImHash(type_name, 0, 0);
+ const ImGuiID type_hash = ImHashStr(type_name);
for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++)
if (g.SettingsHandlers[handler_n].TypeHash == type_hash)
return &g.SettingsHandlers[handler_n];
@@ -8583,7 +9522,7 @@ void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size)
// For our convenience and to make the code simpler, we'll also write zero-terminators within the buffer. So let's create a writable copy..
if (ini_size == 0)
ini_size = strlen(ini_data);
- char* buf = (char*)ImGui::MemAlloc(ini_size + 1);
+ char* buf = (char*)IM_ALLOC(ini_size + 1);
char* buf_end = buf + ini_size;
memcpy(buf, ini_data, ini_size);
buf[ini_size] = 0;
@@ -8609,18 +9548,12 @@ void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size)
line_end[-1] = 0;
const char* name_end = line_end - 1;
const char* type_start = line + 1;
- char* type_end = (char*)(intptr_t)ImStrchrRange(type_start, name_end, ']');
+ char* type_end = (char*)(void*)ImStrchrRange(type_start, name_end, ']');
const char* name_start = type_end ? ImStrchrRange(type_end + 1, name_end, '[') : NULL;
if (!type_end || !name_start)
- {
- name_start = type_start; // Import legacy entries that have no type
- type_start = "Window";
- }
- else
- {
- *type_end = 0; // Overwrite first ']'
- name_start++; // Skip second '['
- }
+ continue;
+ *type_end = 0; // Overwrite first ']'
+ name_start++; // Skip second '['
entry_handler = FindSettingsHandler(type_start);
entry_data = entry_handler ? entry_handler->ReadOpenFn(&g, entry_handler, name_start) : NULL;
}
@@ -8630,7 +9563,7 @@ void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size)
entry_handler->ReadLineFn(&g, entry_handler, entry_data, line);
}
}
- ImGui::MemFree(buf);
+ IM_FREE(buf);
g.SettingsLoaded = true;
}
@@ -8643,11 +9576,11 @@ void ImGui::SaveIniSettingsToDisk(const char* ini_filename)
size_t ini_data_size = 0;
const char* ini_data = SaveIniSettingsToMemory(&ini_data_size);
- FILE* f = ImFileOpen(ini_filename, "wt");
+ ImFileHandle f = ImFileOpen(ini_filename, "wt");
if (!f)
return;
- fwrite(ini_data, sizeof(char), ini_data_size, f);
- fclose(f);
+ ImFileWrite(ini_data, sizeof(char), ini_data_size, f);
+ ImFileClose(f);
}
// Call registered handlers (e.g. SettingsHandlerWindow_WriteAll() + custom handlers) to write their stuff into a text buffer
@@ -8667,70 +9600,80 @@ const char* ImGui::SaveIniSettingsToMemory(size_t* out_size)
return g.SettingsIniData.c_str();
}
-static void* SettingsHandlerWindow_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name)
+static void* WindowSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name)
{
- ImGuiWindowSettings* settings = ImGui::FindWindowSettings(ImHash(name, 0));
+ ImGuiWindowSettings* settings = ImGui::FindWindowSettings(ImHashStr(name));
if (!settings)
settings = ImGui::CreateNewWindowSettings(name);
return (void*)settings;
}
-static void SettingsHandlerWindow_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line)
+static void WindowSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line)
{
ImGuiWindowSettings* settings = (ImGuiWindowSettings*)entry;
- float x, y;
+ int x, y;
int i;
- if (sscanf(line, "Pos=%f,%f", &x, &y) == 2) settings->Pos = ImVec2(x, y);
- else if (sscanf(line, "Size=%f,%f", &x, &y) == 2) settings->Size = ImMax(ImVec2(x, y), GImGui->Style.WindowMinSize);
+ if (sscanf(line, "Pos=%i,%i", &x, &y) == 2) settings->Pos = ImVec2ih((short)x, (short)y);
+ else if (sscanf(line, "Size=%i,%i", &x, &y) == 2) settings->Size = ImVec2ih((short)x, (short)y);
else if (sscanf(line, "Collapsed=%d", &i) == 1) settings->Collapsed = (i != 0);
}
-static void SettingsHandlerWindow_WriteAll(ImGuiContext* imgui_ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf)
+static void WindowSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf)
{
// Gather data from windows that were active during this session
// (if a window wasn't opened in this session we preserve its settings)
- ImGuiContext& g = *imgui_ctx;
+ ImGuiContext& g = *ctx;
for (int i = 0; i != g.Windows.Size; i++)
{
ImGuiWindow* window = g.Windows[i];
if (window->Flags & ImGuiWindowFlags_NoSavedSettings)
continue;
- ImGuiWindowSettings* settings = (window->SettingsIdx != -1) ? &g.SettingsWindows[window->SettingsIdx] : ImGui::FindWindowSettings(window->ID);
+ ImGuiWindowSettings* settings = (window->SettingsOffset != -1) ? g.SettingsWindows.ptr_from_offset(window->SettingsOffset) : ImGui::FindWindowSettings(window->ID);
if (!settings)
{
settings = ImGui::CreateNewWindowSettings(window->Name);
- window->SettingsIdx = g.SettingsWindows.index_from_pointer(settings);
+ window->SettingsOffset = g.SettingsWindows.offset_from_ptr(settings);
}
IM_ASSERT(settings->ID == window->ID);
- settings->Pos = window->Pos;
- settings->Size = window->SizeFull;
+ settings->Pos = ImVec2ih((short)window->Pos.x, (short)window->Pos.y);
+ settings->Size = ImVec2ih((short)window->SizeFull.x, (short)window->SizeFull.y);
settings->Collapsed = window->Collapsed;
}
// Write to text buffer
- buf->reserve(buf->size() + g.SettingsWindows.Size * 96); // ballpark reserve
- for (int i = 0; i != g.SettingsWindows.Size; i++)
+ buf->reserve(buf->size() + g.SettingsWindows.size() * 6); // ballpark reserve
+ for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
{
- const ImGuiWindowSettings* settings = &g.SettingsWindows[i];
- if (settings->Pos.x == FLT_MAX)
- continue;
- const char* name = settings->Name;
- if (const char* p = strstr(name, "###")) // Skip to the "###" marker if any. We don't skip past to match the behavior of GetID()
- name = p;
- buf->appendf("[%s][%s]\n", handler->TypeName, name);
- buf->appendf("Pos=%d,%d\n", (int)settings->Pos.x, (int)settings->Pos.y);
- buf->appendf("Size=%d,%d\n", (int)settings->Size.x, (int)settings->Size.y);
+ const char* settings_name = settings->GetName();
+ buf->appendf("[%s][%s]\n", handler->TypeName, settings_name);
+ buf->appendf("Pos=%d,%d\n", settings->Pos.x, settings->Pos.y);
+ buf->appendf("Size=%d,%d\n", settings->Size.x, settings->Size.y);
buf->appendf("Collapsed=%d\n", settings->Collapsed);
- buf->appendf("\n");
+ buf->append("\n");
}
}
+
+//-----------------------------------------------------------------------------
+// [SECTION] VIEWPORTS, PLATFORM WINDOWS
+//-----------------------------------------------------------------------------
+
+// (this section is filled in the 'docking' branch)
+
+
+//-----------------------------------------------------------------------------
+// [SECTION] DOCKING
+//-----------------------------------------------------------------------------
+
+// (this section is filled in the 'docking' branch)
+
+
//-----------------------------------------------------------------------------
// [SECTION] PLATFORM DEPENDENT HELPERS
//-----------------------------------------------------------------------------
-#if defined(_WIN32) && !defined(_WINDOWS_) && (!defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) || !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS))
+#if defined(_WIN32) && !defined(_WINDOWS_) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && (!defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) || !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS))
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
@@ -8739,15 +9682,21 @@ static void SettingsHandlerWindow_WriteAll(ImGuiContext* imgui_ctx, ImGuiSetting
#else
#include
#endif
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) // UWP doesn't have Win32 functions
+#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS
+#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS
+#endif
+#elif defined(__APPLE__)
+#include
#endif
-// Win32 API clipboard implementation
-#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS)
+#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS)
#ifdef _MSC_VER
#pragma comment(lib, "user32")
#endif
+// Win32 clipboard implementation
static const char* GetClipboardTextFn_DefaultImpl(void*)
{
static ImVector buf_local;
@@ -8791,16 +9740,67 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
::CloseClipboard();
}
+#elif defined(__APPLE__) && TARGET_OS_OSX && defined(IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS)
+
+#include // Use old API to avoid need for separate .mm file
+static PasteboardRef main_clipboard = 0;
+
+// OSX clipboard implementation
+// If you enable this you will need to add '-framework ApplicationServices' to your linker command-line!
+static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
+{
+ if (!main_clipboard)
+ PasteboardCreate(kPasteboardClipboard, &main_clipboard);
+ PasteboardClear(main_clipboard);
+ CFDataRef cf_data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)text, strlen(text));
+ if (cf_data)
+ {
+ PasteboardPutItemFlavor(main_clipboard, (PasteboardItemID)1, CFSTR("public.utf8-plain-text"), cf_data, 0);
+ CFRelease(cf_data);
+ }
+}
+
+static const char* GetClipboardTextFn_DefaultImpl(void*)
+{
+ if (!main_clipboard)
+ PasteboardCreate(kPasteboardClipboard, &main_clipboard);
+ PasteboardSynchronize(main_clipboard);
+
+ ItemCount item_count = 0;
+ PasteboardGetItemCount(main_clipboard, &item_count);
+ for (ItemCount i = 0; i < item_count; i++)
+ {
+ PasteboardItemID item_id = 0;
+ PasteboardGetItemIdentifier(main_clipboard, i + 1, &item_id);
+ CFArrayRef flavor_type_array = 0;
+ PasteboardCopyItemFlavors(main_clipboard, item_id, &flavor_type_array);
+ for (CFIndex j = 0, nj = CFArrayGetCount(flavor_type_array); j < nj; j++)
+ {
+ CFDataRef cf_data;
+ if (PasteboardCopyItemFlavorData(main_clipboard, item_id, CFSTR("public.utf8-plain-text"), &cf_data) == noErr)
+ {
+ static ImVector clipboard_text;
+ int length = (int)CFDataGetLength(cf_data);
+ clipboard_text.resize(length + 1);
+ CFDataGetBytes(cf_data, CFRangeMake(0, length), (UInt8*)clipboard_text.Data);
+ clipboard_text[length] = 0;
+ CFRelease(cf_data);
+ return clipboard_text.Data;
+ }
+ }
+ }
+ return NULL;
+}
+
#else
-// Local ImGui-only clipboard implementation, if user hasn't defined better clipboard handlers
+// Local Dear ImGui-only clipboard implementation, if user hasn't defined better clipboard handlers.
static const char* GetClipboardTextFn_DefaultImpl(void*)
{
ImGuiContext& g = *GImGui;
return g.PrivateClipboard.empty() ? NULL : g.PrivateClipboard.begin();
}
-// Local ImGui-only clipboard implementation, if user hasn't defined better clipboard handlers
static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
{
ImGuiContext& g = *GImGui;
@@ -8814,7 +9814,7 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
#endif
// Win32 API IME support (for Asian languages, etc.)
-#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS)
+#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS)
#include
#ifdef _MSC_VER
@@ -8824,7 +9824,8 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y)
{
// Notify OS Input Method Editor of text input position
- if (HWND hwnd = (HWND)GImGui->IO.ImeWindowHandle)
+ ImGuiIO& io = ImGui::GetIO();
+ if (HWND hwnd = (HWND)io.ImeWindowHandle)
if (HIMC himc = ::ImmGetContext(hwnd))
{
COMPOSITIONFORM cf;
@@ -8846,46 +9847,96 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int, int) {}
// [SECTION] METRICS/DEBUG WINDOW
//-----------------------------------------------------------------------------
+#ifndef IMGUI_DISABLE_METRICS_WINDOW
+// Avoid naming collision with imgui_demo.cpp's HelpMarker() for unity builds.
+static void MetricsHelpMarker(const char* desc)
+{
+ ImGui::TextDisabled("(?)");
+ if (ImGui::IsItemHovered())
+ {
+ ImGui::BeginTooltip();
+ ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
+ ImGui::TextUnformatted(desc);
+ ImGui::PopTextWrapPos();
+ ImGui::EndTooltip();
+ }
+}
+
void ImGui::ShowMetricsWindow(bool* p_open)
{
- if (!ImGui::Begin("ImGui Metrics", p_open))
+ if (!ImGui::Begin("Dear ImGui Metrics", p_open))
{
ImGui::End();
return;
}
- static bool show_draw_cmd_clip_rects = true;
- static bool show_window_begin_order = false;
+
+ // Debugging enums
+ enum { WRT_OuterRect, WRT_OuterRectClipped, WRT_InnerRect, WRT_InnerClipRect, WRT_WorkRect, WRT_Content, WRT_ContentRegionRect, WRT_Count }; // Windows Rect Type
+ const char* wrt_rects_names[WRT_Count] = { "OuterRect", "OuterRectClipped", "InnerRect", "InnerClipRect", "WorkRect", "Content", "ContentRegionRect" };
+ enum { TRT_OuterRect, TRT_WorkRect, TRT_HostClipRect, TRT_InnerClipRect, TRT_BackgroundClipRect, TRT_ColumnsRect, TRT_ColumnsClipRect, TRT_ColumnsContentHeadersUsed, TRT_ColumnsContentHeadersDesired, TRT_ColumnsContentRowsFrozen, TRT_ColumnsContentRowsUnfrozen, TRT_Count }; // Tables Rect Type
+ const char* trt_rects_names[TRT_Count] = { "OuterRect", "WorkRect", "HostClipRect", "InnerClipRect", "BackgroundClipRect", "ColumnsRect", "ColumnsClipRect", "ColumnsContentHeadersUsed", "ColumnsContentHeadersDesired", "ColumnsContentRowsFrozen", "ColumnsContentRowsUnfrozen" };
+
+ // State
+ static bool show_windows_rects = false;
+ static int show_windows_rect_type = WRT_WorkRect;
+ static bool show_windows_begin_order = false;
+ static bool show_tables_rects = false;
+ static int show_tables_rect_type = TRT_WorkRect;
+ static bool show_drawcmd_details = true;
+
+ // Basic info
+ ImGuiContext& g = *GImGui;
ImGuiIO& io = ImGui::GetIO();
ImGui::Text("Dear ImGui %s", ImGui::GetVersion());
ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
ImGui::Text("%d vertices, %d indices (%d triangles)", io.MetricsRenderVertices, io.MetricsRenderIndices, io.MetricsRenderIndices / 3);
ImGui::Text("%d active windows (%d visible)", io.MetricsActiveWindows, io.MetricsRenderWindows);
- ImGui::Text("%d allocations", io.MetricsActiveAllocations);
- ImGui::Checkbox("Show clipping rectangles when hovering draw commands", &show_draw_cmd_clip_rects);
- ImGui::Checkbox("Ctrl shows window begin order", &show_window_begin_order);
-
+ ImGui::Text("%d active allocations", io.MetricsActiveAllocations);
ImGui::Separator();
+ // Helper functions to display common structures:
+ // - NodeDrawList()
+ // - NodeColumns()
+ // - NodeWindow()
+ // - NodeWindows()
+ // - NodeTabBar()
+ // - NodeStorage()
struct Funcs
{
+ static ImRect GetWindowRect(ImGuiWindow* window, int rect_type)
+ {
+ if (rect_type == WRT_OuterRect) { return window->Rect(); }
+ else if (rect_type == WRT_OuterRectClipped) { return window->OuterRectClipped; }
+ else if (rect_type == WRT_InnerRect) { return window->InnerRect; }
+ else if (rect_type == WRT_InnerClipRect) { return window->InnerClipRect; }
+ else if (rect_type == WRT_WorkRect) { return window->WorkRect; }
+ else if (rect_type == WRT_Content) { ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSize); }
+ else if (rect_type == WRT_ContentRegionRect) { return window->ContentRegionRect; }
+ IM_ASSERT(0);
+ return ImRect();
+ }
+
static void NodeDrawList(ImGuiWindow* window, ImDrawList* draw_list, const char* label)
{
bool node_open = ImGui::TreeNode(draw_list, "%s: '%s' %d vtx, %d indices, %d cmds", label, draw_list->_OwnerName ? draw_list->_OwnerName : "", draw_list->VtxBuffer.Size, draw_list->IdxBuffer.Size, draw_list->CmdBuffer.Size);
if (draw_list == ImGui::GetWindowDrawList())
{
ImGui::SameLine();
- ImGui::TextColored(ImColor(255,100,100), "CURRENTLY APPENDING"); // Can't display stats for active draw list! (we don't have the data double-buffered)
+ ImGui::TextColored(ImVec4(1.0f,0.4f,0.4f,1.0f), "CURRENTLY APPENDING"); // Can't display stats for active draw list! (we don't have the data double-buffered)
if (node_open) ImGui::TreePop();
return;
}
- ImDrawList* overlay_draw_list = GetOverlayDrawList(); // Render additional visuals into the top-most draw list
+ ImDrawList* fg_draw_list = GetForegroundDrawList(window); // Render additional visuals into the top-most draw list
if (window && IsItemHovered())
- overlay_draw_list->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255));
+ fg_draw_list->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255));
if (!node_open)
return;
- int elem_offset = 0;
+ if (window && !window->WasActive)
+ ImGui::TextDisabled("Warning: owning Window is inactive. This DrawList is not being rendered!");
+
+ unsigned int elem_offset = 0;
for (const ImDrawCmd* pcmd = draw_list->CmdBuffer.begin(); pcmd < draw_list->CmdBuffer.end(); elem_offset += pcmd->ElemCount, pcmd++)
{
if (pcmd->UserCallback == NULL && pcmd->ElemCount == 0)
@@ -8895,41 +9946,78 @@ void ImGui::ShowMetricsWindow(bool* p_open)
ImGui::BulletText("Callback %p, user_data %p", pcmd->UserCallback, pcmd->UserCallbackData);
continue;
}
+
ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL;
- bool pcmd_node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "Draw %4d %s vtx, tex 0x%p, clip_rect (%4.0f,%4.0f)-(%4.0f,%4.0f)", pcmd->ElemCount, draw_list->IdxBuffer.Size > 0 ? "indexed" : "non-indexed", pcmd->TextureId, pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
- if (show_draw_cmd_clip_rects && ImGui::IsItemHovered())
+ char buf[300];
+ ImFormatString(buf, IM_ARRAYSIZE(buf), "DrawCmd: %4d triangles, Tex 0x%p, ClipRect (%4.0f,%4.0f)-(%4.0f,%4.0f)",
+ pcmd->ElemCount/3, (void*)(intptr_t)pcmd->TextureId,
+ pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
+ bool pcmd_node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "%s", buf);
+ if (show_drawcmd_details && fg_draw_list && ImGui::IsItemHovered())
{
ImRect clip_rect = pcmd->ClipRect;
- ImRect vtxs_rect;
- for (int i = elem_offset; i < elem_offset + (int)pcmd->ElemCount; i++)
+ ImRect vtxs_rect(FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX);
+ for (unsigned int i = elem_offset; i < elem_offset + (int)pcmd->ElemCount; i++)
vtxs_rect.Add(draw_list->VtxBuffer[idx_buffer ? idx_buffer[i] : i].pos);
- clip_rect.Floor(); overlay_draw_list->AddRect(clip_rect.Min, clip_rect.Max, IM_COL32(255,255,0,255));
- vtxs_rect.Floor(); overlay_draw_list->AddRect(vtxs_rect.Min, vtxs_rect.Max, IM_COL32(255,0,255,255));
+ fg_draw_list->AddRect(ImFloor(clip_rect.Min), ImFloor(clip_rect.Max), IM_COL32(255,0,255,255));
+ fg_draw_list->AddRect(ImFloor(vtxs_rect.Min), ImFloor(vtxs_rect.Max), IM_COL32(255,255,0,255));
}
if (!pcmd_node_open)
continue;
+ // Calculate approximate coverage area (touched pixel count)
+ // This will be in pixels squared as long there's no post-scaling happening to the renderer output.
+ float total_area = 0.0f;
+ for (unsigned int base_idx = elem_offset; base_idx < (elem_offset + pcmd->ElemCount); base_idx += 3)
+ {
+ ImVec2 triangle[3];
+ for (int n = 0; n < 3; n++)
+ triangle[n] = draw_list->VtxBuffer[idx_buffer ? idx_buffer[base_idx + n] : (base_idx + n)].pos;
+ total_area += ImTriangleArea(triangle[0], triangle[1], triangle[2]);
+ }
+
+ // Display vertex information summary. Hover to get all triangles drawn in wire-frame
+ ImFormatString(buf, IM_ARRAYSIZE(buf), "Mesh: ElemCount: %d, VtxOffset: +%d, IdxOffset: +%d, Area: ~%0.f px", pcmd->ElemCount, pcmd->VtxOffset, pcmd->IdxOffset, total_area);
+ ImGui::Selectable(buf);
+ if (fg_draw_list && ImGui::IsItemHovered() && show_drawcmd_details)
+ {
+ // Draw wire-frame version of everything
+ ImDrawListFlags backup_flags = fg_draw_list->Flags;
+ fg_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines; // Disable AA on triangle outlines is more readable for very large and thin triangles.
+ ImRect clip_rect = pcmd->ClipRect;
+ fg_draw_list->AddRect(ImFloor(clip_rect.Min), ImFloor(clip_rect.Max), IM_COL32(255, 0, 255, 255));
+ for (unsigned int base_idx = elem_offset; base_idx < (elem_offset + pcmd->ElemCount); base_idx += 3)
+ {
+ ImVec2 triangle[3];
+ for (int n = 0; n < 3; n++)
+ triangle[n] = draw_list->VtxBuffer[idx_buffer ? idx_buffer[base_idx + n] : (base_idx + n)].pos;
+ fg_draw_list->AddPolyline(triangle, 3, IM_COL32(255, 255, 0, 255), true, 1.0f);
+ }
+ fg_draw_list->Flags = backup_flags;
+ }
+
// Display individual triangles/vertices. Hover on to get the corresponding triangle highlighted.
ImGuiListClipper clipper(pcmd->ElemCount/3); // Manually coarse clip our print out of individual vertices to save CPU, only items that may be visible.
while (clipper.Step())
- for (int prim = clipper.DisplayStart, vtx_i = elem_offset + clipper.DisplayStart*3; prim < clipper.DisplayEnd; prim++)
+ for (int prim = clipper.DisplayStart, idx_i = elem_offset + clipper.DisplayStart*3; prim < clipper.DisplayEnd; prim++)
{
- char buf[300];
char *buf_p = buf, *buf_end = buf + IM_ARRAYSIZE(buf);
- ImVec2 triangles_pos[3];
- for (int n = 0; n < 3; n++, vtx_i++)
+ ImVec2 triangle[3];
+ for (int n = 0; n < 3; n++, idx_i++)
{
- ImDrawVert& v = draw_list->VtxBuffer[idx_buffer ? idx_buffer[vtx_i] : vtx_i];
- triangles_pos[n] = v.pos;
- buf_p += ImFormatString(buf_p, (int)(buf_end - buf_p), "%s %04d: pos (%8.2f,%8.2f), uv (%.6f,%.6f), col %08X\n", (n == 0) ? "vtx" : " ", vtx_i, v.pos.x, v.pos.y, v.uv.x, v.uv.y, v.col);
+ ImDrawVert& v = draw_list->VtxBuffer[idx_buffer ? idx_buffer[idx_i] : idx_i];
+ triangle[n] = v.pos;
+ buf_p += ImFormatString(buf_p, buf_end - buf_p, "%s %04d: pos (%8.2f,%8.2f), uv (%.6f,%.6f), col %08X\n",
+ (n == 0) ? "Vert:" : " ", idx_i, v.pos.x, v.pos.y, v.uv.x, v.uv.y, v.col);
}
+
ImGui::Selectable(buf, false);
- if (ImGui::IsItemHovered())
+ if (fg_draw_list && ImGui::IsItemHovered())
{
- ImDrawListFlags backup_flags = overlay_draw_list->Flags;
- overlay_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines; // Disable AA on triangle outlines at is more readable for very large and thin triangles.
- overlay_draw_list->AddPolyline(triangles_pos, 3, IM_COL32(255,255,0,255), true, 1.0f);
- overlay_draw_list->Flags = backup_flags;
+ ImDrawListFlags backup_flags = fg_draw_list->Flags;
+ fg_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines; // Disable AA on triangle outlines is more readable for very large and thin triangles.
+ fg_draw_list->AddPolyline(triangle, 3, IM_COL32(255,255,0,255), true, 1.0f);
+ fg_draw_list->Flags = backup_flags;
}
}
ImGui::TreePop();
@@ -8937,29 +10025,51 @@ void ImGui::ShowMetricsWindow(bool* p_open)
ImGui::TreePop();
}
+ static void NodeColumns(const ImGuiColumns* columns)
+ {
+ if (!ImGui::TreeNode((void*)(uintptr_t)columns->ID, "Columns Id: 0x%08X, Count: %d, Flags: 0x%04X", columns->ID, columns->Count, columns->Flags))
+ return;
+ ImGui::BulletText("Width: %.1f (MinX: %.1f, MaxX: %.1f)", columns->OffMaxX - columns->OffMinX, columns->OffMinX, columns->OffMaxX);
+ for (int column_n = 0; column_n < columns->Columns.Size; column_n++)
+ ImGui::BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", column_n, columns->Columns[column_n].OffsetNorm, GetColumnOffsetFromNorm(columns, columns->Columns[column_n].OffsetNorm));
+ ImGui::TreePop();
+ }
+
static void NodeWindows(ImVector& windows, const char* label)
{
if (!ImGui::TreeNode(label, "%s (%d)", label, windows.Size))
return;
for (int i = 0; i < windows.Size; i++)
+ {
+ ImGui::PushID(windows[i]);
Funcs::NodeWindow(windows[i], "Window");
+ ImGui::PopID();
+ }
ImGui::TreePop();
}
static void NodeWindow(ImGuiWindow* window, const char* label)
{
- if (!ImGui::TreeNode(window, "%s '%s', %d @ 0x%p", label, window->Name, window->Active || window->WasActive, window))
+ if (window == NULL)
+ {
+ ImGui::BulletText("%s: NULL", label);
+ return;
+ }
+ bool open = ImGui::TreeNode(label, "%s '%s', %d @ 0x%p", label, window->Name, (window->Active || window->WasActive), window);
+ if (ImGui::IsItemHovered() && window->WasActive)
+ ImGui::GetForegroundDrawList()->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255));
+ if (!open)
return;
ImGuiWindowFlags flags = window->Flags;
NodeDrawList(window, window->DrawList, "DrawList");
- ImGui::BulletText("Pos: (%.1f,%.1f), Size: (%.1f,%.1f), SizeContents (%.1f,%.1f)", window->Pos.x, window->Pos.y, window->Size.x, window->Size.y, window->SizeContents.x, window->SizeContents.y);
+ ImGui::BulletText("Pos: (%.1f,%.1f), Size: (%.1f,%.1f), ContentSize (%.1f,%.1f)", window->Pos.x, window->Pos.y, window->Size.x, window->Size.y, window->ContentSize.x, window->ContentSize.y);
ImGui::BulletText("Flags: 0x%08X (%s%s%s%s%s%s%s%s%s..)", flags,
(flags & ImGuiWindowFlags_ChildWindow) ? "Child " : "", (flags & ImGuiWindowFlags_Tooltip) ? "Tooltip " : "", (flags & ImGuiWindowFlags_Popup) ? "Popup " : "",
(flags & ImGuiWindowFlags_Modal) ? "Modal " : "", (flags & ImGuiWindowFlags_ChildMenu) ? "ChildMenu " : "", (flags & ImGuiWindowFlags_NoSavedSettings) ? "NoSavedSettings " : "",
(flags & ImGuiWindowFlags_NoMouseInputs)? "NoMouseInputs":"", (flags & ImGuiWindowFlags_NoNavInputs) ? "NoNavInputs" : "", (flags & ImGuiWindowFlags_AlwaysAutoResize) ? "AlwaysAutoResize" : "");
- ImGui::BulletText("Scroll: (%.2f/%.2f,%.2f/%.2f)", window->Scroll.x, GetWindowScrollMaxX(window), window->Scroll.y, GetWindowScrollMaxY(window));
+ ImGui::BulletText("Scroll: (%.2f/%.2f,%.2f/%.2f) Scrollbar:%s%s", window->Scroll.x, window->ScrollMax.x, window->Scroll.y, window->ScrollMax.y, window->ScrollbarX ? "X" : "", window->ScrollbarY ? "Y" : "");
ImGui::BulletText("Active: %d/%d, WriteAccessed: %d, BeginOrderWithinContext: %d", window->Active, window->WasActive, window->WriteAccessed, (window->Active || window->WasActive) ? window->BeginOrderWithinContext : -1);
- ImGui::BulletText("Appearing: %d, Hidden: %d (Reg %d Resize %d), SkipItems: %d", window->Appearing, window->Hidden, window->HiddenFramesRegular, window->HiddenFramesForResize, window->SkipItems);
+ ImGui::BulletText("Appearing: %d, Hidden: %d (CanSkip %d Cannot %d), SkipItems: %d", window->Appearing, window->Hidden, window->HiddenFramesCanSkipItems, window->HiddenFramesCannotSkipItems, window->SkipItems);
ImGui::BulletText("NavLastIds: 0x%08X,0x%08X, NavLayerActiveMask: %X", window->NavLastIds[0], window->NavLastIds[1], window->DC.NavLayerActiveMask);
ImGui::BulletText("NavLastChildNavWindow: %s", window->NavLastChildNavWindow ? window->NavLastChildNavWindow->Name : "NULL");
if (!window->NavRectRel[0].IsInverted())
@@ -8972,32 +10082,58 @@ void ImGui::ShowMetricsWindow(bool* p_open)
if (window->ColumnsStorage.Size > 0 && ImGui::TreeNode("Columns", "Columns sets (%d)", window->ColumnsStorage.Size))
{
for (int n = 0; n < window->ColumnsStorage.Size; n++)
+ NodeColumns(&window->ColumnsStorage[n]);
+ ImGui::TreePop();
+ }
+ NodeStorage(&window->StateStorage, "Storage");
+ ImGui::TreePop();
+ }
+
+ static void NodeTabBar(ImGuiTabBar* tab_bar)
+ {
+ // Standalone tab bars (not associated to docking/windows functionality) currently hold no discernible strings.
+ char buf[256];
+ char* p = buf;
+ const char* buf_end = buf + IM_ARRAYSIZE(buf);
+ p += ImFormatString(p, buf_end - p, "TabBar (%d tabs)%s", tab_bar->Tabs.Size, (tab_bar->PrevFrameVisible < ImGui::GetFrameCount() - 2) ? " *Inactive*" : "");
+ if (ImGui::TreeNode(tab_bar, "%s", buf))
+ {
+ for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++)
{
- const ImGuiColumnsSet* columns = &window->ColumnsStorage[n];
- if (ImGui::TreeNode((void*)(uintptr_t)columns->ID, "Columns Id: 0x%08X, Count: %d, Flags: 0x%04X", columns->ID, columns->Count, columns->Flags))
- {
- ImGui::BulletText("Width: %.1f (MinX: %.1f, MaxX: %.1f)", columns->MaxX - columns->MinX, columns->MinX, columns->MaxX);
- for (int column_n = 0; column_n < columns->Columns.Size; column_n++)
- ImGui::BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", column_n, columns->Columns[column_n].OffsetNorm, OffsetNormToPixels(columns, columns->Columns[column_n].OffsetNorm));
- ImGui::TreePop();
- }
+ const ImGuiTabItem* tab = &tab_bar->Tabs[tab_n];
+ ImGui::PushID(tab);
+ if (ImGui::SmallButton("<")) { TabBarQueueChangeTabOrder(tab_bar, tab, -1); } ImGui::SameLine(0, 2);
+ if (ImGui::SmallButton(">")) { TabBarQueueChangeTabOrder(tab_bar, tab, +1); } ImGui::SameLine();
+ ImGui::Text("%02d%c Tab 0x%08X '%s'", tab_n, (tab->ID == tab_bar->SelectedTabId) ? '*' : ' ', tab->ID, (tab->NameOffset != -1) ? tab_bar->GetTabName(tab) : "");
+ ImGui::PopID();
}
ImGui::TreePop();
}
- ImGui::BulletText("Storage: %d bytes", window->StateStorage.Data.Size * (int)sizeof(ImGuiStorage::Pair));
+ }
+
+ static void NodeStorage(ImGuiStorage* storage, const char* label)
+ {
+ if (!ImGui::TreeNode(label, "%s: %d entries, %d bytes", label, storage->Data.Size, storage->Data.size_in_bytes()))
+ return;
+ for (int n = 0; n < storage->Data.Size; n++)
+ {
+ const ImGuiStorage::ImGuiStoragePair& p = storage->Data[n];
+ ImGui::BulletText("Key 0x%08X Value { i: %d }", p.key, p.val_i); // Important: we currently don't store a type, real value may not be integer.
+ }
ImGui::TreePop();
}
};
- // Access private state, we are going to display the draw lists from last frame
- ImGuiContext& g = *GImGui;
Funcs::NodeWindows(g.Windows, "Windows");
- if (ImGui::TreeNode("DrawList", "Active DrawLists (%d)", g.DrawDataBuilder.Layers[0].Size))
+ //Funcs::NodeWindows(g.WindowsFocusOrder, "WindowsFocusOrder");
+ if (ImGui::TreeNode("DrawLists", "Active DrawLists (%d)", g.DrawDataBuilder.Layers[0].Size))
{
for (int i = 0; i < g.DrawDataBuilder.Layers[0].Size; i++)
Funcs::NodeDrawList(NULL, g.DrawDataBuilder.Layers[0][i], "DrawList");
ImGui::TreePop();
}
+
+ // Details for Popups
if (ImGui::TreeNode("Popups", "Popups (%d)", g.OpenPopupStack.Size))
{
for (int i = 0; i < g.OpenPopupStack.Size; i++)
@@ -9007,6 +10143,37 @@ void ImGui::ShowMetricsWindow(bool* p_open)
}
ImGui::TreePop();
}
+
+ // Details for TabBars
+ if (ImGui::TreeNode("TabBars", "Tab Bars (%d)", g.TabBars.GetSize()))
+ {
+ for (int n = 0; n < g.TabBars.GetSize(); n++)
+ Funcs::NodeTabBar(g.TabBars.GetByIndex(n));
+ ImGui::TreePop();
+ }
+
+ // Details for Tables
+ IM_UNUSED(trt_rects_names);
+ IM_UNUSED(show_tables_rects);
+ IM_UNUSED(show_tables_rect_type);
+#ifdef IMGUI_HAS_TABLE
+ if (ImGui::TreeNode("Tables", "Tables (%d)", g.Tables.GetSize()))
+ {
+ for (int n = 0; n < g.Tables.GetSize(); n++)
+ Funcs::NodeTable(g.Tables.GetByIndex(n));
+ ImGui::TreePop();
+ }
+#endif // #define IMGUI_HAS_TABLE
+
+ // Details for Docking
+#ifdef IMGUI_HAS_DOCK
+ if (ImGui::TreeNode("Docking"))
+ {
+ ImGui::TreePop();
+ }
+#endif // #define IMGUI_HAS_DOCK
+
+ // Misc Details
if (ImGui::TreeNode("Internal state"))
{
const char* input_source_names[] = { "None", "Mouse", "Nav", "NavKeyboard", "NavGamepad" }; IM_ASSERT(IM_ARRAYSIZE(input_source_names) == ImGuiInputSource_COUNT);
@@ -9027,25 +10194,87 @@ void ImGui::ShowMetricsWindow(bool* p_open)
ImGui::TreePop();
}
+ // Tools
+ if (ImGui::TreeNode("Tools"))
+ {
+ // The Item Picker tool is super useful to visually select an item and break into the call-stack of where it was submitted.
+ if (ImGui::Button("Item Picker.."))
+ ImGui::DebugStartItemPicker();
+ ImGui::SameLine();
+ MetricsHelpMarker("Will call the IM_DEBUG_BREAK() macro to break in debugger.\nWarning: If you don't have a debugger attached, this will probably crash.");
- if (g.IO.KeyCtrl && show_window_begin_order)
+ ImGui::Checkbox("Show windows begin order", &show_windows_begin_order);
+ ImGui::Checkbox("Show windows rectangles", &show_windows_rects);
+ ImGui::SameLine();
+ ImGui::SetNextItemWidth(ImGui::GetFontSize() * 12);
+ show_windows_rects |= ImGui::Combo("##show_windows_rect_type", &show_windows_rect_type, wrt_rects_names, WRT_Count, WRT_Count);
+ if (show_windows_rects && g.NavWindow)
+ {
+ ImGui::BulletText("'%s':", g.NavWindow->Name);
+ ImGui::Indent();
+ for (int rect_n = 0; rect_n < WRT_Count; rect_n++)
+ {
+ ImRect r = Funcs::GetWindowRect(g.NavWindow, rect_n);
+ ImGui::Text("(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), wrt_rects_names[rect_n]);
+ }
+ ImGui::Unindent();
+ }
+ ImGui::Checkbox("Show details when hovering ImDrawCmd node", &show_drawcmd_details);
+ ImGui::TreePop();
+ }
+
+ // Overlay: Display windows Rectangles and Begin Order
+ if (show_windows_rects || show_windows_begin_order)
{
for (int n = 0; n < g.Windows.Size; n++)
{
ImGuiWindow* window = g.Windows[n];
- if ((window->Flags & ImGuiWindowFlags_ChildWindow) || !window->WasActive)
+ if (!window->WasActive)
continue;
- char buf[32];
- ImFormatString(buf, IM_ARRAYSIZE(buf), "%d", window->BeginOrderWithinContext);
- float font_size = ImGui::GetFontSize() * 2;
- ImDrawList* overlay_draw_list = GetOverlayDrawList();
- overlay_draw_list->AddRectFilled(window->Pos, window->Pos + ImVec2(font_size, font_size), IM_COL32(200, 100, 100, 255));
- overlay_draw_list->AddText(NULL, font_size, window->Pos, IM_COL32(255, 255, 255, 255), buf);
+ ImDrawList* draw_list = GetForegroundDrawList(window);
+ if (show_windows_rects)
+ {
+ ImRect r = Funcs::GetWindowRect(window, show_windows_rect_type);
+ draw_list->AddRect(r.Min, r.Max, IM_COL32(255, 0, 128, 255));
+ }
+ if (show_windows_begin_order && !(window->Flags & ImGuiWindowFlags_ChildWindow))
+ {
+ char buf[32];
+ ImFormatString(buf, IM_ARRAYSIZE(buf), "%d", window->BeginOrderWithinContext);
+ float font_size = ImGui::GetFontSize();
+ draw_list->AddRectFilled(window->Pos, window->Pos + ImVec2(font_size, font_size), IM_COL32(200, 100, 100, 255));
+ draw_list->AddText(window->Pos, IM_COL32(255, 255, 255, 255), buf);
+ }
}
}
+
+#ifdef IMGUI_HAS_TABLE
+ // Overlay: Display Tables Rectangles
+ if (show_tables_rects)
+ {
+ for (int table_n = 0; table_n < g.Tables.GetSize(); table_n++)
+ {
+ ImGuiTable* table = g.Tables.GetByIndex(table_n);
+ }
+ }
+#endif // #define IMGUI_HAS_TABLE
+
+#ifdef IMGUI_HAS_DOCK
+ // Overlay: Display Docking info
+ if (show_docking_nodes && g.IO.KeyCtrl)
+ {
+ }
+#endif // #define IMGUI_HAS_DOCK
+
ImGui::End();
}
+#else
+
+void ImGui::ShowMetricsWindow(bool*) { }
+
+#endif
+
//-----------------------------------------------------------------------------
// Include imgui_user.inl at the end of imgui.cpp to access private data/functions that aren't exposed.
@@ -9055,3 +10284,5 @@ void ImGui::ShowMetricsWindow(bool* p_open)
#endif
//-----------------------------------------------------------------------------
+
+#endif // #ifndef IMGUI_DISABLE
diff --git a/src/imgui/imgui.h b/src/imgui/imgui.h
index 90cde6304e..c2bbb7f710 100644
--- a/src/imgui/imgui.h
+++ b/src/imgui/imgui.h
@@ -1,14 +1,43 @@
-// dear imgui, v1.66 WIP
+// dear imgui, v1.75
// (headers)
-// See imgui.cpp file for documentation.
-// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.
-// Read 'Programmer guide' in imgui.cpp for notes on how to setup ImGui in your codebase.
-// Get latest version at https://github.com/ocornut/imgui
+// Help:
+// - Read FAQ at http://dearimgui.org/faq
+// - Newcomers, read 'Programmer guide' in imgui.cpp for notes on how to setup Dear ImGui in your codebase.
+// - Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. All applications in examples/ are doing that.
+// Read imgui.cpp for more details, documentation and comments.
+
+// Resources:
+// - FAQ http://dearimgui.org/faq
+// - Homepage & latest https://github.com/ocornut/imgui
+// - Releases & changelog https://github.com/ocornut/imgui/releases
+// - Gallery https://github.com/ocornut/imgui/issues/2847 (please post your screenshots/video there!)
+// - Glossary https://github.com/ocornut/imgui/wiki/Glossary
+// - Wiki https://github.com/ocornut/imgui/wiki
+// - Issues & support https://github.com/ocornut/imgui/issues
+
+/*
+
+Index of this file:
+// Header mess
+// Forward declarations and basic types
+// ImGui API (Dear ImGui end-user API)
+// Flags & Enumerations
+// Memory allocations macros
+// ImVector<>
+// ImGuiStyle
+// ImGuiIO
+// Misc data structures (ImGuiInputTextCallbackData, ImGuiSizeCallbackData, ImGuiPayload)
+// Obsolete functions
+// Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, ImColor)
+// Draw List API (ImDrawCallback, ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData)
+// Font API (ImFontConfig, ImFontGlyph, ImFontGlyphRangesBuilder, ImFontAtlasFlags, ImFontAtlas, ImFont)
+
+*/
#pragma once
-// Configuration file (edit imconfig.h or define IMGUI_USER_CONFIG to set your own filename)
+// Configuration file with compile-time options (edit imconfig.h or #define IMGUI_USER_CONFIG to your own filename)
#ifdef IMGUI_USER_CONFIG
#include IMGUI_USER_CONFIG
#endif
@@ -16,19 +45,27 @@
#include "imconfig.h"
#endif
-#include // FLT_MAX
-#include // va_list
+#ifndef IMGUI_DISABLE
+
+//-----------------------------------------------------------------------------
+// Header mess
+//-----------------------------------------------------------------------------
+
+// Includes
+#include // FLT_MIN, FLT_MAX
+#include // va_list, va_start, va_end
#include // ptrdiff_t, NULL
#include // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
// Version
-// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens)
-#define IMGUI_VERSION "1.66 WIP"
-#define IMGUI_VERSION_NUM 16600
-#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert))
+// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
+#define IMGUI_VERSION "1.75"
+#define IMGUI_VERSION_NUM 17500
+#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
// Define attributes of all API symbols declarations (e.g. for DLL under Windows)
// IMGUI_API is used for core imgui functions, IMGUI_IMPL_API is used for the default bindings files (imgui_impl_xxx.h)
+// Using dear imgui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
#ifndef IMGUI_API
#define IMGUI_API
#endif
@@ -36,44 +73,59 @@
#define IMGUI_IMPL_API IMGUI_API
#endif
-// Helpers
+// Helper Macros
#ifndef IM_ASSERT
#include
#define IM_ASSERT(_EXPR) assert(_EXPR) // You can override the default assert handler by editing imconfig.h
#endif
-#if defined(__clang__) || defined(__GNUC__)
-#define IM_FMTARGS(FMT) __attribute__((format(printf, FMT, FMT+1))) // Apply printf-style warnings to user functions.
+#if !defined(IMGUI_USE_STB_SPRINTF) && (defined(__clang__) || defined(__GNUC__))
+#define IM_FMTARGS(FMT) __attribute__((format(printf, FMT, FMT+1))) // To apply printf-style warnings to our functions.
#define IM_FMTLIST(FMT) __attribute__((format(printf, FMT, 0)))
#else
#define IM_FMTARGS(FMT)
#define IM_FMTLIST(FMT)
#endif
-#define IM_ARRAYSIZE(_ARR) ((int)(sizeof(_ARR)/sizeof(*_ARR))) // Size of a static C-style array. Don't use on pointers!
-#define IM_OFFSETOF(_TYPE,_MEMBER) ((size_t)&(((_TYPE*)0)->_MEMBER)) // Offset of _MEMBER within _TYPE. Standardized as offsetof() in modern C++.
+#define IM_ARRAYSIZE(_ARR) ((int)(sizeof(_ARR) / sizeof(*_ARR))) // Size of a static C-style array. Don't use on pointers!
+#define IM_UNUSED(_VAR) ((void)_VAR) // Used to silence "unused variable warnings". Often useful as asserts may be stripped out from final builds.
+#if (__cplusplus >= 201100)
+#define IM_OFFSETOF(_TYPE,_MEMBER) offsetof(_TYPE, _MEMBER) // Offset of _MEMBER within _TYPE. Standardized as offsetof() in C++11
+#else
+#define IM_OFFSETOF(_TYPE,_MEMBER) ((size_t)&(((_TYPE*)0)->_MEMBER)) // Offset of _MEMBER within _TYPE. Old style macro.
+#endif
+#define IM_UNICODE_CODEPOINT_MAX 0xFFFF // Last Unicode code point supported by this build.
+#define IM_UNICODE_CODEPOINT_INVALID 0xFFFD // Standard invalid Unicode code point.
+// Warnings
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
-#elif defined(__GNUC__) && __GNUC__ >= 8
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#elif defined(__GNUC__)
#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wclass-memaccess"
+#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
+#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
#endif
-// Forward declarations
-struct ImDrawChannel; // Temporary storage for outputting drawing commands out of order, used by ImDrawList::ChannelsSplit()
-struct ImDrawCmd; // A single draw command within a parent ImDrawList (generally maps to 1 GPU draw call)
-struct ImDrawData; // All draw command lists required to render the frame
+//-----------------------------------------------------------------------------
+// Forward declarations and basic types
+//-----------------------------------------------------------------------------
+
+struct ImDrawChannel; // Temporary storage to output draw commands out of order, used by ImDrawListSplitter and ImDrawList::ChannelsSplit()
+struct ImDrawCmd; // A single draw command within a parent ImDrawList (generally maps to 1 GPU draw call, unless it is a callback)
+struct ImDrawData; // All draw command lists required to render the frame + pos/size coordinates to use for the projection matrix.
struct ImDrawList; // A single draw command list (generally one per window, conceptually you may see this as a dynamic "mesh" builder)
struct ImDrawListSharedData; // Data shared among multiple draw lists (typically owned by parent ImGui context, but you may create one yourself)
-struct ImDrawVert; // A single vertex (20 bytes by default, override layout with IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT)
+struct ImDrawListSplitter; // Helper to split a draw list into different layers which can be drawn into out of order, then flattened back.
+struct ImDrawVert; // A single vertex (pos + uv + col = 20 bytes by default. Override layout with IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT)
struct ImFont; // Runtime data for a single font within a parent ImFontAtlas
struct ImFontAtlas; // Runtime data for multiple fonts, bake multiple fonts into a single texture, TTF/OTF font loader
struct ImFontConfig; // Configuration data when adding a font or merging fonts
-struct ImColor; // Helper functions to create a color that can be converted to either u32 or float4 (*obsolete* please avoid using)
-#ifndef ImTextureID
-typedef void* ImTextureID; // User data to identify a texture (this is whatever to you want it to be! read the FAQ about ImTextureID in imgui.cpp)
-#endif
-struct ImGuiContext; // ImGui context (opaque)
+struct ImFontGlyph; // A single font glyph (code point + coordinates within in ImFontAtlas + offset)
+struct ImFontGlyphRangesBuilder; // Helper to build glyph ranges from text/string data
+struct ImColor; // Helper functions to create a color that can be converted to either u32 or float4 (*OBSOLETE* please avoid using)
+struct ImGuiContext; // Dear ImGui context (opaque structure, unless including imgui_internal.h)
struct ImGuiIO; // Main configuration and I/O between your application and ImGui
struct ImGuiInputTextCallbackData; // Shared state of InputText() when using custom ImGuiInputTextCallback (rare/advanced use)
struct ImGuiListClipper; // Helper to manually clip large list of items
@@ -82,40 +134,49 @@ struct ImGuiPayload; // User data payload for drag and drop opera
struct ImGuiSizeCallbackData; // Callback data when using SetNextWindowSizeConstraints() (rare/advanced use)
struct ImGuiStorage; // Helper for key->value storage
struct ImGuiStyle; // Runtime data for styling/colors
-struct ImGuiTextFilter; // Helper to parse and apply text filters (e.g. "aaaaa[,bbbb][,ccccc]")
struct ImGuiTextBuffer; // Helper to hold and append into a text buffer (~string builder)
+struct ImGuiTextFilter; // Helper to parse and apply text filters (e.g. "aaaaa[,bbbb][,ccccc]")
// Typedefs and Enums/Flags (declared as int for compatibility with old C++, to allow using as flags and to not pollute the top of this file)
-// Use your programming IDE "Go to definition" facility on the names of the center columns to find the actual flags/enum lists.
+// Use your programming IDE "Go to definition" facility on the names in the central column below to find the actual flags/enum lists.
+#ifndef ImTextureID
+typedef void* ImTextureID; // User data to identify a texture (this is whatever to you want it to be! read the FAQ about ImTextureID in imgui.cpp)
+#endif
typedef unsigned int ImGuiID; // Unique ID used by widgets (typically hashed from a stack of string)
-typedef unsigned short ImWchar; // Character for keyboard input/display
+typedef unsigned short ImWchar; // A single U16 character for keyboard input/display. We encode them as multi bytes UTF-8 when used in strings.
typedef int ImGuiCol; // -> enum ImGuiCol_ // Enum: A color identifier for styling
-typedef int ImGuiCond; // -> enum ImGuiCond_ // Enum: A condition for Set*()
+typedef int ImGuiCond; // -> enum ImGuiCond_ // Enum: A condition for many Set*() functions
typedef int ImGuiDataType; // -> enum ImGuiDataType_ // Enum: A primary data type
typedef int ImGuiDir; // -> enum ImGuiDir_ // Enum: A cardinal direction
typedef int ImGuiKey; // -> enum ImGuiKey_ // Enum: A key identifier (ImGui-side enum)
typedef int ImGuiNavInput; // -> enum ImGuiNavInput_ // Enum: An input identifier for navigation
+typedef int ImGuiMouseButton; // -> enum ImGuiMouseButton_ // Enum: A mouse button identifier (0=left, 1=right, 2=middle)
typedef int ImGuiMouseCursor; // -> enum ImGuiMouseCursor_ // Enum: A mouse cursor identifier
typedef int ImGuiStyleVar; // -> enum ImGuiStyleVar_ // Enum: A variable identifier for styling
-typedef int ImDrawCornerFlags; // -> enum ImDrawCornerFlags_ // Flags: for ImDrawList::AddRect*() etc.
+typedef int ImDrawCornerFlags; // -> enum ImDrawCornerFlags_ // Flags: for ImDrawList::AddRect(), AddRectFilled() etc.
typedef int ImDrawListFlags; // -> enum ImDrawListFlags_ // Flags: for ImDrawList
typedef int ImFontAtlasFlags; // -> enum ImFontAtlasFlags_ // Flags: for ImFontAtlas
typedef int ImGuiBackendFlags; // -> enum ImGuiBackendFlags_ // Flags: for io.BackendFlags
-typedef int ImGuiColorEditFlags; // -> enum ImGuiColorEditFlags_ // Flags: for ColorEdit*(), ColorPicker*()
-typedef int ImGuiColumnsFlags; // -> enum ImGuiColumnsFlags_ // Flags: for Columns(), BeginColumns()
+typedef int ImGuiColorEditFlags; // -> enum ImGuiColorEditFlags_ // Flags: for ColorEdit4(), ColorPicker4() etc.
typedef int ImGuiConfigFlags; // -> enum ImGuiConfigFlags_ // Flags: for io.ConfigFlags
typedef int ImGuiComboFlags; // -> enum ImGuiComboFlags_ // Flags: for BeginCombo()
-typedef int ImGuiDragDropFlags; // -> enum ImGuiDragDropFlags_ // Flags: for *DragDrop*()
+typedef int ImGuiDragDropFlags; // -> enum ImGuiDragDropFlags_ // Flags: for BeginDragDropSource(), AcceptDragDropPayload()
typedef int ImGuiFocusedFlags; // -> enum ImGuiFocusedFlags_ // Flags: for IsWindowFocused()
typedef int ImGuiHoveredFlags; // -> enum ImGuiHoveredFlags_ // Flags: for IsItemHovered(), IsWindowHovered() etc.
-typedef int ImGuiInputTextFlags; // -> enum ImGuiInputTextFlags_ // Flags: for InputText*()
+typedef int ImGuiInputTextFlags; // -> enum ImGuiInputTextFlags_ // Flags: for InputText(), InputTextMultiline()
typedef int ImGuiSelectableFlags; // -> enum ImGuiSelectableFlags_ // Flags: for Selectable()
-typedef int ImGuiTreeNodeFlags; // -> enum ImGuiTreeNodeFlags_ // Flags: for TreeNode*(),CollapsingHeader()
-typedef int ImGuiWindowFlags; // -> enum ImGuiWindowFlags_ // Flags: for Begin*()
+typedef int ImGuiTabBarFlags; // -> enum ImGuiTabBarFlags_ // Flags: for BeginTabBar()
+typedef int ImGuiTabItemFlags; // -> enum ImGuiTabItemFlags_ // Flags: for BeginTabItem()
+typedef int ImGuiTreeNodeFlags; // -> enum ImGuiTreeNodeFlags_ // Flags: for TreeNode(), TreeNodeEx(), CollapsingHeader()
+typedef int ImGuiWindowFlags; // -> enum ImGuiWindowFlags_ // Flags: for Begin(), BeginChild()
typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData *data);
typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);
// Scalar data types
+typedef signed char ImS8; // 8-bit signed integer
+typedef unsigned char ImU8; // 8-bit unsigned integer
+typedef signed short ImS16; // 16-bit signed integer
+typedef unsigned short ImU16; // 16-bit unsigned integer
typedef signed int ImS32; // 32-bit signed integer == int
typedef unsigned int ImU32; // 32-bit unsigned integer (often used to store packed colors)
#if defined(_MSC_VER) && !defined(__clang__)
@@ -136,7 +197,8 @@ struct ImVec2
float x, y;
ImVec2() { x = y = 0.0f; }
ImVec2(float _x, float _y) { x = _x; y = _y; }
- float operator[] (size_t i) const { IM_ASSERT(i <= 1); return (&x)[i]; } // We very rarely use this [] operator, the assert overhead is fine.
+ float operator[] (size_t idx) const { IM_ASSERT(idx <= 1); return (&x)[idx]; } // We very rarely use this [] operator, the assert overhead is fine.
+ float& operator[] (size_t idx) { IM_ASSERT(idx <= 1); return (&x)[idx]; } // We very rarely use this [] operator, the assert overhead is fine.
#ifdef IM_VEC2_CLASS_EXTRA
IM_VEC2_CLASS_EXTRA // Define additional constructors and implicit cast operators in imconfig.h to convert back and forth between your math types and ImVec2.
#endif
@@ -153,35 +215,39 @@ struct ImVec4
#endif
};
-// Dear ImGui end-user API
-// (In a namespace so you can add extra functions in your own separate file. Please don't modify imgui.cpp/.h!)
+//-----------------------------------------------------------------------------
+// ImGui: Dear ImGui end-user API
+// (Inside a namespace so you can add extra functions in your own separate file. Please don't modify imgui source files!)
+//-----------------------------------------------------------------------------
+
namespace ImGui
{
// Context creation and access
// Each context create its own ImFontAtlas by default. You may instance one yourself and pass it to CreateContext() to share a font atlas between imgui contexts.
- // All those functions are not reliant on the current context.
+ // None of those functions is reliant on the current context.
IMGUI_API ImGuiContext* CreateContext(ImFontAtlas* shared_font_atlas = NULL);
IMGUI_API void DestroyContext(ImGuiContext* ctx = NULL); // NULL = destroy current context
IMGUI_API ImGuiContext* GetCurrentContext();
IMGUI_API void SetCurrentContext(ImGuiContext* ctx);
- IMGUI_API bool DebugCheckVersionAndDataLayout(const char* version_str, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_drawvert);
+ IMGUI_API bool DebugCheckVersionAndDataLayout(const char* version_str, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_drawvert, size_t sz_drawidx);
// Main
IMGUI_API ImGuiIO& GetIO(); // access the IO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags)
IMGUI_API ImGuiStyle& GetStyle(); // access the Style structure (colors, sizes). Always use PushStyleCol(), PushStyleVar() to modify style mid-frame.
- IMGUI_API void NewFrame(); // start a new ImGui frame, you can submit any command from this point until Render()/EndFrame().
- IMGUI_API void EndFrame(); // ends the ImGui frame. automatically called by Render(), you likely don't need to call that yourself directly. If you don't need to render data (skipping rendering) you may call EndFrame() but you'll have wasted CPU already! If you don't need to render, better to not create any imgui windows and not call NewFrame() at all!
- IMGUI_API void Render(); // ends the ImGui frame, finalize the draw data. (Obsolete: optionally call io.RenderDrawListsFn if set. Nowadays, prefer calling your render function yourself.)
- IMGUI_API ImDrawData* GetDrawData(); // valid after Render() and until the next call to NewFrame(). this is what you have to render. (Obsolete: this used to be passed to your io.RenderDrawListsFn() function.)
+ IMGUI_API void NewFrame(); // start a new Dear ImGui frame, you can submit any command from this point until Render()/EndFrame().
+ IMGUI_API void EndFrame(); // ends the Dear ImGui frame. automatically called by Render(), you likely don't need to call that yourself directly. If you don't need to render data (skipping rendering) you may call EndFrame() but you'll have wasted CPU already! If you don't need to render, better to not create any imgui windows and not call NewFrame() at all!
+ IMGUI_API void Render(); // ends the Dear ImGui frame, finalize the draw data. You can get call GetDrawData() to obtain it and run your rendering function. (Obsolete: this used to call io.RenderDrawListsFn(). Nowadays, we allow and prefer calling your render function yourself.)
+ IMGUI_API ImDrawData* GetDrawData(); // valid after Render() and until the next call to NewFrame(). this is what you have to render.
// Demo, Debug, Information
- IMGUI_API void ShowDemoWindow(bool* p_open = NULL); // create demo/test window (previously called ShowTestWindow). demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application!
- IMGUI_API void ShowMetricsWindow(bool* p_open = NULL); // create metrics window. display ImGui internals: draw commands (with individual draw calls and vertices), window list, basic internal state, etc.
+ IMGUI_API void ShowDemoWindow(bool* p_open = NULL); // create Demo window (previously called ShowTestWindow). demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application!
+ IMGUI_API void ShowAboutWindow(bool* p_open = NULL); // create About window. display Dear ImGui version, credits and build/system information.
+ IMGUI_API void ShowMetricsWindow(bool* p_open = NULL); // create Metrics/Debug window. display Dear ImGui internals: draw commands (with individual draw calls and vertices), window list, basic internal state, etc.
IMGUI_API void ShowStyleEditor(ImGuiStyle* ref = NULL); // add style editor block (not a window). you can pass in a reference ImGuiStyle structure to compare to, revert to and save to (else it uses the default style)
IMGUI_API bool ShowStyleSelector(const char* label); // add style selector block (not a window), essentially a combo listing the default styles.
IMGUI_API void ShowFontSelector(const char* label); // add font selector block (not a window), essentially a combo listing the loaded fonts.
IMGUI_API void ShowUserGuide(); // add basic help/info block (not a window): how to manipulate ImGui as a end-user (mouse/keyboard controls).
- IMGUI_API const char* GetVersion(); // get the compiled version string e.g. "1.23"
+ IMGUI_API const char* GetVersion(); // get the compiled version string e.g. "1.23" (essentially the compiled value for IMGUI_VERSION)
// Styles
IMGUI_API void StyleColorsDark(ImGuiStyle* dst = NULL); // new, recommended style (default)
@@ -191,9 +257,14 @@ namespace ImGui
// Windows
// - Begin() = push window to the stack and start appending to it. End() = pop window from the stack.
// - You may append multiple times to the same window during the same frame.
- // - Passing 'bool* p_open != NULL' shows a window-closing widget in the upper-right corner of the window, which clicking will set the boolean to false when clicked.
- // - Begin() return false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting anything to the window.
- // Always call a matching End() for each Begin() call, regardless of its return value [this is due to legacy reason and is inconsistent with most other functions such as BeginMenu/EndMenu, BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding BeginXXX function returned true.]
+ // - Passing 'bool* p_open != NULL' shows a window-closing widget in the upper-right corner of the window,
+ // which clicking will set the boolean to false when clicked.
+ // - Begin() return false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting
+ // anything to the window. Always call a matching End() for each Begin() call, regardless of its return value!
+ // [Important: due to legacy reason, this is inconsistent with most other functions such as BeginMenu/EndMenu,
+ // BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding BeginXXX function
+ // returned true. Begin and BeginChild are the only odd ones out. Will be fixed in a future update.]
+ // - Note that the bottom of window stack always contains a window called "Debug".
IMGUI_API bool Begin(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0);
IMGUI_API void End();
@@ -201,44 +272,48 @@ namespace ImGui
// - Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window. Child windows can embed their own child.
// - For each independent axis of 'size': ==0.0f: use remaining host window size / >0.0f: fixed size / <0.0f: use remaining window size minus abs(size) / Each axis can use a different mode, e.g. ImVec2(0,400).
// - BeginChild() returns false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting anything to the window.
- // Always call a matching EndChild() for each BeginChild() call, regardless of its return value [this is due to legacy reason and is inconsistent with most other functions such as BeginMenu/EndMenu, BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding BeginXXX function returned true.]
+ // Always call a matching EndChild() for each BeginChild() call, regardless of its return value [as with Begin: this is due to legacy reason and inconsistent with most BeginXXX functions apart from the regular Begin() which behaves like BeginChild().]
IMGUI_API bool BeginChild(const char* str_id, const ImVec2& size = ImVec2(0,0), bool border = false, ImGuiWindowFlags flags = 0);
IMGUI_API bool BeginChild(ImGuiID id, const ImVec2& size = ImVec2(0,0), bool border = false, ImGuiWindowFlags flags = 0);
IMGUI_API void EndChild();
// Windows Utilities
+ // - 'current window' = the window we are appending into while inside a Begin()/End() block. 'next window' = next window we will Begin() into.
IMGUI_API bool IsWindowAppearing();
IMGUI_API bool IsWindowCollapsed();
IMGUI_API bool IsWindowFocused(ImGuiFocusedFlags flags=0); // is current window focused? or its root/child, depending on flags. see flags for options.
IMGUI_API bool IsWindowHovered(ImGuiHoveredFlags flags=0); // is current window hovered (and typically: not blocked by a popup/modal)? see flags for options. NB: If you are trying to check whether your mouse should be dispatched to imgui or to your app, you should use the 'io.WantCaptureMouse' boolean for that! Please read the FAQ!
- IMGUI_API ImDrawList* GetWindowDrawList(); // get draw list associated to the window, to append your own drawing primitives
+ IMGUI_API ImDrawList* GetWindowDrawList(); // get draw list associated to the current window, to append your own drawing primitives
IMGUI_API ImVec2 GetWindowPos(); // get current window position in screen space (useful if you want to do your own drawing via the DrawList API)
IMGUI_API ImVec2 GetWindowSize(); // get current window size
IMGUI_API float GetWindowWidth(); // get current window width (shortcut for GetWindowSize().x)
IMGUI_API float GetWindowHeight(); // get current window height (shortcut for GetWindowSize().y)
- IMGUI_API ImVec2 GetContentRegionMax(); // current content boundaries (typically window boundaries including scrolling, or current column boundaries), in windows coordinates
- IMGUI_API ImVec2 GetContentRegionAvail(); // == GetContentRegionMax() - GetCursorPos()
- IMGUI_API float GetContentRegionAvailWidth(); //
- IMGUI_API ImVec2 GetWindowContentRegionMin(); // content boundaries min (roughly (0,0)-Scroll), in window coordinates
- IMGUI_API ImVec2 GetWindowContentRegionMax(); // content boundaries max (roughly (0,0)+Size-Scroll) where Size can be override with SetNextWindowContentSize(), in window coordinates
- IMGUI_API float GetWindowContentRegionWidth(); //
+ // Prefer using SetNextXXX functions (before Begin) rather that SetXXX functions (after Begin).
IMGUI_API void SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0, const ImVec2& pivot = ImVec2(0,0)); // set next window position. call before Begin(). use pivot=(0.5f,0.5f) to center on given point, etc.
IMGUI_API void SetNextWindowSize(const ImVec2& size, ImGuiCond cond = 0); // set next window size. set axis to 0.0f to force an auto-fit on this axis. call before Begin()
- IMGUI_API void SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback = NULL, void* custom_callback_data = NULL); // set next window size limits. use -1,-1 on either X/Y axis to preserve the current size. Use callback to apply non-trivial programmatic constraints.
- IMGUI_API void SetNextWindowContentSize(const ImVec2& size); // set next window content size (~ enforce the range of scrollbars). not including window decorations (title bar, menu bar, etc.). set an axis to 0.0f to leave it automatic. call before Begin()
+ IMGUI_API void SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback = NULL, void* custom_callback_data = NULL); // set next window size limits. use -1,-1 on either X/Y axis to preserve the current size. Sizes will be rounded down. Use callback to apply non-trivial programmatic constraints.
+ IMGUI_API void SetNextWindowContentSize(const ImVec2& size); // set next window content size (~ scrollable client area, which enforce the range of scrollbars). Not including window decorations (title bar, menu bar, etc.) nor WindowPadding. set an axis to 0.0f to leave it automatic. call before Begin()
IMGUI_API void SetNextWindowCollapsed(bool collapsed, ImGuiCond cond = 0); // set next window collapsed state. call before Begin()
- IMGUI_API void SetNextWindowFocus(); // set next window to be focused / front-most. call before Begin()
- IMGUI_API void SetNextWindowBgAlpha(float alpha); // set next window background color alpha. helper to easily modify ImGuiCol_WindowBg/ChildBg/PopupBg. you may also use ImGuiWindowFlags_NoBackground.
+ IMGUI_API void SetNextWindowFocus(); // set next window to be focused / top-most. call before Begin()
+ IMGUI_API void SetNextWindowBgAlpha(float alpha); // set next window background color alpha. helper to easily override the Alpha component of ImGuiCol_WindowBg/ChildBg/PopupBg. you may also use ImGuiWindowFlags_NoBackground.
IMGUI_API void SetWindowPos(const ImVec2& pos, ImGuiCond cond = 0); // (not recommended) set current window position - call within Begin()/End(). prefer using SetNextWindowPos(), as this may incur tearing and side-effects.
IMGUI_API void SetWindowSize(const ImVec2& size, ImGuiCond cond = 0); // (not recommended) set current window size - call within Begin()/End(). set to ImVec2(0,0) to force an auto-fit. prefer using SetNextWindowSize(), as this may incur tearing and minor side-effects.
IMGUI_API void SetWindowCollapsed(bool collapsed, ImGuiCond cond = 0); // (not recommended) set current window collapsed state. prefer using SetNextWindowCollapsed().
- IMGUI_API void SetWindowFocus(); // (not recommended) set current window to be focused / front-most. prefer using SetNextWindowFocus().
- IMGUI_API void SetWindowFontScale(float scale); // set font scale. Adjust IO.FontGlobalScale if you want to scale all windows
+ IMGUI_API void SetWindowFocus(); // (not recommended) set current window to be focused / top-most. prefer using SetNextWindowFocus().
+ IMGUI_API void SetWindowFontScale(float scale); // set font scale. Adjust IO.FontGlobalScale if you want to scale all windows. This is an old API! For correct scaling, prefer to reload font + rebuild ImFontAtlas + call style.ScaleAllSizes().
IMGUI_API void SetWindowPos(const char* name, const ImVec2& pos, ImGuiCond cond = 0); // set named window position.
IMGUI_API void SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond = 0); // set named window size. set axis to 0.0f to force an auto-fit on this axis.
IMGUI_API void SetWindowCollapsed(const char* name, bool collapsed, ImGuiCond cond = 0); // set named window collapsed state
- IMGUI_API void SetWindowFocus(const char* name); // set named window to be focused / front-most. use NULL to remove focus.
+ IMGUI_API void SetWindowFocus(const char* name); // set named window to be focused / top-most. use NULL to remove focus.
+
+ // Content region
+ // - Those functions are bound to be redesigned soon (they are confusing, incomplete and return values in local window coordinates which increases confusion)
+ IMGUI_API ImVec2 GetContentRegionMax(); // current content boundaries (typically window boundaries including scrolling, or current column boundaries), in windows coordinates
+ IMGUI_API ImVec2 GetContentRegionAvail(); // == GetContentRegionMax() - GetCursorPos()
+ IMGUI_API ImVec2 GetWindowContentRegionMin(); // content boundaries min (roughly (0,0)-Scroll), in window coordinates
+ IMGUI_API ImVec2 GetWindowContentRegionMax(); // content boundaries max (roughly (0,0)+Size-Scroll) where Size can be override with SetNextWindowContentSize(), in window coordinates
+ IMGUI_API float GetWindowContentRegionWidth(); //
// Windows Scrolling
IMGUI_API float GetScrollX(); // get scrolling amount [0..GetScrollMaxX()]
@@ -247,8 +322,10 @@ namespace ImGui
IMGUI_API float GetScrollMaxY(); // get maximum scrolling amount ~~ ContentSize.Y - WindowSize.Y
IMGUI_API void SetScrollX(float scroll_x); // set scrolling amount [0..GetScrollMaxX()]
IMGUI_API void SetScrollY(float scroll_y); // set scrolling amount [0..GetScrollMaxY()]
- IMGUI_API void SetScrollHereY(float center_y_ratio = 0.5f); // adjust scrolling amount to make current cursor position visible. center_y_ratio=0.0: top, 0.5: center, 1.0: bottom. When using to make a "default/current item" visible, consider using SetItemDefaultFocus() instead.
- IMGUI_API void SetScrollFromPosY(float pos_y, float center_y_ratio = 0.5f); // adjust scrolling amount to make given position valid. use GetCursorPos() or GetCursorStartPos()+offset to get valid positions.
+ IMGUI_API void SetScrollHereX(float center_x_ratio = 0.5f); // adjust scrolling amount to make current cursor position visible. center_x_ratio=0.0: left, 0.5: center, 1.0: right. When using to make a "default/current item" visible, consider using SetItemDefaultFocus() instead.
+ IMGUI_API void SetScrollHereY(float center_y_ratio = 0.5f); // adjust scrolling amount to make current cursor position visible. center_y_ratio=0.0: top, 0.5: center, 1.0: bottom. When using to make a "default/current item" visible, consider using SetItemDefaultFocus() instead.
+ IMGUI_API void SetScrollFromPosX(float local_x, float center_x_ratio = 0.5f); // adjust scrolling amount to make given position visible. Generally GetCursorStartPos() + offset to compute a valid position.
+ IMGUI_API void SetScrollFromPosY(float local_y, float center_y_ratio = 0.5f); // adjust scrolling amount to make given position visible. Generally GetCursorStartPos() + offset to compute a valid position.
// Parameters stacks (shared)
IMGUI_API void PushFont(ImFont* font); // use NULL as a shortcut to push default font
@@ -268,10 +345,11 @@ namespace ImGui
IMGUI_API ImU32 GetColorU32(ImU32 col); // retrieve given color with style alpha applied
// Parameters stacks (current window)
- IMGUI_API void PushItemWidth(float item_width); // width of items for the common item+label case, pixels. 0.0f = default to ~2/3 of windows width, >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side)
+ IMGUI_API void PushItemWidth(float item_width); // set width of items for common large "item+label" widgets. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side). 0.0f = default to ~2/3 of windows width,
IMGUI_API void PopItemWidth();
- IMGUI_API float CalcItemWidth(); // width of item given pushed settings and current cursor position
- IMGUI_API void PushTextWrapPos(float wrap_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space
+ IMGUI_API void SetNextItemWidth(float item_width); // set width of the _next_ common large "item+label" widget. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side)
+ IMGUI_API float CalcItemWidth(); // width of item given pushed settings and current cursor position. NOT necessarily the width of last item unlike most 'Item' functions.
+ IMGUI_API void PushTextWrapPos(float wrap_local_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space
IMGUI_API void PopTextWrapPos();
IMGUI_API void PushAllowKeyboardFocus(bool allow_keyboard_focus); // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets
IMGUI_API void PopAllowKeyboardFocus();
@@ -279,24 +357,27 @@ namespace ImGui
IMGUI_API void PopButtonRepeat();
// Cursor / Layout
+ // - By "cursor" we mean the current output position.
+ // - The typical widget behavior is to output themselves at the current cursor position, then move the cursor one line down.
+ // - You can call SameLine() between widgets to undo the last carriage return and output at the right of the preceeding widget.
IMGUI_API void Separator(); // separator, generally horizontal. inside a menu bar or in horizontal layout mode, this becomes a vertical separator.
- IMGUI_API void SameLine(float pos_x = 0.0f, float spacing_w = -1.0f); // call between widgets or groups to layout them horizontally
- IMGUI_API void NewLine(); // undo a SameLine()
- IMGUI_API void Spacing(); // add vertical spacing
- IMGUI_API void Dummy(const ImVec2& size); // add a dummy item of given size
+ IMGUI_API void SameLine(float offset_from_start_x=0.0f, float spacing=-1.0f); // call between widgets or groups to layout them horizontally. X position given in window coordinates.
+ IMGUI_API void NewLine(); // undo a SameLine() or force a new line when in an horizontal-layout context.
+ IMGUI_API void Spacing(); // add vertical spacing.
+ IMGUI_API void Dummy(const ImVec2& size); // add a dummy item of given size. unlike InvisibleButton(), Dummy() won't take the mouse click or be navigable into.
IMGUI_API void Indent(float indent_w = 0.0f); // move content position toward the right, by style.IndentSpacing or indent_w if != 0
IMGUI_API void Unindent(float indent_w = 0.0f); // move content position back to the left, by style.IndentSpacing or indent_w if != 0
- IMGUI_API void BeginGroup(); // lock horizontal starting position + capture group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.)
- IMGUI_API void EndGroup();
- IMGUI_API ImVec2 GetCursorPos(); // cursor position is relative to window position
- IMGUI_API float GetCursorPosX(); // "
- IMGUI_API float GetCursorPosY(); // "
- IMGUI_API void SetCursorPos(const ImVec2& local_pos); // "
- IMGUI_API void SetCursorPosX(float x); // "
- IMGUI_API void SetCursorPosY(float y); // "
- IMGUI_API ImVec2 GetCursorStartPos(); // initial cursor position
+ IMGUI_API void BeginGroup(); // lock horizontal starting position
+ IMGUI_API void EndGroup(); // unlock horizontal starting position + capture the whole group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.)
+ IMGUI_API ImVec2 GetCursorPos(); // cursor position in window coordinates (relative to window position)
+ IMGUI_API float GetCursorPosX(); // (some functions are using window-relative coordinates, such as: GetCursorPos, GetCursorStartPos, GetContentRegionMax, GetWindowContentRegion* etc.
+ IMGUI_API float GetCursorPosY(); // other functions such as GetCursorScreenPos or everything in ImDrawList::
+ IMGUI_API void SetCursorPos(const ImVec2& local_pos); // are using the main, absolute coordinate system.
+ IMGUI_API void SetCursorPosX(float local_x); // GetWindowPos() + GetCursorPos() == GetCursorScreenPos() etc.)
+ IMGUI_API void SetCursorPosY(float local_y); //
+ IMGUI_API ImVec2 GetCursorStartPos(); // initial cursor position in window coordinates
IMGUI_API ImVec2 GetCursorScreenPos(); // cursor position in absolute screen coordinates [0..io.DisplaySize] (useful to work with ImDrawList API)
- IMGUI_API void SetCursorScreenPos(const ImVec2& screen_pos); // cursor position in absolute screen coordinates [0..io.DisplaySize]
+ IMGUI_API void SetCursorScreenPos(const ImVec2& pos); // cursor position in absolute screen coordinates [0..io.DisplaySize]
IMGUI_API void AlignTextToFramePadding(); // vertically align upcoming text baseline to FramePadding.y so that it will align properly to regularly framed items (call if you have text on a line before a framed item)
IMGUI_API float GetTextLineHeight(); // ~ FontSize
IMGUI_API float GetTextLineHeightWithSpacing(); // ~ FontSize + style.ItemSpacing.y (distance in pixels between 2 consecutive lines of text)
@@ -304,23 +385,24 @@ namespace ImGui
IMGUI_API float GetFrameHeightWithSpacing(); // ~ FontSize + style.FramePadding.y * 2 + style.ItemSpacing.y (distance in pixels between 2 consecutive lines of framed widgets)
// ID stack/scopes
- // Read the FAQ for more details about how ID are handled in dear imgui. If you are creating widgets in a loop you most
- // likely want to push a unique identifier (e.g. object pointer, loop index) to uniquely differentiate them.
- // You can also use the "##foobar" syntax within widget label to distinguish them from each others.
- // In this header file we use the "label"/"name" terminology to denote a string that will be displayed and used as an ID,
- // whereas "str_id" denote a string that is only used as an ID and not aimed to be displayed.
- IMGUI_API void PushID(const char* str_id); // push identifier into the ID stack. IDs are hash of the entire stack!
- IMGUI_API void PushID(const char* str_id_begin, const char* str_id_end);
- IMGUI_API void PushID(const void* ptr_id);
- IMGUI_API void PushID(int int_id);
- IMGUI_API void PopID();
+ // - Read the FAQ for more details about how ID are handled in dear imgui. If you are creating widgets in a loop you most
+ // likely want to push a unique identifier (e.g. object pointer, loop index) to uniquely differentiate them.
+ // - The resulting ID are hashes of the entire stack.
+ // - You can also use the "Label##foobar" syntax within widget label to distinguish them from each others.
+ // - In this header file we use the "label"/"name" terminology to denote a string that will be displayed and used as an ID,
+ // whereas "str_id" denote a string that is only used as an ID and not normally displayed.
+ IMGUI_API void PushID(const char* str_id); // push string into the ID stack (will hash string).
+ IMGUI_API void PushID(const char* str_id_begin, const char* str_id_end); // push string into the ID stack (will hash string).
+ IMGUI_API void PushID(const void* ptr_id); // push pointer into the ID stack (will hash pointer).
+ IMGUI_API void PushID(int int_id); // push integer into the ID stack (will hash integer).
+ IMGUI_API void PopID(); // pop from the ID stack.
IMGUI_API ImGuiID GetID(const char* str_id); // calculate unique ID (hash of whole ID stack + given parameter). e.g. if you want to query into ImGuiStorage yourself
IMGUI_API ImGuiID GetID(const char* str_id_begin, const char* str_id_end);
IMGUI_API ImGuiID GetID(const void* ptr_id);
// Widgets: Text
- IMGUI_API void TextUnformatted(const char* text, const char* text_end = NULL); // raw text without formatting. Roughly equivalent to Text("%s", text) but: A) doesn't require null terminated string if 'text_end' is specified, B) it's faster, no memory copy is done, no buffer size limits, recommended for long chunks of text.
- IMGUI_API void Text(const char* fmt, ...) IM_FMTARGS(1); // simple formatted text
+ IMGUI_API void TextUnformatted(const char* text, const char* text_end = NULL); // raw text without formatting. Roughly equivalent to Text("%s", text) but: A) doesn't require null terminated string if 'text_end' is specified, B) it's faster, no memory copy is done, no buffer size limits, recommended for long chunks of text.
+ IMGUI_API void Text(const char* fmt, ...) IM_FMTARGS(1); // formatted text
IMGUI_API void TextV(const char* fmt, va_list args) IM_FMTLIST(1);
IMGUI_API void TextColored(const ImVec4& col, const char* fmt, ...) IM_FMTARGS(2); // shortcut for PushStyleColor(ImGuiCol_Text, col); Text(fmt, ...); PopStyleColor();
IMGUI_API void TextColoredV(const ImVec4& col, const char* fmt, va_list args) IM_FMTLIST(2);
@@ -334,10 +416,11 @@ namespace ImGui
IMGUI_API void BulletTextV(const char* fmt, va_list args) IM_FMTLIST(1);
// Widgets: Main
- // Most widgets return true when the value has been changed or when pressed/selected
+ // - Most widgets return true when the value has been changed or when pressed/selected
+ // - You may also use one of the many IsItemXXX functions (e.g. IsItemActive, IsItemHovered, etc.) to query widget state.
IMGUI_API bool Button(const char* label, const ImVec2& size = ImVec2(0,0)); // button
IMGUI_API bool SmallButton(const char* label); // button with FramePadding=(0,0) to easily embed within text
- IMGUI_API bool InvisibleButton(const char* str_id, const ImVec2& size); // button behavior without the visuals, useful to build custom behaviors using the public api (along with IsItemActive, IsItemHovered, etc.)
+ IMGUI_API bool InvisibleButton(const char* str_id, const ImVec2& size); // button behavior without the visuals, frequently useful to build custom behaviors using the public api (along with IsItemActive, IsItemHovered, etc.)
IMGUI_API bool ArrowButton(const char* str_id, ImGuiDir dir); // square button with an arrow shape
IMGUI_API void Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0,0), const ImVec2& uv1 = ImVec2(1,1), const ImVec4& tint_col = ImVec4(1,1,1,1), const ImVec4& border_col = ImVec4(0,0,0,0));
IMGUI_API bool ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0,0), const ImVec2& uv1 = ImVec2(1,1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0,0,0,0), const ImVec4& tint_col = ImVec4(1,1,1,1)); // <0 frame_padding uses default frame padding settings. 0 for no padding
@@ -349,18 +432,22 @@ namespace ImGui
IMGUI_API void Bullet(); // draw a small circle and keep the cursor on the same line. advance cursor x position by GetTreeNodeToLabelSpacing(), same distance that TreeNode() uses
// Widgets: Combo Box
- // The new BeginCombo()/EndCombo() api allows you to manage your contents and selection state however you want it, by creating e.g. Selectable() items.
- // The old Combo() api are helpers over BeginCombo()/EndCombo() which are kept available for convenience purpose.
+ // - The BeginCombo()/EndCombo() api allows you to manage your contents and selection state however you want it, by creating e.g. Selectable() items.
+ // - The old Combo() api are helpers over BeginCombo()/EndCombo() which are kept available for convenience purpose.
IMGUI_API bool BeginCombo(const char* label, const char* preview_value, ImGuiComboFlags flags = 0);
IMGUI_API void EndCombo(); // only call EndCombo() if BeginCombo() returns true!
IMGUI_API bool Combo(const char* label, int* current_item, const char* const items[], int items_count, int popup_max_height_in_items = -1);
IMGUI_API bool Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int popup_max_height_in_items = -1); // Separate items with \0 within a string, end item-list with \0\0. e.g. "One\0Two\0Three\0"
IMGUI_API bool Combo(const char* label, int* current_item, bool(*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int popup_max_height_in_items = -1);
- // Widgets: Drags (tip: ctrl+click on a drag box to input with keyboard. manually input values aren't clamped, can go off-bounds)
- // For all the Float2/Float3/Float4/Int2/Int3/Int4 versions of every functions, note that a 'float v[X]' function argument is the same as 'float* v', the array syntax is just a way to document the number of elements that are expected to be accessible. You can pass address of your first element out of a contiguous set, e.g. &myvector.x
- // Adjust format string to decorate the value with a prefix, a suffix, or adapt the editing and display precision e.g. "%.3f" -> 1.234; "%5.2f secs" -> 01.23 secs; "Biscuit: %.0f" -> Biscuit: 1; etc.
- // Speed are per-pixel of mouse movement (v_speed=0.2f: mouse needs to move by 5 pixels to increase value by 1). For gamepad/keyboard navigation, minimum speed is Max(v_speed, minimum_step_at_given_precision).
+ // Widgets: Drags
+ // - CTRL+Click on any drag box to turn them into an input box. Manually input values aren't clamped and can go off-bounds.
+ // - For all the Float2/Float3/Float4/Int2/Int3/Int4 versions of every functions, note that a 'float v[X]' function argument is the same as 'float* v', the array syntax is just a way to document the number of elements that are expected to be accessible. You can pass address of your first element out of a contiguous set, e.g. &myvector.x
+ // - Adjust format string to decorate the value with a prefix, a suffix, or adapt the editing and display precision e.g. "%.3f" -> 1.234; "%5.2f secs" -> 01.23 secs; "Biscuit: %.0f" -> Biscuit: 1; etc.
+ // - Speed are per-pixel of mouse movement (v_speed=0.2f: mouse needs to move by 5 pixels to increase value by 1). For gamepad/keyboard navigation, minimum speed is Max(v_speed, minimum_step_at_given_precision).
+ // - Use v_min < v_max to clamp edits to given limits. Note that CTRL+Click manual input can override those limits.
+ // - Use v_max = FLT_MAX / INT_MAX etc to avoid clamping to a maximum, same with v_min = -FLT_MAX / INT_MIN to avoid clamping to a minimum.
+ // - Use v_min > v_max to lock edits.
IMGUI_API bool DragFloat(const char* label, float* v, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f); // If v_min >= v_max we have no bound
IMGUI_API bool DragFloat2(const char* label, float v[2], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f);
IMGUI_API bool DragFloat3(const char* label, float v[3], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f);
@@ -371,11 +458,12 @@ namespace ImGui
IMGUI_API bool DragInt3(const char* label, int v[3], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d");
IMGUI_API bool DragInt4(const char* label, int v[4], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d");
IMGUI_API bool DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", const char* format_max = NULL);
- IMGUI_API bool DragScalar(const char* label, ImGuiDataType data_type, void* v, float v_speed, const void* v_min = NULL, const void* v_max = NULL, const char* format = NULL, float power = 1.0f);
- IMGUI_API bool DragScalarN(const char* label, ImGuiDataType data_type, void* v, int components, float v_speed, const void* v_min = NULL, const void* v_max = NULL, const char* format = NULL, float power = 1.0f);
+ IMGUI_API bool DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min = NULL, const void* p_max = NULL, const char* format = NULL, float power = 1.0f);
+ IMGUI_API bool DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min = NULL, const void* p_max = NULL, const char* format = NULL, float power = 1.0f);
- // Widgets: Sliders (tip: ctrl+click on a slider to input with keyboard. manually input values aren't clamped, can go off-bounds)
- // Adjust format string to decorate the value with a prefix, a suffix, or adapt the editing and display precision e.g. "%.3f" -> 1.234; "%5.2f secs" -> 01.23 secs; "Biscuit: %.0f" -> Biscuit: 1; etc.
+ // Widgets: Sliders
+ // - CTRL+Click on any slider to turn them into an input box. Manually input values aren't clamped and can go off-bounds.
+ // - Adjust format string to decorate the value with a prefix, a suffix, or adapt the editing and display precision e.g. "%.3f" -> 1.234; "%5.2f secs" -> 01.23 secs; "Biscuit: %.0f" -> Biscuit: 1; etc.
IMGUI_API bool SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format = "%.3f", float power = 1.0f); // adjust format to decorate the value with a prefix or a suffix for in-slider labels or unit display. Use power!=1.0 for power curve sliders
IMGUI_API bool SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format = "%.3f", float power = 1.0f);
IMGUI_API bool SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format = "%.3f", float power = 1.0f);
@@ -385,30 +473,33 @@ namespace ImGui
IMGUI_API bool SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format = "%d");
IMGUI_API bool SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format = "%d");
IMGUI_API bool SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format = "%d");
- IMGUI_API bool SliderScalar(const char* label, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format = NULL, float power = 1.0f);
- IMGUI_API bool SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format = NULL, float power = 1.0f);
+ IMGUI_API bool SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format = NULL, float power = 1.0f);
+ IMGUI_API bool SliderScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_min, const void* p_max, const char* format = NULL, float power = 1.0f);
IMGUI_API bool VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format = "%.3f", float power = 1.0f);
IMGUI_API bool VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format = "%d");
- IMGUI_API bool VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format = NULL, float power = 1.0f);
+ IMGUI_API bool VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format = NULL, float power = 1.0f);
// Widgets: Input with Keyboard
- // If you want to use InputText() with a dynamic string type such as std::string or your own, see misc/cpp/imgui_stdlib.h
+ // - If you want to use InputText() with std::string or any custom dynamic string type, see misc/cpp/imgui_stdlib.h and comments in imgui_demo.cpp.
+ // - Most of the ImGuiInputTextFlags flags are only useful for InputText() and not for InputFloatX, InputIntX, InputDouble etc.
IMGUI_API bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
IMGUI_API bool InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size = ImVec2(0,0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
- IMGUI_API bool InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, const char* format = "%.3f", ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputFloat2(const char* label, float v[2], const char* format = "%.3f", ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputFloat3(const char* label, float v[3], const char* format = "%.3f", ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputFloat4(const char* label, float v[4], const char* format = "%.3f", ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputInt(const char* label, int* v, int step = 1, int step_fast = 100, ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputInt2(const char* label, int v[2], ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputInt3(const char* label, int v[3], ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputInt4(const char* label, int v[4], ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputDouble(const char* label, double* v, double step = 0.0f, double step_fast = 0.0f, const char* format = "%.6f", ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputScalar(const char* label, ImGuiDataType data_type, void* v, const void* step = NULL, const void* step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* step = NULL, const void* step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags extra_flags = 0);
+ IMGUI_API bool InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
+ IMGUI_API bool InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputFloat2(const char* label, float v[2], const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputFloat3(const char* label, float v[3], const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputFloat4(const char* label, float v[4], const char* format = "%.3f", ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputInt(const char* label, int* v, int step = 1, int step_fast = 100, ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputInt2(const char* label, int v[2], ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputInt3(const char* label, int v[3], ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputInt4(const char* label, int v[4], ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputDouble(const char* label, double* v, double step = 0.0, double step_fast = 0.0, const char* format = "%.6f", ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_step = NULL, const void* p_step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_step = NULL, const void* p_step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0);
// Widgets: Color Editor/Picker (tip: the ColorEdit* functions have a little colored preview square that can be left-clicked to open a picker, and right-clicked to open an option menu.)
- // Note that a 'float v[X]' function argument is the same as 'float* v', the array syntax is just a way to document the number of elements that are expected to be accessible. You can the pass the address of a first float element out of a contiguous structure, e.g. &myvector.x
+ // - Note that in C++ a 'float v[X]' function argument is the _same_ as 'float* v', the array syntax is just a way to document the number of elements that are expected to be accessible.
+ // - You can pass the address of a first float element out of a contiguous structure, e.g. &myvector.x
IMGUI_API bool ColorEdit3(const char* label, float col[3], ImGuiColorEditFlags flags = 0);
IMGUI_API bool ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags = 0);
IMGUI_API bool ColorPicker3(const char* label, float col[3], ImGuiColorEditFlags flags = 0);
@@ -417,9 +508,9 @@ namespace ImGui
IMGUI_API void SetColorEditOptions(ImGuiColorEditFlags flags); // initialize current options (generally on application startup) if you want to select a default format, picker type, etc. User will be able to change many settings, unless you pass the _NoOptions flag to your calls.
// Widgets: Trees
- // TreeNode functions return true when the node is open, in which case you need to also call TreePop() when you are finished displaying the tree node contents.
+ // - TreeNode functions return true when the node is open, in which case you need to also call TreePop() when you are finished displaying the tree node contents.
IMGUI_API bool TreeNode(const char* label);
- IMGUI_API bool TreeNode(const char* str_id, const char* fmt, ...) IM_FMTARGS(2); // helper variation to completely decorelate the id from the displayed string. Read the FAQ about why and how to use ID. to align arbitrary text at the same level as a TreeNode() you can use Bullet().
+ IMGUI_API bool TreeNode(const char* str_id, const char* fmt, ...) IM_FMTARGS(2); // helper variation to easily decorelate the id from the displayed string. Read the FAQ about why and how to use ID. to align arbitrary text at the same level as a TreeNode() you can use Bullet().
IMGUI_API bool TreeNode(const void* ptr_id, const char* fmt, ...) IM_FMTARGS(2); // "
IMGUI_API bool TreeNodeV(const char* str_id, const char* fmt, va_list args) IM_FMTLIST(2);
IMGUI_API bool TreeNodeV(const void* ptr_id, const char* fmt, va_list args) IM_FMTLIST(2);
@@ -431,17 +522,19 @@ namespace ImGui
IMGUI_API void TreePush(const char* str_id); // ~ Indent()+PushId(). Already called by TreeNode() when returning true, but you can call TreePush/TreePop yourself if desired.
IMGUI_API void TreePush(const void* ptr_id = NULL); // "
IMGUI_API void TreePop(); // ~ Unindent()+PopId()
- IMGUI_API void TreeAdvanceToLabelPos(); // advance cursor x position by GetTreeNodeToLabelSpacing()
IMGUI_API float GetTreeNodeToLabelSpacing(); // horizontal distance preceding label when using TreeNode*() or Bullet() == (g.FontSize + style.FramePadding.x*2) for a regular unframed TreeNode
- IMGUI_API void SetNextTreeNodeOpen(bool is_open, ImGuiCond cond = 0); // set next TreeNode/CollapsingHeader open state.
IMGUI_API bool CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags = 0); // if returning 'true' the header is open. doesn't indent nor push on ID stack. user doesn't have to call TreePop().
IMGUI_API bool CollapsingHeader(const char* label, bool* p_open, ImGuiTreeNodeFlags flags = 0); // when 'p_open' isn't NULL, display an additional small close button on upper right of the header
+ IMGUI_API void SetNextItemOpen(bool is_open, ImGuiCond cond = 0); // set next TreeNode/CollapsingHeader open state.
// Widgets: Selectables
+ // - A selectable highlights when hovered, and can display another color when selected.
+ // - Neighbors selectable extend their highlight bounds in order to leave no gap between them. This is so a series of selected Selectable appear contiguous.
IMGUI_API bool Selectable(const char* label, bool selected = false, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0,0)); // "bool selected" carry the selection state (read-only). Selectable() is clicked is returns true so you can modify your selection state. size.x==0.0: use remaining width, size.x>0.0: specify width. size.y==0.0: use label height, size.y>0.0: specify height
IMGUI_API bool Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0,0)); // "bool* p_selected" point to the selection state (read-write), as a convenient helper.
// Widgets: List Boxes
+ // - FIXME: To be consistent with all the newer API, ListBoxHeader/ListBoxFooter should in reality be called BeginListBox/EndListBox. Will rename them.
IMGUI_API bool ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_in_items = -1);
IMGUI_API bool ListBox(const char* label, int* current_item, bool (*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int height_in_items = -1);
IMGUI_API bool ListBoxHeader(const char* label, const ImVec2& size = ImVec2(0,0)); // use if you want to reimplement ListBox() will custom data or interactions. if the function return true, you can output elements then call ListBoxFooter() afterwards.
@@ -454,42 +547,57 @@ namespace ImGui
IMGUI_API void PlotHistogram(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
IMGUI_API void PlotHistogram(const char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0));
- // Widgets: Value() Helpers. Output single value in "name: value" format (tip: freely declare more in your code to handle your types. you can add functions to the ImGui namespace)
+ // Widgets: Value() Helpers.
+ // - Those are merely shortcut to calling Text() with a format string. Output single value in "name: value" format (tip: freely declare more in your code to handle your types. you can add functions to the ImGui namespace)
IMGUI_API void Value(const char* prefix, bool b);
IMGUI_API void Value(const char* prefix, int v);
IMGUI_API void Value(const char* prefix, unsigned int v);
IMGUI_API void Value(const char* prefix, float v, const char* float_format = NULL);
// Widgets: Menus
- IMGUI_API bool BeginMainMenuBar(); // create and append to a full screen menu-bar.
- IMGUI_API void EndMainMenuBar(); // only call EndMainMenuBar() if BeginMainMenuBar() returns true!
+ // - Use BeginMenuBar() on a window ImGuiWindowFlags_MenuBar to append to its menu bar.
+ // - Use BeginMainMenuBar() to create a menu bar at the top of the screen.
IMGUI_API bool BeginMenuBar(); // append to menu-bar of current window (requires ImGuiWindowFlags_MenuBar flag set on parent window).
IMGUI_API void EndMenuBar(); // only call EndMenuBar() if BeginMenuBar() returns true!
+ IMGUI_API bool BeginMainMenuBar(); // create and append to a full screen menu-bar.
+ IMGUI_API void EndMainMenuBar(); // only call EndMainMenuBar() if BeginMainMenuBar() returns true!
IMGUI_API bool BeginMenu(const char* label, bool enabled = true); // create a sub-menu entry. only call EndMenu() if this returns true!
IMGUI_API void EndMenu(); // only call EndMenu() if BeginMenu() returns true!
IMGUI_API bool MenuItem(const char* label, const char* shortcut = NULL, bool selected = false, bool enabled = true); // return true when activated. shortcuts are displayed for convenience but not processed by ImGui at the moment
IMGUI_API bool MenuItem(const char* label, const char* shortcut, bool* p_selected, bool enabled = true); // return true when activated + toggle (*p_selected) if p_selected != NULL
// Tooltips
+ // - Tooltip are windows following the mouse which do not take focus away.
IMGUI_API void BeginTooltip(); // begin/append a tooltip window. to create full-featured tooltip (with any kind of items).
IMGUI_API void EndTooltip();
- IMGUI_API void SetTooltip(const char* fmt, ...) IM_FMTARGS(1); // set a text-only tooltip, typically use with ImGui::IsItemHovered(). overidde any previous call to SetTooltip().
+ IMGUI_API void SetTooltip(const char* fmt, ...) IM_FMTARGS(1); // set a text-only tooltip, typically use with ImGui::IsItemHovered(). override any previous call to SetTooltip().
IMGUI_API void SetTooltipV(const char* fmt, va_list args) IM_FMTLIST(1);
- // Popups
+ // Popups, Modals
+ // The properties of popups windows are:
+ // - They block normal mouse hovering detection outside them. (*)
+ // - Unless modal, they can be closed by clicking anywhere outside them, or by pressing ESCAPE.
+ // - Their visibility state (~bool) is held internally by imgui instead of being held by the programmer as we are used to with regular Begin() calls.
+ // User can manipulate the visibility state by calling OpenPopup().
+ // - We default to use the right mouse (ImGuiMouseButton_Right=1) for the Popup Context functions.
+ // (*) You can use IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup) to bypass it and detect hovering even when normally blocked by a popup.
+ // Those three properties are connected. The library needs to hold their visibility state because it can close popups at any time.
IMGUI_API void OpenPopup(const char* str_id); // call to mark popup as open (don't call every frame!). popups are closed when user click outside, or if CloseCurrentPopup() is called within a BeginPopup()/EndPopup() block. By default, Selectable()/MenuItem() are calling CloseCurrentPopup(). Popup identifiers are relative to the current ID-stack (so OpenPopup and BeginPopup needs to be at the same level).
IMGUI_API bool BeginPopup(const char* str_id, ImGuiWindowFlags flags = 0); // return true if the popup is open, and you can start outputting to it. only call EndPopup() if BeginPopup() returns true!
- IMGUI_API bool BeginPopupContextItem(const char* str_id = NULL, int mouse_button = 1); // helper to open and begin popup when clicked on last item. if you can pass a NULL str_id only if the previous item had an id. If you want to use that on a non-interactive item such as Text() you need to pass in an explicit ID here. read comments in .cpp!
- IMGUI_API bool BeginPopupContextWindow(const char* str_id = NULL, int mouse_button = 1, bool also_over_items = true); // helper to open and begin popup when clicked on current window.
- IMGUI_API bool BeginPopupContextVoid(const char* str_id = NULL, int mouse_button = 1); // helper to open and begin popup when clicked in void (where there are no imgui windows).
+ IMGUI_API bool BeginPopupContextItem(const char* str_id = NULL, ImGuiMouseButton mouse_button = 1); // helper to open and begin popup when clicked on last item. if you can pass a NULL str_id only if the previous item had an id. If you want to use that on a non-interactive item such as Text() you need to pass in an explicit ID here. read comments in .cpp!
+ IMGUI_API bool BeginPopupContextWindow(const char* str_id = NULL, ImGuiMouseButton mouse_button = 1, bool also_over_items = true); // helper to open and begin popup when clicked on current window.
+ IMGUI_API bool BeginPopupContextVoid(const char* str_id = NULL, ImGuiMouseButton mouse_button = 1); // helper to open and begin popup when clicked in void (where there are no imgui windows).
IMGUI_API bool BeginPopupModal(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0); // modal dialog (regular window with title bar, block interactions behind the modal window, can't close the modal window by clicking outside)
IMGUI_API void EndPopup(); // only call EndPopup() if BeginPopupXXX() returns true!
- IMGUI_API bool OpenPopupOnItemClick(const char* str_id = NULL, int mouse_button = 1); // helper to open popup when clicked on last item (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors). return true when just opened.
- IMGUI_API bool IsPopupOpen(const char* str_id); // return true if the popup is open
+ IMGUI_API bool OpenPopupOnItemClick(const char* str_id = NULL, ImGuiMouseButton mouse_button = 1); // helper to open popup when clicked on last item (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors). return true when just opened.
+ IMGUI_API bool IsPopupOpen(const char* str_id); // return true if the popup is open at the current begin-ed level of the popup stack.
IMGUI_API void CloseCurrentPopup(); // close the popup we have begin-ed into. clicking on a MenuItem or Selectable automatically close the current popup.
// Columns
- // You can also use SameLine(pos_x) for simplified columns. The columns API is work-in-progress and rather lacking (columns are arguably the worst part of dear imgui at the moment!)
+ // - You can also use SameLine(pos_x) to mimic simplified columns.
+ // - The columns API is work-in-progress and rather lacking (columns are arguably the worst part of dear imgui at the moment!)
+ // - There is a maximum of 64 columns.
+ // - Currently working on new 'Tables' api which will replace columns (see GitHub #2957)
IMGUI_API void Columns(int count = 1, const char* id = NULL, bool border = true);
IMGUI_API void NextColumn(); // next column, defaults to current row or next row if the current row is finished
IMGUI_API int GetColumnIndex(); // get current column index
@@ -499,59 +607,71 @@ namespace ImGui
IMGUI_API void SetColumnOffset(int column_index, float offset_x); // set position of column line (in pixels, from the left side of the contents region). pass -1 to use current column
IMGUI_API int GetColumnsCount();
- // Logging/Capture: all text output from interface is captured to tty/file/clipboard. By default, tree nodes are automatically opened during logging.
- IMGUI_API void LogToTTY(int max_depth = -1); // start logging to tty
- IMGUI_API void LogToFile(int max_depth = -1, const char* filename = NULL); // start logging to file
- IMGUI_API void LogToClipboard(int max_depth = -1); // start logging to OS clipboard
+ // Tab Bars, Tabs
+ IMGUI_API bool BeginTabBar(const char* str_id, ImGuiTabBarFlags flags = 0); // create and append into a TabBar
+ IMGUI_API void EndTabBar(); // only call EndTabBar() if BeginTabBar() returns true!
+ IMGUI_API bool BeginTabItem(const char* label, bool* p_open = NULL, ImGuiTabItemFlags flags = 0);// create a Tab. Returns true if the Tab is selected.
+ IMGUI_API void EndTabItem(); // only call EndTabItem() if BeginTabItem() returns true!
+ IMGUI_API void SetTabItemClosed(const char* tab_or_docked_window_label); // notify TabBar or Docking system of a closed tab/window ahead (useful to reduce visual flicker on reorderable tab bars). For tab-bar: call after BeginTabBar() and before Tab submissions. Otherwise call with a window name.
+
+ // Logging/Capture
+ // - All text output from the interface can be captured into tty/file/clipboard. By default, tree nodes are automatically opened during logging.
+ IMGUI_API void LogToTTY(int auto_open_depth = -1); // start logging to tty (stdout)
+ IMGUI_API void LogToFile(int auto_open_depth = -1, const char* filename = NULL); // start logging to file
+ IMGUI_API void LogToClipboard(int auto_open_depth = -1); // start logging to OS clipboard
IMGUI_API void LogFinish(); // stop logging (close file, etc.)
IMGUI_API void LogButtons(); // helper to display buttons for logging to tty/file/clipboard
IMGUI_API void LogText(const char* fmt, ...) IM_FMTARGS(1); // pass text data straight to log (without being displayed)
// Drag and Drop
- // [BETA API] Missing Demo code. API may evolve.
+ // [BETA API] API may evolve!
IMGUI_API bool BeginDragDropSource(ImGuiDragDropFlags flags = 0); // call when the current item is active. If this return true, you can call SetDragDropPayload() + EndDragDropSource()
- IMGUI_API bool SetDragDropPayload(const char* type, const void* data, size_t size, ImGuiCond cond = 0);// type is a user defined string of maximum 32 characters. Strings starting with '_' are reserved for dear imgui internal types. Data is copied and held by imgui.
+ IMGUI_API bool SetDragDropPayload(const char* type, const void* data, size_t sz, ImGuiCond cond = 0); // type is a user defined string of maximum 32 characters. Strings starting with '_' are reserved for dear imgui internal types. Data is copied and held by imgui.
IMGUI_API void EndDragDropSource(); // only call EndDragDropSource() if BeginDragDropSource() returns true!
IMGUI_API bool BeginDragDropTarget(); // call after submitting an item that may receive a payload. If this returns true, you can call AcceptDragDropPayload() + EndDragDropTarget()
IMGUI_API const ImGuiPayload* AcceptDragDropPayload(const char* type, ImGuiDragDropFlags flags = 0); // accept contents of a given type. If ImGuiDragDropFlags_AcceptBeforeDelivery is set you can peek into the payload before the mouse button is released.
IMGUI_API void EndDragDropTarget(); // only call EndDragDropTarget() if BeginDragDropTarget() returns true!
IMGUI_API const ImGuiPayload* GetDragDropPayload(); // peek directly into the current payload from anywhere. may return NULL. use ImGuiPayload::IsDataType() to test for the payload type.
-
+
// Clipping
IMGUI_API void PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect);
IMGUI_API void PopClipRect();
// Focus, Activation
- // (Prefer using "SetItemDefaultFocus()" over "if (IsWindowAppearing()) SetScrollHereY()" when applicable to signify "this is the default item")
+ // - Prefer using "SetItemDefaultFocus()" over "if (IsWindowAppearing()) SetScrollHereY()" when applicable to signify "this is the default item"
IMGUI_API void SetItemDefaultFocus(); // make last item the default focused item of a window.
IMGUI_API void SetKeyboardFocusHere(int offset = 0); // focus keyboard on the next widget. Use positive 'offset' to access sub components of a multiple component widget. Use -1 to access previous widget.
// Item/Widgets Utilities
- // See Demo Window under "Widgets->Querying Status" for an interactive visualization of many of those functions.
+ // - Most of the functions are referring to the last/previous item we submitted.
+ // - See Demo Window under "Widgets->Querying Status" for an interactive visualization of most of those functions.
IMGUI_API bool IsItemHovered(ImGuiHoveredFlags flags = 0); // is the last item hovered? (and usable, aka not blocked by a popup, etc.). See ImGuiHoveredFlags for more options.
IMGUI_API bool IsItemActive(); // is the last item active? (e.g. button being held, text field being edited. This will continuously return true while holding mouse button on an item. Items that don't interact will always return false)
IMGUI_API bool IsItemFocused(); // is the last item focused for keyboard/gamepad navigation?
- IMGUI_API bool IsItemClicked(int mouse_button = 0); // is the last item clicked? (e.g. button/node just clicked on) == IsMouseClicked(mouse_button) && IsItemHovered()
+ IMGUI_API bool IsItemClicked(ImGuiMouseButton mouse_button = 0); // is the last item clicked? (e.g. button/node just clicked on) == IsMouseClicked(mouse_button) && IsItemHovered()
IMGUI_API bool IsItemVisible(); // is the last item visible? (items may be out of sight because of clipping/scrolling)
IMGUI_API bool IsItemEdited(); // did the last item modify its underlying value this frame? or was pressed? This is generally the same as the "bool" return value of many widgets.
+ IMGUI_API bool IsItemActivated(); // was the last item just made active (item was previously inactive).
IMGUI_API bool IsItemDeactivated(); // was the last item just made inactive (item was previously active). Useful for Undo/Redo patterns with widgets that requires continuous editing.
IMGUI_API bool IsItemDeactivatedAfterEdit(); // was the last item just made inactive and made a value change when it was active? (e.g. Slider/Drag moved). Useful for Undo/Redo patterns with widgets that requires continuous editing. Note that you may get false positives (some widgets such as Combo()/ListBox()/Selectable() will return true even when clicking an already selected item).
- IMGUI_API bool IsAnyItemHovered();
- IMGUI_API bool IsAnyItemActive();
- IMGUI_API bool IsAnyItemFocused();
- IMGUI_API ImVec2 GetItemRectMin(); // get bounding rectangle of last item, in screen space
- IMGUI_API ImVec2 GetItemRectMax(); // "
- IMGUI_API ImVec2 GetItemRectSize(); // get size of last item, in screen space
+ IMGUI_API bool IsItemToggledOpen(); // was the last item open state toggled? set by TreeNode().
+ IMGUI_API bool IsAnyItemHovered(); // is any item hovered?
+ IMGUI_API bool IsAnyItemActive(); // is any item active?
+ IMGUI_API bool IsAnyItemFocused(); // is any item focused?
+ IMGUI_API ImVec2 GetItemRectMin(); // get upper-left bounding rectangle of the last item (screen space)
+ IMGUI_API ImVec2 GetItemRectMax(); // get lower-right bounding rectangle of the last item (screen space)
+ IMGUI_API ImVec2 GetItemRectSize(); // get size of last item
IMGUI_API void SetItemAllowOverlap(); // allow last item to be overlapped by a subsequent item. sometimes useful with invisible buttons, selectables, etc. to catch unused area.
// Miscellaneous Utilities
IMGUI_API bool IsRectVisible(const ImVec2& size); // test if rectangle (of given size, starting from cursor position) is visible / not clipped.
IMGUI_API bool IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max); // test if rectangle (in screen space) is visible / not clipped. to perform coarse clipping on user's side.
- IMGUI_API double GetTime();
- IMGUI_API int GetFrameCount();
- IMGUI_API ImDrawList* GetOverlayDrawList(); // this draw list will be the last rendered one, useful to quickly draw overlays shapes/text
- IMGUI_API ImDrawListSharedData* GetDrawListSharedData(); // you may use this when creating your own ImDrawList instances
- IMGUI_API const char* GetStyleColorName(ImGuiCol idx);
+ IMGUI_API double GetTime(); // get global imgui time. incremented by io.DeltaTime every frame.
+ IMGUI_API int GetFrameCount(); // get global imgui frame count. incremented by 1 every frame.
+ IMGUI_API ImDrawList* GetBackgroundDrawList(); // this draw list will be the first rendering one. Useful to quickly draw shapes/text behind dear imgui contents.
+ IMGUI_API ImDrawList* GetForegroundDrawList(); // this draw list will be the last rendered one. Useful to quickly draw shapes/text over dear imgui contents.
+ IMGUI_API ImDrawListSharedData* GetDrawListSharedData(); // you may use this when creating your own ImDrawList instances.
+ IMGUI_API const char* GetStyleColorName(ImGuiCol idx); // get a string corresponding to the enum value (for display, saving, etc.).
IMGUI_API void SetStateStorage(ImGuiStorage* storage); // replace current window storage with our own (if you want to manipulate it yourself, typically clear subsection of it)
IMGUI_API ImGuiStorage* GetStateStorage();
IMGUI_API ImVec2 CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
@@ -565,50 +685,61 @@ namespace ImGui
IMGUI_API void ColorConvertRGBtoHSV(float r, float g, float b, float& out_h, float& out_s, float& out_v);
IMGUI_API void ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& out_g, float& out_b);
- // Inputs Utilities
+ // Inputs Utilities: Keyboard
+ // - For 'int user_key_index' you can use your own indices/enums according to how your backend/engine stored them in io.KeysDown[].
+ // - We don't know the meaning of those value. You can use GetKeyIndex() to map a ImGuiKey_ value into the user index.
IMGUI_API int GetKeyIndex(ImGuiKey imgui_key); // map ImGuiKey_* values into user's key index. == io.KeyMap[key]
- IMGUI_API bool IsKeyDown(int user_key_index); // is key being held. == io.KeysDown[user_key_index]. note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your backend/engine stored them into io.KeysDown[]!
- IMGUI_API bool IsKeyPressed(int user_key_index, bool repeat = true); // was key pressed (went from !Down to Down). if repeat=true, uses io.KeyRepeatDelay / KeyRepeatRate
- IMGUI_API bool IsKeyReleased(int user_key_index); // was key released (went from Down to !Down)..
+ IMGUI_API bool IsKeyDown(int user_key_index); // is key being held. == io.KeysDown[user_key_index].
+ IMGUI_API bool IsKeyPressed(int user_key_index, bool repeat = true); // was key pressed (went from !Down to Down)? if repeat=true, uses io.KeyRepeatDelay / KeyRepeatRate
+ IMGUI_API bool IsKeyReleased(int user_key_index); // was key released (went from Down to !Down)?
IMGUI_API int GetKeyPressedAmount(int key_index, float repeat_delay, float rate); // uses provided repeat rate/delay. return a count, most often 0 or 1 but might be >1 if RepeatRate is small enough that DeltaTime > RepeatRate
- IMGUI_API bool IsMouseDown(int button); // is mouse button held (0=left, 1=right, 2=middle)
- IMGUI_API bool IsAnyMouseDown(); // is any mouse button held
- IMGUI_API bool IsMouseClicked(int button, bool repeat = false); // did mouse button clicked (went from !Down to Down) (0=left, 1=right, 2=middle)
- IMGUI_API bool IsMouseDoubleClicked(int button); // did mouse button double-clicked. a double-click returns false in IsMouseClicked(). uses io.MouseDoubleClickTime.
- IMGUI_API bool IsMouseReleased(int button); // did mouse button released (went from Down to !Down)
- IMGUI_API bool IsMouseDragging(int button = 0, float lock_threshold = -1.0f); // is mouse dragging. if lock_threshold < -1.0f uses io.MouseDraggingThreshold
- IMGUI_API bool IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true); // is mouse hovering given bounding rect (in screen space). clipped by current clipping settings, but disregarding of other consideration of focus/window ordering/popup-block.
- IMGUI_API bool IsMousePosValid(const ImVec2* mouse_pos = NULL); //
+ IMGUI_API void CaptureKeyboardFromApp(bool want_capture_keyboard_value = true); // attention: misleading name! manually override io.WantCaptureKeyboard flag next frame (said flag is entirely left for your application to handle). e.g. force capture keyboard when your widget is being hovered. This is equivalent to setting "io.WantCaptureKeyboard = want_capture_keyboard_value"; after the next NewFrame() call.
+
+ // Inputs Utilities: Mouse
+ // - To refer to a mouse button, you may use named enums in your code e.g. ImGuiMouseButton_Left, ImGuiMouseButton_Right.
+ // - You can also use regular integer: it is forever guaranteed that 0=Left, 1=Right, 2=Middle.
+ // - Dragging operations are only reported after mouse has moved a certain distance away from the initial clicking position (see 'lock_threshold' and 'io.MouseDraggingThreshold')
+ IMGUI_API bool IsMouseDown(ImGuiMouseButton button); // is mouse button held?
+ IMGUI_API bool IsMouseClicked(ImGuiMouseButton button, bool repeat = false); // did mouse button clicked? (went from !Down to Down)
+ IMGUI_API bool IsMouseReleased(ImGuiMouseButton button); // did mouse button released? (went from Down to !Down)
+ IMGUI_API bool IsMouseDoubleClicked(ImGuiMouseButton button); // did mouse button double-clicked? a double-click returns false in IsMouseClicked(). uses io.MouseDoubleClickTime.
+ IMGUI_API bool IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true);// is mouse hovering given bounding rect (in screen space). clipped by current clipping settings, but disregarding of other consideration of focus/window ordering/popup-block.
+ IMGUI_API bool IsMousePosValid(const ImVec2* mouse_pos = NULL); // by convention we use (-FLT_MAX,-FLT_MAX) to denote that there is no mouse available
+ IMGUI_API bool IsAnyMouseDown(); // is any mouse button held?
IMGUI_API ImVec2 GetMousePos(); // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls
- IMGUI_API ImVec2 GetMousePosOnOpeningCurrentPopup(); // retrieve backup of mouse position at the time of opening popup we have BeginPopup() into
- IMGUI_API ImVec2 GetMouseDragDelta(int button = 0, float lock_threshold = -1.0f); // dragging amount since clicking. if lock_threshold < -1.0f uses io.MouseDraggingThreshold
- IMGUI_API void ResetMouseDragDelta(int button = 0); //
+ IMGUI_API ImVec2 GetMousePosOnOpeningCurrentPopup(); // retrieve mouse position at the time of opening popup we have BeginPopup() into (helper to avoid user backing that value themselves)
+ IMGUI_API bool IsMouseDragging(ImGuiMouseButton button, float lock_threshold = -1.0f); // is mouse dragging? (if lock_threshold < -1.0f, uses io.MouseDraggingThreshold)
+ IMGUI_API ImVec2 GetMouseDragDelta(ImGuiMouseButton button = 0, float lock_threshold = -1.0f); // return the delta from the initial clicking position while the mouse button is pressed or was just released. This is locked and return 0.0f until the mouse moves past a distance threshold at least once (if lock_threshold < -1.0f, uses io.MouseDraggingThreshold)
+ IMGUI_API void ResetMouseDragDelta(ImGuiMouseButton button = 0); //
IMGUI_API ImGuiMouseCursor GetMouseCursor(); // get desired cursor type, reset in ImGui::NewFrame(), this is updated during the frame. valid before Render(). If you use software rendering by setting io.MouseDrawCursor ImGui will render those for you
- IMGUI_API void SetMouseCursor(ImGuiMouseCursor type); // set desired cursor type
- IMGUI_API void CaptureKeyboardFromApp(bool capture = true); // manually override io.WantCaptureKeyboard flag next frame (said flag is entirely left for your application to handle). e.g. force capture keyboard when your widget is being hovered.
- IMGUI_API void CaptureMouseFromApp(bool capture = true); // manually override io.WantCaptureMouse flag next frame (said flag is entirely left for your application to handle).
+ IMGUI_API void SetMouseCursor(ImGuiMouseCursor cursor_type); // set desired cursor type
+ IMGUI_API void CaptureMouseFromApp(bool want_capture_mouse_value = true); // attention: misleading name! manually override io.WantCaptureMouse flag next frame (said flag is entirely left for your application to handle). This is equivalent to setting "io.WantCaptureMouse = want_capture_mouse_value;" after the next NewFrame() call.
// Clipboard Utilities (also see the LogToClipboard() function to capture or output text data to the clipboard)
IMGUI_API const char* GetClipboardText();
IMGUI_API void SetClipboardText(const char* text);
// Settings/.Ini Utilities
- // The disk functions are automatically called if io.IniFilename != NULL (default is "imgui.ini").
- // Set io.IniFilename to NULL to load/save manually. Read io.WantSaveIniSettings description about handling .ini saving manually.
+ // - The disk functions are automatically called if io.IniFilename != NULL (default is "imgui.ini").
+ // - Set io.IniFilename to NULL to load/save manually. Read io.WantSaveIniSettings description about handling .ini saving manually.
IMGUI_API void LoadIniSettingsFromDisk(const char* ini_filename); // call after CreateContext() and before the first call to NewFrame(). NewFrame() automatically calls LoadIniSettingsFromDisk(io.IniFilename).
IMGUI_API void LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size=0); // call after CreateContext() and before the first call to NewFrame() to provide .ini data from your own data source.
- IMGUI_API void SaveIniSettingsToDisk(const char* ini_filename);
+ IMGUI_API void SaveIniSettingsToDisk(const char* ini_filename); // this is automatically called (if io.IniFilename is not empty) a few seconds after any modification that should be reflected in the .ini file (and also by DestroyContext).
IMGUI_API const char* SaveIniSettingsToMemory(size_t* out_ini_size = NULL); // return a zero-terminated string with the .ini data which you can save by your own mean. call when io.WantSaveIniSettings is set, then save data by your own mean and clear io.WantSaveIniSettings.
- // Memory Utilities
- // All those functions are not reliant on the current context.
- // If you reload the contents of imgui.cpp at runtime, you may need to call SetCurrentContext() + SetAllocatorFunctions() again.
- IMGUI_API void SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void(*free_func)(void* ptr, void* user_data), void* user_data = NULL);
+ // Memory Allocators
+ // - All those functions are not reliant on the current context.
+ // - If you reload the contents of imgui.cpp at runtime, you may need to call SetCurrentContext() + SetAllocatorFunctions() again because we use global storage for those.
+ IMGUI_API void SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data = NULL);
IMGUI_API void* MemAlloc(size_t size);
IMGUI_API void MemFree(void* ptr);
} // namespace ImGui
+//-----------------------------------------------------------------------------
+// Flags & Enumerations
+//-----------------------------------------------------------------------------
+
// Flags for ImGui::Begin()
enum ImGuiWindowFlags_
{
@@ -616,7 +747,7 @@ enum ImGuiWindowFlags_
ImGuiWindowFlags_NoTitleBar = 1 << 0, // Disable title-bar
ImGuiWindowFlags_NoResize = 1 << 1, // Disable user resizing with the lower-right grip
ImGuiWindowFlags_NoMove = 1 << 2, // Disable user moving the window
- ImGuiWindowFlags_NoScrollbar = 1 << 3, // Disable scrollbars (window can still scroll with mouse or programatically)
+ ImGuiWindowFlags_NoScrollbar = 1 << 3, // Disable scrollbars (window can still scroll with mouse or programmatically)
ImGuiWindowFlags_NoScrollWithMouse = 1 << 4, // Disable user vertically scrolling with mouse wheel. On child window, mouse wheel will be forwarded to the parent unless NoScrollbar is also set.
ImGuiWindowFlags_NoCollapse = 1 << 5, // Disable user collapsing window by double-clicking on it
ImGuiWindowFlags_AlwaysAutoResize = 1 << 6, // Resize every window to its content every frame
@@ -626,12 +757,13 @@ enum ImGuiWindowFlags_
ImGuiWindowFlags_MenuBar = 1 << 10, // Has a menu-bar
ImGuiWindowFlags_HorizontalScrollbar = 1 << 11, // Allow horizontal scrollbar to appear (off by default). You may use SetNextWindowContentSize(ImVec2(width,0.0f)); prior to calling Begin() to specify width. Read code in imgui_demo in the "Horizontal Scrolling" section.
ImGuiWindowFlags_NoFocusOnAppearing = 1 << 12, // Disable taking focus when transitioning from hidden to visible state
- ImGuiWindowFlags_NoBringToFrontOnFocus = 1 << 13, // Disable bringing window to front when taking focus (e.g. clicking on it or programatically giving it focus)
+ ImGuiWindowFlags_NoBringToFrontOnFocus = 1 << 13, // Disable bringing window to front when taking focus (e.g. clicking on it or programmatically giving it focus)
ImGuiWindowFlags_AlwaysVerticalScrollbar= 1 << 14, // Always show vertical scrollbar (even if ContentSize.y < Size.y)
ImGuiWindowFlags_AlwaysHorizontalScrollbar=1<< 15, // Always show horizontal scrollbar (even if ContentSize.x < Size.x)
ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16, // Ensure child windows without border uses style.WindowPadding (ignored by default for non-bordered child windows, because more convenient)
ImGuiWindowFlags_NoNavInputs = 1 << 18, // No gamepad/keyboard navigation within the window
ImGuiWindowFlags_NoNavFocus = 1 << 19, // No focusing toward this window with gamepad/keyboard navigation (e.g. skipped by CTRL+TAB)
+ ImGuiWindowFlags_UnsavedDocument = 1 << 20, // Append '*' to title without affecting the ID, as a convenience to avoid using the ### operator. When used in a tab/docking context, tab is selected on closure and closure is deferred by one frame to allow code to cancel the closure (with a confirmation popup, etc.) without flicker.
ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
@@ -645,8 +777,8 @@ enum ImGuiWindowFlags_
ImGuiWindowFlags_ChildMenu = 1 << 28 // Don't use! For internal use by BeginMenu()
// [Obsolete]
- //ImGuiWindowFlags_ShowBorders = 1 << 7, // --> Set style.FrameBorderSize=1.0f / style.WindowBorderSize=1.0f to enable borders around windows and items
- //ImGuiWindowFlags_ResizeFromAnySide = 1 << 17, // --> Set io.ConfigResizeWindowsFromEdges and make sure mouse cursors are supported by back-end (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors)
+ //ImGuiWindowFlags_ShowBorders = 1 << 7, // --> Set style.FrameBorderSize=1.0f or style.WindowBorderSize=1.0f to enable borders around items or windows.
+ //ImGuiWindowFlags_ResizeFromAnySide = 1 << 17, // --> Set io.ConfigWindowsResizeFromEdges=true and make sure mouse cursors are supported by back-end (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors)
};
// Flags for ImGui::InputText()
@@ -658,7 +790,7 @@ enum ImGuiInputTextFlags_
ImGuiInputTextFlags_CharsUppercase = 1 << 2, // Turn a..z into A..Z
ImGuiInputTextFlags_CharsNoBlank = 1 << 3, // Filter out spaces, tabs
ImGuiInputTextFlags_AutoSelectAll = 1 << 4, // Select entire text when first taking mouse focus
- ImGuiInputTextFlags_EnterReturnsTrue = 1 << 5, // Return 'true' when Enter is pressed (as opposed to when the value was modified)
+ ImGuiInputTextFlags_EnterReturnsTrue = 1 << 5, // Return 'true' when Enter is pressed (as opposed to every time the value was modified). Consider looking at the IsItemDeactivatedAfterEdit() function.
ImGuiInputTextFlags_CallbackCompletion = 1 << 6, // Callback on pressing TAB (for completion handling)
ImGuiInputTextFlags_CallbackHistory = 1 << 7, // Callback on pressing Up/Down arrows (for history handling)
ImGuiInputTextFlags_CallbackAlways = 1 << 8, // Callback on each iteration. User code may query cursor position, modify text buffer.
@@ -673,7 +805,8 @@ enum ImGuiInputTextFlags_
ImGuiInputTextFlags_CharsScientific = 1 << 17, // Allow 0123456789.+-*/eE (Scientific notation input)
ImGuiInputTextFlags_CallbackResize = 1 << 18, // Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow. Notify when the string wants to be resized (for string types which hold a cache of their Size). You will be provided a new BufSize in the callback and NEED to honor it. (see misc/cpp/imgui_stdlib.h for an example of using this)
// [Internal]
- ImGuiInputTextFlags_Multiline = 1 << 20 // For internal use by InputTextMultiline()
+ ImGuiInputTextFlags_Multiline = 1 << 20, // For internal use by InputTextMultiline()
+ ImGuiInputTextFlags_NoMarkEdited = 1 << 21 // For internal use by functions using InputText() before reformatting data
};
// Flags for ImGui::TreeNodeEx(), ImGui::CollapsingHeader*()
@@ -691,15 +824,11 @@ enum ImGuiTreeNodeFlags_
ImGuiTreeNodeFlags_Leaf = 1 << 8, // No collapsing, no arrow (use as a convenience for leaf nodes).
ImGuiTreeNodeFlags_Bullet = 1 << 9, // Display a bullet instead of arrow
ImGuiTreeNodeFlags_FramePadding = 1 << 10, // Use FramePadding (even for an unframed text node) to vertically align text baseline to regular widget height. Equivalent to calling AlignTextToFramePadding().
- //ImGuITreeNodeFlags_SpanAllAvailWidth = 1 << 11, // FIXME: TODO: Extend hit box horizontally even if not framed
- //ImGuiTreeNodeFlags_NoScrollOnOpen = 1 << 12, // FIXME: TODO: Disable automatic scroll on TreePop() if node got just open and contents is not visible
+ ImGuiTreeNodeFlags_SpanAvailWidth = 1 << 11, // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line. In the future we may refactor the hit system to be front-to-back, allowing natural overlaps and then this can become the default.
+ ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12, // Extend hit box to the left-most and right-most edges (bypass the indented area).
ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13, // (WIP) Nav: left direction may move to this TreeNode() from any of its child (items submitted between TreeNode and TreePop)
+ //ImGuiTreeNodeFlags_NoScrollOnOpen = 1 << 14, // FIXME: TODO: Disable automatic scroll on TreePop() if node got just open and contents is not visible
ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
-
- // Obsolete names (will be removed)
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
- , ImGuiTreeNodeFlags_AllowOverlapMode = ImGuiTreeNodeFlags_AllowItemOverlap
-#endif
};
// Flags for ImGui::Selectable()
@@ -709,7 +838,8 @@ enum ImGuiSelectableFlags_
ImGuiSelectableFlags_DontClosePopups = 1 << 0, // Clicking this don't close parent popup window
ImGuiSelectableFlags_SpanAllColumns = 1 << 1, // Selectable frame can span all columns (text will still fit in current column)
ImGuiSelectableFlags_AllowDoubleClick = 1 << 2, // Generate press events on double clicks too
- ImGuiSelectableFlags_Disabled = 1 << 3 // Cannot be selected, display greyed out text
+ ImGuiSelectableFlags_Disabled = 1 << 3, // Cannot be selected, display grayed out text
+ ImGuiSelectableFlags_AllowItemOverlap = 1 << 4 // (WIP) Hit testing to allow subsequent widgets to overlap this one
};
// Flags for ImGui::BeginCombo()
@@ -726,13 +856,39 @@ enum ImGuiComboFlags_
ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest
};
+// Flags for ImGui::BeginTabBar()
+enum ImGuiTabBarFlags_
+{
+ ImGuiTabBarFlags_None = 0,
+ ImGuiTabBarFlags_Reorderable = 1 << 0, // Allow manually dragging tabs to re-order them + New tabs are appended at the end of list
+ ImGuiTabBarFlags_AutoSelectNewTabs = 1 << 1, // Automatically select new tabs when they appear
+ ImGuiTabBarFlags_TabListPopupButton = 1 << 2, // Disable buttons to open the tab list popup
+ ImGuiTabBarFlags_NoCloseWithMiddleMouseButton = 1 << 3, // Disable behavior of closing tabs (that are submitted with p_open != NULL) with middle mouse button. You can still repro this behavior on user's side with if (IsItemHovered() && IsMouseClicked(2)) *p_open = false.
+ ImGuiTabBarFlags_NoTabListScrollingButtons = 1 << 4, // Disable scrolling buttons (apply when fitting policy is ImGuiTabBarFlags_FittingPolicyScroll)
+ ImGuiTabBarFlags_NoTooltip = 1 << 5, // Disable tooltips when hovering a tab
+ ImGuiTabBarFlags_FittingPolicyResizeDown = 1 << 6, // Resize tabs when they don't fit
+ ImGuiTabBarFlags_FittingPolicyScroll = 1 << 7, // Add scroll buttons when tabs don't fit
+ ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
+ ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown
+};
+
+// Flags for ImGui::BeginTabItem()
+enum ImGuiTabItemFlags_
+{
+ ImGuiTabItemFlags_None = 0,
+ ImGuiTabItemFlags_UnsavedDocument = 1 << 0, // Append '*' to title without affecting the ID, as a convenience to avoid using the ### operator. Also: tab is selected on closure and closure is deferred by one frame to allow code to undo it without flicker.
+ ImGuiTabItemFlags_SetSelected = 1 << 1, // Trigger flag to programmatically make the tab selected when calling BeginTabItem()
+ ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2, // Disable behavior of closing tabs (that are submitted with p_open != NULL) with middle mouse button. You can still repro this behavior on user's side with if (IsItemHovered() && IsMouseClicked(2)) *p_open = false.
+ ImGuiTabItemFlags_NoPushId = 1 << 3 // Don't call PushID(tab->ID)/PopID() on BeginTabItem()/EndTabItem()
+};
+
// Flags for ImGui::IsWindowFocused()
enum ImGuiFocusedFlags_
{
ImGuiFocusedFlags_None = 0,
ImGuiFocusedFlags_ChildWindows = 1 << 0, // IsWindowFocused(): Return true if any children of the window is focused
ImGuiFocusedFlags_RootWindow = 1 << 1, // IsWindowFocused(): Test from root window (top most parent of the current hierarchy)
- ImGuiFocusedFlags_AnyWindow = 1 << 2, // IsWindowFocused(): Return true if any window is focused
+ ImGuiFocusedFlags_AnyWindow = 1 << 2, // IsWindowFocused(): Return true if any window is focused. Important: If you are trying to tell how to dispatch your low-level inputs, do NOT use this. Use ImGui::GetIO().WantCaptureMouse instead.
ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows
};
@@ -748,7 +904,7 @@ enum ImGuiHoveredFlags_
ImGuiHoveredFlags_AllowWhenBlockedByPopup = 1 << 3, // Return true even if a popup window is normally blocking access to this item/window
//ImGuiHoveredFlags_AllowWhenBlockedByModal = 1 << 4, // Return true even if a modal popup window is normally blocking access to this item/window. FIXME-TODO: Unavailable yet.
ImGuiHoveredFlags_AllowWhenBlockedByActiveItem = 1 << 5, // Return true even if an active item is blocking access to this item/window. Useful for Drag and Drop patterns.
- ImGuiHoveredFlags_AllowWhenOverlapped = 1 << 6, // Return true even if the position is overlapped by another window
+ ImGuiHoveredFlags_AllowWhenOverlapped = 1 << 6, // Return true even if the position is obstructed or overlapped by another window
ImGuiHoveredFlags_AllowWhenDisabled = 1 << 7, // Return true even if the item is disabled
ImGuiHoveredFlags_RectOnly = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped,
ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows
@@ -763,7 +919,7 @@ enum ImGuiDragDropFlags_
ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1, // By default, when dragging we clear data so that IsItemHovered() will return false, to avoid subsequent user code submitting tooltips. This flag disable this behavior so you can still call IsItemHovered() on the source item.
ImGuiDragDropFlags_SourceNoHoldToOpenOthers = 1 << 2, // Disable the behavior that allows to open tree nodes and collapsing header by holding over them while dragging a source item.
ImGuiDragDropFlags_SourceAllowNullID = 1 << 3, // Allow items such as Text(), Image() that have no unique identifier to be used as drag source, by manufacturing a temporary identifier based on their window-relative position. This is extremely unusual within the dear imgui ecosystem and so we made it explicit.
- ImGuiDragDropFlags_SourceExtern = 1 << 4, // External source (from outside of imgui), won't attempt to read current item/window info. Will always return true. Only one Extern source can be active simultaneously.
+ ImGuiDragDropFlags_SourceExtern = 1 << 4, // External source (from outside of dear imgui), won't attempt to read current item/window info. Will always return true. Only one Extern source can be active simultaneously.
ImGuiDragDropFlags_SourceAutoExpirePayload = 1 << 5, // Automatically expire the payload if the source cease to be submitted (otherwise payloads are persisting while being dragged)
// AcceptDragDropPayload() flags
ImGuiDragDropFlags_AcceptBeforeDelivery = 1 << 10, // AcceptDragDropPayload() will returns true even before the mouse button is released. You can then call IsDelivery() to test if the payload needs to be delivered.
@@ -779,10 +935,14 @@ enum ImGuiDragDropFlags_
// A primary data type
enum ImGuiDataType_
{
+ ImGuiDataType_S8, // signed char / char (with sensible compilers)
+ ImGuiDataType_U8, // unsigned char
+ ImGuiDataType_S16, // short
+ ImGuiDataType_U16, // unsigned short
ImGuiDataType_S32, // int
ImGuiDataType_U32, // unsigned int
- ImGuiDataType_S64, // long long, __int64
- ImGuiDataType_U64, // unsigned long long, unsigned __int64
+ ImGuiDataType_S64, // long long / __int64
+ ImGuiDataType_U64, // unsigned long long / unsigned __int64
ImGuiDataType_Float, // float
ImGuiDataType_Double, // double
ImGuiDataType_COUNT
@@ -817,12 +977,13 @@ enum ImGuiKey_
ImGuiKey_Space,
ImGuiKey_Enter,
ImGuiKey_Escape,
- ImGuiKey_A, // for text edit CTRL+A: select all
- ImGuiKey_C, // for text edit CTRL+C: copy
- ImGuiKey_V, // for text edit CTRL+V: paste
- ImGuiKey_X, // for text edit CTRL+X: cut
- ImGuiKey_Y, // for text edit CTRL+Y: redo
- ImGuiKey_Z, // for text edit CTRL+Z: undo
+ ImGuiKey_KeyPadEnter,
+ ImGuiKey_A, // for text edit CTRL+A: select all
+ ImGuiKey_C, // for text edit CTRL+C: copy
+ ImGuiKey_V, // for text edit CTRL+V: paste
+ ImGuiKey_X, // for text edit CTRL+X: cut
+ ImGuiKey_Y, // for text edit CTRL+Y: redo
+ ImGuiKey_Z, // for text edit CTRL+Z: undo
ImGuiKey_COUNT
};
@@ -864,6 +1025,7 @@ enum ImGuiNavInput_
// Configuration flags stored in io.ConfigFlags. Set by user/application.
enum ImGuiConfigFlags_
{
+ ImGuiConfigFlags_None = 0,
ImGuiConfigFlags_NavEnableKeyboard = 1 << 0, // Master keyboard navigation enable flag. NewFrame() will automatically fill io.NavInputs[] based on io.KeysDown[].
ImGuiConfigFlags_NavEnableGamepad = 1 << 1, // Master gamepad navigation enable flag. This is mostly to instruct your imgui back-end to fill io.NavInputs[]. Back-end also needs to set ImGuiBackendFlags_HasGamepad.
ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2, // Instruct navigation to move the mouse cursor. May be useful on TV/console systems where moving a virtual mouse is awkward. Will update io.MousePos and set io.WantSetMousePos=true. If enabled you MUST honor io.WantSetMousePos requests in your binding, otherwise ImGui will react as if the mouse is jumping around back and forth.
@@ -871,7 +1033,7 @@ enum ImGuiConfigFlags_
ImGuiConfigFlags_NoMouse = 1 << 4, // Instruct imgui to clear mouse position/buttons in NewFrame(). This allows ignoring the mouse information set by the back-end.
ImGuiConfigFlags_NoMouseCursorChange = 1 << 5, // Instruct back-end to not alter mouse cursor shape and visibility. Use if the back-end cursor changes are interfering with yours and you don't want to use SetMouseCursor() to change mouse cursor. You may want to honor requests from imgui by reading GetMouseCursor() yourself instead.
- // User storage (to allow your back-end/engine to communicate to code that may be shared between multiple projects. Those flags are not used by core ImGui)
+ // User storage (to allow your back-end/engine to communicate to code that may be shared between multiple projects. Those flags are not used by core Dear ImGui)
ImGuiConfigFlags_IsSRGB = 1 << 20, // Application is SRGB-aware.
ImGuiConfigFlags_IsTouchScreen = 1 << 21 // Application is using a touch screen instead of a mouse.
};
@@ -879,9 +1041,11 @@ enum ImGuiConfigFlags_
// Back-end capabilities flags stored in io.BackendFlags. Set by imgui_impl_xxx or custom back-end.
enum ImGuiBackendFlags_
{
- ImGuiBackendFlags_HasGamepad = 1 << 0, // Back-end supports gamepad and currently has one connected.
- ImGuiBackendFlags_HasMouseCursors = 1 << 1, // Back-end supports honoring GetMouseCursor() value to change the OS cursor shape.
- ImGuiBackendFlags_HasSetMousePos = 1 << 2 // Back-end supports io.WantSetMousePos requests to reposition the OS mouse position (only used if ImGuiConfigFlags_NavEnableSetMousePos is set).
+ ImGuiBackendFlags_None = 0,
+ ImGuiBackendFlags_HasGamepad = 1 << 0, // Back-end Platform supports gamepad and currently has one connected.
+ ImGuiBackendFlags_HasMouseCursors = 1 << 1, // Back-end Platform supports honoring GetMouseCursor() value to change the OS cursor shape.
+ ImGuiBackendFlags_HasSetMousePos = 1 << 2, // Back-end Platform supports io.WantSetMousePos requests to reposition the OS mouse position (only used if ImGuiConfigFlags_NavEnableSetMousePos is set).
+ ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3 // Back-end Renderer supports ImDrawCmd::VtxOffset. This enables output of large meshes (64K+ vertices) while still using 16-bit indices.
};
// Enumeration for PushStyleColor() / PopStyleColor()
@@ -911,7 +1075,7 @@ enum ImGuiCol_
ImGuiCol_Button,
ImGuiCol_ButtonHovered,
ImGuiCol_ButtonActive,
- ImGuiCol_Header,
+ ImGuiCol_Header, // Header* colors are used for CollapsingHeader, TreeNode, Selectable, MenuItem
ImGuiCol_HeaderHovered,
ImGuiCol_HeaderActive,
ImGuiCol_Separator,
@@ -920,6 +1084,11 @@ enum ImGuiCol_
ImGuiCol_ResizeGrip,
ImGuiCol_ResizeGripHovered,
ImGuiCol_ResizeGripActive,
+ ImGuiCol_Tab,
+ ImGuiCol_TabHovered,
+ ImGuiCol_TabActive,
+ ImGuiCol_TabUnfocused,
+ ImGuiCol_TabUnfocusedActive,
ImGuiCol_PlotLines,
ImGuiCol_PlotLinesHovered,
ImGuiCol_PlotHistogram,
@@ -934,10 +1103,8 @@ enum ImGuiCol_
// Obsolete names (will be removed)
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
- , ImGuiCol_ChildWindowBg = ImGuiCol_ChildBg, ImGuiCol_Column = ImGuiCol_Separator, ImGuiCol_ColumnHovered = ImGuiCol_SeparatorHovered, ImGuiCol_ColumnActive = ImGuiCol_SeparatorActive
- , ImGuiCol_ModalWindowDarkening = ImGuiCol_ModalWindowDimBg
- //ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered, // [unused since 1.60+] the close button now uses regular button colors.
- //ImGuiCol_ComboBg, // [unused since 1.53+] ComboBg has been merged with PopupBg, so a redirect isn't accurate.
+ , ImGuiCol_ModalWindowDarkening = ImGuiCol_ModalWindowDimBg // [renamed in 1.63]
+ //, ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered// [unused since 1.60+] the close button now uses regular button colors.
#endif
};
@@ -946,7 +1113,7 @@ enum ImGuiCol_
// NB: if changing this enum, you need to update the associated internal table GStyleVarInfo[] accordingly. This is where we link enum values to members offset/type.
enum ImGuiStyleVar_
{
- // Enum name ......................// Member in ImGuiStyle structure (see ImGuiStyle for descriptions)
+ // Enum name --------------------- // Member in ImGuiStyle structure (see ImGuiStyle for descriptions)
ImGuiStyleVar_Alpha, // float Alpha
ImGuiStyleVar_WindowPadding, // ImVec2 WindowPadding
ImGuiStyleVar_WindowRounding, // float WindowRounding
@@ -967,20 +1134,22 @@ enum ImGuiStyleVar_
ImGuiStyleVar_ScrollbarRounding, // float ScrollbarRounding
ImGuiStyleVar_GrabMinSize, // float GrabMinSize
ImGuiStyleVar_GrabRounding, // float GrabRounding
+ ImGuiStyleVar_TabRounding, // float TabRounding
ImGuiStyleVar_ButtonTextAlign, // ImVec2 ButtonTextAlign
+ ImGuiStyleVar_SelectableTextAlign, // ImVec2 SelectableTextAlign
ImGuiStyleVar_COUNT
// Obsolete names (will be removed)
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
- , ImGuiStyleVar_Count_ = ImGuiStyleVar_COUNT, ImGuiStyleVar_ChildWindowRounding = ImGuiStyleVar_ChildRounding
+ , ImGuiStyleVar_Count_ = ImGuiStyleVar_COUNT // [renamed in 1.60]
#endif
};
-// Enumeration for ColorEdit3() / ColorEdit4() / ColorPicker3() / ColorPicker4() / ColorButton()
+// Flags for ColorEdit3() / ColorEdit4() / ColorPicker3() / ColorPicker4() / ColorButton()
enum ImGuiColorEditFlags_
{
ImGuiColorEditFlags_None = 0,
- ImGuiColorEditFlags_NoAlpha = 1 << 1, // // ColorEdit, ColorPicker, ColorButton: ignore Alpha component (read 3 components from the input pointer).
+ ImGuiColorEditFlags_NoAlpha = 1 << 1, // // ColorEdit, ColorPicker, ColorButton: ignore Alpha component (will only read 3 components from the input pointer).
ImGuiColorEditFlags_NoPicker = 1 << 2, // // ColorEdit: disable picker when clicking on colored square.
ImGuiColorEditFlags_NoOptions = 1 << 3, // // ColorEdit: disable toggling options menu when right-clicking on inputs/small preview.
ImGuiColorEditFlags_NoSmallPreview = 1 << 4, // // ColorEdit, ColorPicker: disable colored square preview next to the inputs. (e.g. to show only the inputs)
@@ -990,24 +1159,45 @@ enum ImGuiColorEditFlags_
ImGuiColorEditFlags_NoSidePreview = 1 << 8, // // ColorPicker: disable bigger color preview on right side of the picker, use small colored square preview instead.
ImGuiColorEditFlags_NoDragDrop = 1 << 9, // // ColorEdit: disable drag and drop target. ColorButton: disable drag and drop source.
- // User Options (right-click on widget to change some of them). You can set application defaults using SetColorEditOptions(). The idea is that you probably don't want to override them in most of your calls, let the user choose and/or call SetColorEditOptions() during startup.
+ // User Options (right-click on widget to change some of them).
ImGuiColorEditFlags_AlphaBar = 1 << 16, // // ColorEdit, ColorPicker: show vertical alpha bar/gradient in picker.
ImGuiColorEditFlags_AlphaPreview = 1 << 17, // // ColorEdit, ColorPicker, ColorButton: display preview as a transparent color over a checkerboard, instead of opaque.
ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18, // // ColorEdit, ColorPicker, ColorButton: display half opaque / half checkerboard, instead of opaque.
ImGuiColorEditFlags_HDR = 1 << 19, // // (WIP) ColorEdit: Currently only disable 0.0f..1.0f limits in RGBA edition (note: you probably want to use ImGuiColorEditFlags_Float flag as well).
- ImGuiColorEditFlags_RGB = 1 << 20, // [Inputs] // ColorEdit: choose one among RGB/HSV/HEX. ColorPicker: choose any combination using RGB/HSV/HEX.
- ImGuiColorEditFlags_HSV = 1 << 21, // [Inputs] // "
- ImGuiColorEditFlags_HEX = 1 << 22, // [Inputs] // "
+ ImGuiColorEditFlags_DisplayRGB = 1 << 20, // [Display] // ColorEdit: override _display_ type among RGB/HSV/Hex. ColorPicker: select any combination using one or more of RGB/HSV/Hex.
+ ImGuiColorEditFlags_DisplayHSV = 1 << 21, // [Display] // "
+ ImGuiColorEditFlags_DisplayHex = 1 << 22, // [Display] // "
ImGuiColorEditFlags_Uint8 = 1 << 23, // [DataType] // ColorEdit, ColorPicker, ColorButton: _display_ values formatted as 0..255.
ImGuiColorEditFlags_Float = 1 << 24, // [DataType] // ColorEdit, ColorPicker, ColorButton: _display_ values formatted as 0.0f..1.0f floats instead of 0..255 integers. No round-trip of value via integers.
- ImGuiColorEditFlags_PickerHueBar = 1 << 25, // [PickerMode] // ColorPicker: bar for Hue, rectangle for Sat/Value.
- ImGuiColorEditFlags_PickerHueWheel = 1 << 26, // [PickerMode] // ColorPicker: wheel for Hue, triangle for Sat/Value.
+ ImGuiColorEditFlags_PickerHueBar = 1 << 25, // [Picker] // ColorPicker: bar for Hue, rectangle for Sat/Value.
+ ImGuiColorEditFlags_PickerHueWheel = 1 << 26, // [Picker] // ColorPicker: wheel for Hue, triangle for Sat/Value.
+ ImGuiColorEditFlags_InputRGB = 1 << 27, // [Input] // ColorEdit, ColorPicker: input and output data in RGB format.
+ ImGuiColorEditFlags_InputHSV = 1 << 28, // [Input] // ColorEdit, ColorPicker: input and output data in HSV format.
+
+ // Defaults Options. You can set application defaults using SetColorEditOptions(). The intent is that you probably don't want to
+ // override them in most of your calls. Let the user choose via the option menu and/or call SetColorEditOptions() once during startup.
+ ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar,
// [Internal] Masks
- ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX,
+ ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex,
ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float,
ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
- ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar // Change application default using SetColorEditOptions()
+ ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
+
+ // Obsolete names (will be removed)
+#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+ , ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex // [renamed in 1.69]
+#endif
+};
+
+// Identify a mouse button.
+// Those values are guaranteed to be stable and we frequently use 0/1 directly. Named enums provided for convenience.
+enum ImGuiMouseButton_
+{
+ ImGuiMouseButton_Left = 0,
+ ImGuiMouseButton_Right = 1,
+ ImGuiMouseButton_Middle = 2,
+ ImGuiMouseButton_COUNT = 5
};
// Enumeration for GetMouseCursor()
@@ -1017,21 +1207,23 @@ enum ImGuiMouseCursor_
ImGuiMouseCursor_None = -1,
ImGuiMouseCursor_Arrow = 0,
ImGuiMouseCursor_TextInput, // When hovering over InputText, etc.
- ImGuiMouseCursor_ResizeAll, // (Unused by imgui functions)
+ ImGuiMouseCursor_ResizeAll, // (Unused by Dear ImGui functions)
ImGuiMouseCursor_ResizeNS, // When hovering over an horizontal border
ImGuiMouseCursor_ResizeEW, // When hovering over a vertical border or a column
ImGuiMouseCursor_ResizeNESW, // When hovering over the bottom-left corner of a window
ImGuiMouseCursor_ResizeNWSE, // When hovering over the bottom-right corner of a window
- ImGuiMouseCursor_Hand, // (Unused by imgui functions. Use for e.g. hyperlinks)
+ ImGuiMouseCursor_Hand, // (Unused by Dear ImGui functions. Use for e.g. hyperlinks)
+ ImGuiMouseCursor_NotAllowed, // When hovering something with disallowed interaction. Usually a crossed circle.
ImGuiMouseCursor_COUNT
// Obsolete names (will be removed)
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
- , ImGuiMouseCursor_Count_ = ImGuiMouseCursor_COUNT
+ , ImGuiMouseCursor_Count_ = ImGuiMouseCursor_COUNT // [renamed in 1.60]
#endif
};
-// Condition for ImGui::SetWindow***(), SetNextWindow***(), SetNextTreeNode***() functions
+// Enumeration for ImGui::SetWindow***(), SetNextWindow***(), SetNextItem***() functions
+// Represent a condition.
// Important: Treat as a regular enum! Do NOT combine multiple values using binary operators! All the functions above treat 0 as a shortcut to ImGuiCond_Always.
enum ImGuiCond_
{
@@ -1039,23 +1231,109 @@ enum ImGuiCond_
ImGuiCond_Once = 1 << 1, // Set the variable once per runtime session (only the first call with succeed)
ImGuiCond_FirstUseEver = 1 << 2, // Set the variable if the object/window has no persistently saved data (no entry in .ini file)
ImGuiCond_Appearing = 1 << 3 // Set the variable if the object/window is appearing after being hidden/inactive (or the first time)
-
- // Obsolete names (will be removed)
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
- , ImGuiSetCond_Always = ImGuiCond_Always, ImGuiSetCond_Once = ImGuiCond_Once, ImGuiSetCond_FirstUseEver = ImGuiCond_FirstUseEver, ImGuiSetCond_Appearing = ImGuiCond_Appearing
-#endif
};
+//-----------------------------------------------------------------------------
+// Helpers: Memory allocations macros
+// IM_MALLOC(), IM_FREE(), IM_NEW(), IM_PLACEMENT_NEW(), IM_DELETE()
+// We call C++ constructor on own allocated memory via the placement "new(ptr) Type()" syntax.
+// Defining a custom placement new() with a dummy parameter allows us to bypass including which on some platforms complains when user has disabled exceptions.
+//-----------------------------------------------------------------------------
+
+struct ImNewDummy {};
+inline void* operator new(size_t, ImNewDummy, void* ptr) { return ptr; }
+inline void operator delete(void*, ImNewDummy, void*) {} // This is only required so we can use the symmetrical new()
+#define IM_ALLOC(_SIZE) ImGui::MemAlloc(_SIZE)
+#define IM_FREE(_PTR) ImGui::MemFree(_PTR)
+#define IM_PLACEMENT_NEW(_PTR) new(ImNewDummy(), _PTR)
+#define IM_NEW(_TYPE) new(ImNewDummy(), ImGui::MemAlloc(sizeof(_TYPE))) _TYPE
+template void IM_DELETE(T* p) { if (p) { p->~T(); ImGui::MemFree(p); } }
+
+//-----------------------------------------------------------------------------
+// Helper: ImVector<>
+// Lightweight std::vector<>-like class to avoid dragging dependencies (also, some implementations of STL with debug enabled are absurdly slow, we bypass it so our code runs fast in debug).
+//-----------------------------------------------------------------------------
+// - You generally do NOT need to care or use this ever. But we need to make it available in imgui.h because some of our public structures are relying on it.
+// - We use std-like naming convention here, which is a little unusual for this codebase.
+// - Important: clear() frees memory, resize(0) keep the allocated buffer. We use resize(0) a lot to intentionally recycle allocated buffers across frames and amortize our costs.
+// - Important: our implementation does NOT call C++ constructors/destructors, we treat everything as raw data! This is intentional but be extra mindful of that,
+// Do NOT use this class as a std::vector replacement in your own code! Many of the structures used by dear imgui can be safely initialized by a zero-memset.
+//-----------------------------------------------------------------------------
+
+template
+struct ImVector
+{
+ int Size;
+ int Capacity;
+ T* Data;
+
+ // Provide standard typedefs but we don't use them ourselves.
+ typedef T value_type;
+ typedef value_type* iterator;
+ typedef const value_type* const_iterator;
+
+ // Constructors, destructor
+ inline ImVector() { Size = Capacity = 0; Data = NULL; }
+ inline ImVector(const ImVector& src) { Size = Capacity = 0; Data = NULL; operator=(src); }
+ inline ImVector& operator=(const ImVector& src) { clear(); resize(src.Size); memcpy(Data, src.Data, (size_t)Size * sizeof(T)); return *this; }
+ inline ~ImVector() { if (Data) IM_FREE(Data); }
+
+ inline bool empty() const { return Size == 0; }
+ inline int size() const { return Size; }
+ inline int size_in_bytes() const { return Size * (int)sizeof(T); }
+ inline int capacity() const { return Capacity; }
+ inline T& operator[](int i) { IM_ASSERT(i < Size); return Data[i]; }
+ inline const T& operator[](int i) const { IM_ASSERT(i < Size); return Data[i]; }
+
+ inline void clear() { if (Data) { Size = Capacity = 0; IM_FREE(Data); Data = NULL; } }
+ inline T* begin() { return Data; }
+ inline const T* begin() const { return Data; }
+ inline T* end() { return Data + Size; }
+ inline const T* end() const { return Data + Size; }
+ inline T& front() { IM_ASSERT(Size > 0); return Data[0]; }
+ inline const T& front() const { IM_ASSERT(Size > 0); return Data[0]; }
+ inline T& back() { IM_ASSERT(Size > 0); return Data[Size - 1]; }
+ inline const T& back() const { IM_ASSERT(Size > 0); return Data[Size - 1]; }
+ inline void swap(ImVector& rhs) { int rhs_size = rhs.Size; rhs.Size = Size; Size = rhs_size; int rhs_cap = rhs.Capacity; rhs.Capacity = Capacity; Capacity = rhs_cap; T* rhs_data = rhs.Data; rhs.Data = Data; Data = rhs_data; }
+
+ inline int _grow_capacity(int sz) const { int new_capacity = Capacity ? (Capacity + Capacity/2) : 8; return new_capacity > sz ? new_capacity : sz; }
+ inline void resize(int new_size) { if (new_size > Capacity) reserve(_grow_capacity(new_size)); Size = new_size; }
+ inline void resize(int new_size, const T& v) { if (new_size > Capacity) reserve(_grow_capacity(new_size)); if (new_size > Size) for (int n = Size; n < new_size; n++) memcpy(&Data[n], &v, sizeof(v)); Size = new_size; }
+ inline void shrink(int new_size) { IM_ASSERT(new_size <= Size); Size = new_size; } // Resize a vector to a smaller size, guaranteed not to cause a reallocation
+ inline void reserve(int new_capacity) { if (new_capacity <= Capacity) return; T* new_data = (T*)IM_ALLOC((size_t)new_capacity * sizeof(T)); if (Data) { memcpy(new_data, Data, (size_t)Size * sizeof(T)); IM_FREE(Data); } Data = new_data; Capacity = new_capacity; }
+
+ // NB: It is illegal to call push_back/push_front/insert with a reference pointing inside the ImVector data itself! e.g. v.push_back(v[10]) is forbidden.
+ inline void push_back(const T& v) { if (Size == Capacity) reserve(_grow_capacity(Size + 1)); memcpy(&Data[Size], &v, sizeof(v)); Size++; }
+ inline void pop_back() { IM_ASSERT(Size > 0); Size--; }
+ inline void push_front(const T& v) { if (Size == 0) push_back(v); else insert(Data, v); }
+ inline T* erase(const T* it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + 1, ((size_t)Size - (size_t)off - 1) * sizeof(T)); Size--; return Data + off; }
+ inline T* erase(const T* it, const T* it_last){ IM_ASSERT(it >= Data && it < Data+Size && it_last > it && it_last <= Data+Size); const ptrdiff_t count = it_last - it; const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + count, ((size_t)Size - (size_t)off - count) * sizeof(T)); Size -= (int)count; return Data + off; }
+ inline T* erase_unsorted(const T* it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; if (it < Data+Size-1) memcpy(Data + off, Data + Size - 1, sizeof(T)); Size--; return Data + off; }
+ inline T* insert(const T* it, const T& v) { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; if (Size == Capacity) reserve(_grow_capacity(Size + 1)); if (off < (int)Size) memmove(Data + off + 1, Data + off, ((size_t)Size - (size_t)off) * sizeof(T)); memcpy(&Data[off], &v, sizeof(v)); Size++; return Data + off; }
+ inline bool contains(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data++ == v) return true; return false; }
+ inline T* find(const T& v) { T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; }
+ inline const T* find(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; }
+ inline bool find_erase(const T& v) { const T* it = find(v); if (it < Data + Size) { erase(it); return true; } return false; }
+ inline bool find_erase_unsorted(const T& v) { const T* it = find(v); if (it < Data + Size) { erase_unsorted(it); return true; } return false; }
+ inline int index_from_ptr(const T* it) const { IM_ASSERT(it >= Data && it < Data + Size); const ptrdiff_t off = it - Data; return (int)off; }
+};
+
+//-----------------------------------------------------------------------------
+// ImGuiStyle
// You may modify the ImGui::GetStyle() main instance during initialization and before NewFrame().
-// During the frame, use ImGui::PushStyleVar(ImGuiStyleVar_XXXX)/PopStyleVar() to alter the main style values, and ImGui::PushStyleColor(ImGuiCol_XXX)/PopStyleColor() for colors.
+// During the frame, use ImGui::PushStyleVar(ImGuiStyleVar_XXXX)/PopStyleVar() to alter the main style values,
+// and ImGui::PushStyleColor(ImGuiCol_XXX)/PopStyleColor() for colors.
+//-----------------------------------------------------------------------------
+
struct ImGuiStyle
{
- float Alpha; // Global alpha applies to everything in ImGui.
+ float Alpha; // Global alpha applies to everything in Dear ImGui.
ImVec2 WindowPadding; // Padding within a window.
float WindowRounding; // Radius of window corners rounding. Set to 0.0f to have rectangular windows.
float WindowBorderSize; // Thickness of border around windows. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly).
ImVec2 WindowMinSize; // Minimum window size. This is a global setting. If you want to constraint individual windows, use SetNextWindowSizeConstraints().
ImVec2 WindowTitleAlign; // Alignment for title bar text. Defaults to (0.0f,0.5f) for left-aligned,vertically centered.
+ ImGuiDir WindowMenuButtonPosition; // Side of the collapsing/docking button in the title bar (None/Left/Right). Defaults to ImGuiDir_Left.
float ChildRounding; // Radius of child window corners rounding. Set to 0.0f to have rectangular windows.
float ChildBorderSize; // Thickness of border around child windows. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly).
float PopupRounding; // Radius of popup window corners rounding. (Note that tooltip windows use WindowRounding)
@@ -1067,82 +1345,99 @@ struct ImGuiStyle
ImVec2 ItemInnerSpacing; // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label).
ImVec2 TouchExtraPadding; // Expand reactive bounding box for touch-based system where touch position is not accurate enough. Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget. So don't grow this too much!
float IndentSpacing; // Horizontal indentation when e.g. entering a tree node. Generally == (FontSize + FramePadding.x*2).
- float ColumnsMinSpacing; // Minimum horizontal spacing between two columns.
+ float ColumnsMinSpacing; // Minimum horizontal spacing between two columns. Preferably > (FramePadding.x + 1).
float ScrollbarSize; // Width of the vertical scrollbar, Height of the horizontal scrollbar.
float ScrollbarRounding; // Radius of grab corners for scrollbar.
float GrabMinSize; // Minimum width/height of a grab box for slider/scrollbar.
float GrabRounding; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
- ImVec2 ButtonTextAlign; // Alignment of button text when button is larger than text. Defaults to (0.5f,0.5f) for horizontally+vertically centered.
+ float TabRounding; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
+ float TabBorderSize; // Thickness of border around tabs.
+ ImGuiDir ColorButtonPosition; // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right.
+ ImVec2 ButtonTextAlign; // Alignment of button text when button is larger than text. Defaults to (0.5f, 0.5f) (centered).
+ ImVec2 SelectableTextAlign; // Alignment of selectable text when selectable is larger than text. Defaults to (0.0f, 0.0f) (top-left aligned).
ImVec2 DisplayWindowPadding; // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows.
ImVec2 DisplaySafeAreaPadding; // If you cannot see the edges of your screen (e.g. on a TV) increase the safe area padding. Apply to popups/tooltips as well regular windows. NB: Prefer configuring your TV sets correctly!
float MouseCursorScale; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). May be removed later.
bool AntiAliasedLines; // Enable anti-aliasing on lines/borders. Disable if you are really tight on CPU/GPU.
bool AntiAliasedFill; // Enable anti-aliasing on filled shapes (rounded rectangles, circles, etc.)
float CurveTessellationTol; // Tessellation tolerance when using PathBezierCurveTo() without a specific number of segments. Decrease for highly tessellated curves (higher quality, more polygons), increase to reduce quality.
+ float CircleSegmentMaxError; // Maximum error (in pixels) allowed when using AddCircle()/AddCircleFilled() or drawing rounded corner rectangles with no explicit segment count specified. Decrease for higher quality but more geometry.
ImVec4 Colors[ImGuiCol_COUNT];
IMGUI_API ImGuiStyle();
IMGUI_API void ScaleAllSizes(float scale_factor);
};
-// This is where your app communicate with Dear ImGui. Access via ImGui::GetIO().
-// Read 'Programmer guide' section in .cpp file for general usage.
+//-----------------------------------------------------------------------------
+// ImGuiIO
+// Communicate most settings and inputs/outputs to Dear ImGui using this structure.
+// Access via ImGui::GetIO(). Read 'Programmer guide' section in .cpp file for general usage.
+//-----------------------------------------------------------------------------
+
struct ImGuiIO
{
//------------------------------------------------------------------
- // Configuration (fill once) // Default value:
+ // Configuration (fill once) // Default value
//------------------------------------------------------------------
- ImGuiConfigFlags ConfigFlags; // = 0 // See ImGuiConfigFlags_ enum. Set by user/application. Gamepad/keyboard navigation options, etc.
- ImGuiBackendFlags BackendFlags; // = 0 // Set ImGuiBackendFlags_ enum. Set by imgui_impl_xxx files or custom back-end to communicate features supported by the back-end.
- ImVec2 DisplaySize; // // Main display size, in pixels. For clamping windows positions.
- float DeltaTime; // = 1.0f/60.0f // Time elapsed since last frame, in seconds.
- float IniSavingRate; // = 5.0f // Minimum time between saving positions/sizes to .ini file, in seconds.
- const char* IniFilename; // = "imgui.ini" // Path to .ini file. Set NULL to disable automatic .ini loading/saving, if e.g. you want to manually load/save from memory.
- const char* LogFilename; // = "imgui_log.txt" // Path to .log file (default parameter to ImGui::LogToFile when no file is specified).
- float MouseDoubleClickTime; // = 0.30f // Time for a double-click, in seconds.
- float MouseDoubleClickMaxDist; // = 6.0f // Distance threshold to stay in to validate a double-click, in pixels.
- float MouseDragThreshold; // = 6.0f // Distance threshold before considering we are dragging.
- int KeyMap[ImGuiKey_COUNT]; // // Map of indices into the KeysDown[512] entries array which represent your "native" keyboard state.
- float KeyRepeatDelay; // = 0.250f // When holding a key/button, time before it starts repeating, in seconds (for buttons in Repeat mode, etc.).
- float KeyRepeatRate; // = 0.050f // When holding a key/button, rate at which it repeats, in seconds.
- void* UserData; // = NULL // Store your own data for retrieval by callbacks.
+ ImGuiConfigFlags ConfigFlags; // = 0 // See ImGuiConfigFlags_ enum. Set by user/application. Gamepad/keyboard navigation options, etc.
+ ImGuiBackendFlags BackendFlags; // = 0 // See ImGuiBackendFlags_ enum. Set by back-end (imgui_impl_xxx files or custom back-end) to communicate features supported by the back-end.
+ ImVec2 DisplaySize; // // Main display size, in pixels.
+ float DeltaTime; // = 1.0f/60.0f // Time elapsed since last frame, in seconds.
+ float IniSavingRate; // = 5.0f // Minimum time between saving positions/sizes to .ini file, in seconds.
+ const char* IniFilename; // = "imgui.ini" // Path to .ini file. Set NULL to disable automatic .ini loading/saving, if e.g. you want to manually load/save from memory.
+ const char* LogFilename; // = "imgui_log.txt"// Path to .log file (default parameter to ImGui::LogToFile when no file is specified).
+ float MouseDoubleClickTime; // = 0.30f // Time for a double-click, in seconds.
+ float MouseDoubleClickMaxDist; // = 6.0f // Distance threshold to stay in to validate a double-click, in pixels.
+ float MouseDragThreshold; // = 6.0f // Distance threshold before considering we are dragging.
+ int KeyMap[ImGuiKey_COUNT]; // // Map of indices into the KeysDown[512] entries array which represent your "native" keyboard state.
+ float KeyRepeatDelay; // = 0.250f // When holding a key/button, time before it starts repeating, in seconds (for buttons in Repeat mode, etc.).
+ float KeyRepeatRate; // = 0.050f // When holding a key/button, rate at which it repeats, in seconds.
+ void* UserData; // = NULL // Store your own data for retrieval by callbacks.
- ImFontAtlas* Fonts; // // Load and assemble one or more fonts into a single tightly packed texture. Output to Fonts array.
- float FontGlobalScale; // = 1.0f // Global scale all fonts
- bool FontAllowUserScaling; // = false // Allow user scaling text of individual window with CTRL+Wheel.
- ImFont* FontDefault; // = NULL // Font to use on NewFrame(). Use NULL to uses Fonts->Fonts[0].
- ImVec2 DisplayFramebufferScale; // = (1.0f,1.0f) // For retina display or other situations where window coordinates are different from framebuffer coordinates. User storage only, presently not used by ImGui.
- ImVec2 DisplayVisibleMin; // (0.0f,0.0f) // [obsolete] If you use DisplaySize as a virtual space larger than your screen, set DisplayVisibleMin/Max to the visible area.
- ImVec2 DisplayVisibleMax; // (0.0f,0.0f) // [obsolete: just use io.DisplaySize] If the values are the same, we defaults to Min=(0.0f) and Max=DisplaySize
+ ImFontAtlas*Fonts; // // Font atlas: load, rasterize and pack one or more fonts into a single texture.
+ float FontGlobalScale; // = 1.0f // Global scale all fonts
+ bool FontAllowUserScaling; // = false // Allow user scaling text of individual window with CTRL+Wheel.
+ ImFont* FontDefault; // = NULL // Font to use on NewFrame(). Use NULL to uses Fonts->Fonts[0].
+ ImVec2 DisplayFramebufferScale; // = (1, 1) // For retina display or other situations where window coordinates are different from framebuffer coordinates. This generally ends up in ImDrawData::FramebufferScale.
- // Miscellaneous configuration options
- bool MouseDrawCursor; // = false // Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor). Cannot be easily renamed to 'io.ConfigXXX' because this is frequently used by back-end implementations.
- bool ConfigMacOSXBehaviors; // = defined(__APPLE__) // OS X style: Text editing cursor movement using Alt instead of Ctrl, Shortcuts using Cmd/Super instead of Ctrl, Line/Text Start and End using Cmd+Arrows instead of Home/End, Double click selects by word instead of selecting whole text, Multi-selection in lists uses Cmd/Super instead of Ctrl (was called io.OptMacOSXBehaviors prior to 1.63)
- bool ConfigInputTextCursorBlink; // = true // Set to false to disable blinking cursor, for users who consider it distracting. (was called: io.OptCursorBlink prior to 1.63)
- bool ConfigResizeWindowsFromEdges; // = false // [BETA] Enable resizing of windows from their edges and from the lower-left corner. This requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback. (This used to be the ImGuiWindowFlags_ResizeFromAnySide flag)
+ // Miscellaneous options
+ bool MouseDrawCursor; // = false // Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor). Cannot be easily renamed to 'io.ConfigXXX' because this is frequently used by back-end implementations.
+ bool ConfigMacOSXBehaviors; // = defined(__APPLE__) // OS X style: Text editing cursor movement using Alt instead of Ctrl, Shortcuts using Cmd/Super instead of Ctrl, Line/Text Start and End using Cmd+Arrows instead of Home/End, Double click selects by word instead of selecting whole text, Multi-selection in lists uses Cmd/Super instead of Ctrl (was called io.OptMacOSXBehaviors prior to 1.63)
+ bool ConfigInputTextCursorBlink; // = true // Set to false to disable blinking cursor, for users who consider it distracting. (was called: io.OptCursorBlink prior to 1.63)
+ bool ConfigWindowsResizeFromEdges; // = true // Enable resizing of windows from their edges and from the lower-left corner. This requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback. (This used to be a per-window ImGuiWindowFlags_ResizeFromAnySide flag)
+ bool ConfigWindowsMoveFromTitleBarOnly; // = false // [BETA] Set to true to only allow moving windows when clicked+dragged from the title bar. Windows without a title bar are not affected.
+ float ConfigWindowsMemoryCompactTimer;// = 60.0f // [BETA] Compact window memory usage when unused. Set to -1.0f to disable.
//------------------------------------------------------------------
- // Settings (User Functions)
+ // Platform Functions
+ // (the imgui_impl_xxxx back-end files are setting those up for you)
//------------------------------------------------------------------
- // Optional: access OS clipboard
+ // Optional: Platform/Renderer back-end name (informational only! will be displayed in About Window) + User data for back-end/wrappers to store their own stuff.
+ const char* BackendPlatformName; // = NULL
+ const char* BackendRendererName; // = NULL
+ void* BackendPlatformUserData; // = NULL // User data for platform back-end
+ void* BackendRendererUserData; // = NULL // User data for renderer back-end
+ void* BackendLanguageUserData; // = NULL // User data for non C++ programming language back-end
+
+ // Optional: Access OS clipboard
// (default to use native Win32 clipboard on Windows, otherwise uses a private clipboard. Override to access OS clipboard on other architectures)
const char* (*GetClipboardTextFn)(void* user_data);
void (*SetClipboardTextFn)(void* user_data, const char* text);
void* ClipboardUserData;
- // Optional: notify OS Input Method Editor of the screen position of your cursor for text input position (e.g. when using Japanese/Chinese IME in Windows)
+ // Optional: Notify OS Input Method Editor of the screen position of your cursor for text input position (e.g. when using Japanese/Chinese IME on Windows)
// (default to use native imm32 api on Windows)
void (*ImeSetInputScreenPosFn)(int x, int y);
- void* ImeWindowHandle; // (Windows) Set this to your HWND to get automatic IME cursor positioning.
+ void* ImeWindowHandle; // = NULL // (Windows) Set this to your HWND to get automatic IME cursor positioning.
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
// [OBSOLETE since 1.60+] Rendering function, will be automatically called in Render(). Please call your rendering function yourself now!
// You can obtain the ImDrawData* by calling ImGui::GetDrawData() after Render(). See example applications if you are unsure of how to implement this.
void (*RenderDrawListsFn)(ImDrawData* data);
#else
- // This is only here to keep ImGuiIO the same size, so that IMGUI_DISABLE_OBSOLETE_FUNCTIONS can exceptionally be used outside of imconfig.h.
+ // This is only here to keep ImGuiIO the same size/layout, so that IMGUI_DISABLE_OBSOLETE_FUNCTIONS can exceptionally be used outside of imconfig.h.
void* RenderDrawListsFnUnused;
#endif
@@ -1159,174 +1454,166 @@ struct ImGuiIO
bool KeyAlt; // Keyboard modifier pressed: Alt
bool KeySuper; // Keyboard modifier pressed: Cmd/Super/Windows
bool KeysDown[512]; // Keyboard keys that are pressed (ideally left in the "native" order your engine has access to keyboard keys, so you can use your own defines/enums for keys).
- ImWchar InputCharacters[16+1]; // List of characters input (translated by user from keypress+keyboard state). Fill using AddInputCharacter() helper.
- float NavInputs[ImGuiNavInput_COUNT]; // Gamepad inputs (keyboard keys will be auto-mapped and be written here by ImGui::NewFrame, all values will be cleared back to zero in ImGui::EndFrame)
+ float NavInputs[ImGuiNavInput_COUNT]; // Gamepad inputs. Cleared back to zero by EndFrame(). Keyboard keys will be auto-mapped and be written here by NewFrame().
// Functions
- IMGUI_API void AddInputCharacter(ImWchar c); // Add new character into InputCharacters[]
- IMGUI_API void AddInputCharactersUTF8(const char* utf8_chars); // Add new characters into InputCharacters[] from an UTF-8 string
- inline void ClearInputCharacters() { InputCharacters[0] = 0; } // Clear the text input buffer manually
+ IMGUI_API void AddInputCharacter(unsigned int c); // Queue new character input
+ IMGUI_API void AddInputCharactersUTF8(const char* str); // Queue new characters input from an UTF-8 string
+ IMGUI_API void ClearInputCharacters(); // Clear the text input buffer manually
//------------------------------------------------------------------
// Output - Retrieve after calling NewFrame()
//------------------------------------------------------------------
- bool WantCaptureMouse; // When io.WantCaptureMouse is true, imgui will use the mouse inputs, do not dispatch them to your main game/application (in both cases, always pass on mouse inputs to imgui). (e.g. unclicked mouse is hovering over an imgui window, widget is active, mouse was clicked over an imgui window, etc.).
- bool WantCaptureKeyboard; // When io.WantCaptureKeyboard is true, imgui will use the keyboard inputs, do not dispatch them to your main game/application (in both cases, always pass keyboard inputs to imgui). (e.g. InputText active, or an imgui window is focused and navigation is enabled, etc.).
- bool WantTextInput; // Mobile/console: when io.WantTextInput is true, you may display an on-screen keyboard. This is set by ImGui when it wants textual keyboard input to happen (e.g. when a InputText widget is active).
- bool WantSetMousePos; // MousePos has been altered, back-end should reposition mouse on next frame. Set only when ImGuiConfigFlags_NavEnableSetMousePos flag is enabled.
- bool WantSaveIniSettings; // When manual .ini load/save is active (io.IniFilename == NULL), this will be set to notify your application that you can call SaveIniSettingsToMemory() and save yourself. IMPORTANT: You need to clear io.WantSaveIniSettings yourself.
- bool NavActive; // Directional navigation is currently allowed (will handle ImGuiKey_NavXXX events) = a window is focused and it doesn't use the ImGuiWindowFlags_NoNavInputs flag.
- bool NavVisible; // Directional navigation is visible and allowed (will handle ImGuiKey_NavXXX events).
- float Framerate; // Application framerate estimation, in frame per second. Solely for convenience. Rolling average estimation based on IO.DeltaTime over 120 frames
- int MetricsRenderVertices; // Vertices output during last call to Render()
- int MetricsRenderIndices; // Indices output during last call to Render() = number of triangles * 3
- int MetricsRenderWindows; // Number of visible windows
- int MetricsActiveWindows; // Number of active windows
- int MetricsActiveAllocations; // Number of active allocations, updated by MemAlloc/MemFree based on current context. May be off if you have multiple imgui contexts.
- ImVec2 MouseDelta; // Mouse delta. Note that this is zero if either current or previous position are invalid (-FLT_MAX,-FLT_MAX), so a disappearing/reappearing mouse won't have a huge delta.
+ bool WantCaptureMouse; // When io.WantCaptureMouse is true, imgui will use the mouse inputs, do not dispatch them to your main game/application (in both cases, always pass on mouse inputs to imgui). (e.g. unclicked mouse is hovering over an imgui window, widget is active, mouse was clicked over an imgui window, etc.).
+ bool WantCaptureKeyboard; // When io.WantCaptureKeyboard is true, imgui will use the keyboard inputs, do not dispatch them to your main game/application (in both cases, always pass keyboard inputs to imgui). (e.g. InputText active, or an imgui window is focused and navigation is enabled, etc.).
+ bool WantTextInput; // Mobile/console: when io.WantTextInput is true, you may display an on-screen keyboard. This is set by ImGui when it wants textual keyboard input to happen (e.g. when a InputText widget is active).
+ bool WantSetMousePos; // MousePos has been altered, back-end should reposition mouse on next frame. Set only when ImGuiConfigFlags_NavEnableSetMousePos flag is enabled.
+ bool WantSaveIniSettings; // When manual .ini load/save is active (io.IniFilename == NULL), this will be set to notify your application that you can call SaveIniSettingsToMemory() and save yourself. IMPORTANT: You need to clear io.WantSaveIniSettings yourself.
+ bool NavActive; // Directional navigation is currently allowed (will handle ImGuiKey_NavXXX events) = a window is focused and it doesn't use the ImGuiWindowFlags_NoNavInputs flag.
+ bool NavVisible; // Directional navigation is visible and allowed (will handle ImGuiKey_NavXXX events).
+ float Framerate; // Application framerate estimation, in frame per second. Solely for convenience. Rolling average estimation based on IO.DeltaTime over 120 frames
+ int MetricsRenderVertices; // Vertices output during last call to Render()
+ int MetricsRenderIndices; // Indices output during last call to Render() = number of triangles * 3
+ int MetricsRenderWindows; // Number of visible windows
+ int MetricsActiveWindows; // Number of active windows
+ int MetricsActiveAllocations; // Number of active allocations, updated by MemAlloc/MemFree based on current context. May be off if you have multiple imgui contexts.
+ ImVec2 MouseDelta; // Mouse delta. Note that this is zero if either current or previous position are invalid (-FLT_MAX,-FLT_MAX), so a disappearing/reappearing mouse won't have a huge delta.
//------------------------------------------------------------------
- // [Internal] ImGui will maintain those fields. Forward compatibility not guaranteed!
+ // [Internal] Dear ImGui will maintain those fields. Forward compatibility not guaranteed!
//------------------------------------------------------------------
- ImVec2 MousePosPrev; // Previous mouse position temporary storage (nb: not for public use, set to MousePos in NewFrame())
- ImVec2 MouseClickedPos[5]; // Position at time of clicking
- double MouseClickedTime[5]; // Time of last click (used to figure out double-click)
- bool MouseClicked[5]; // Mouse button went from !Down to Down
- bool MouseDoubleClicked[5]; // Has mouse button been double-clicked?
- bool MouseReleased[5]; // Mouse button went from Down to !Down
- bool MouseDownOwned[5]; // Track if button was clicked inside a window. We don't request mouse capture from the application if click started outside ImGui bounds.
- float MouseDownDuration[5]; // Duration the mouse button has been down (0.0f == just clicked)
- float MouseDownDurationPrev[5]; // Previous time the mouse button has been down
- ImVec2 MouseDragMaxDistanceAbs[5]; // Maximum distance, absolute, on each axis, of how much mouse has traveled from the clicking point
- float MouseDragMaxDistanceSqr[5]; // Squared maximum distance of how much mouse has traveled from the clicking point
- float KeysDownDuration[512]; // Duration the keyboard key has been down (0.0f == just pressed)
- float KeysDownDurationPrev[512]; // Previous duration the key has been down
+ ImVec2 MousePosPrev; // Previous mouse position (note that MouseDelta is not necessary == MousePos-MousePosPrev, in case either position is invalid)
+ ImVec2 MouseClickedPos[5]; // Position at time of clicking
+ double MouseClickedTime[5]; // Time of last click (used to figure out double-click)
+ bool MouseClicked[5]; // Mouse button went from !Down to Down
+ bool MouseDoubleClicked[5]; // Has mouse button been double-clicked?
+ bool MouseReleased[5]; // Mouse button went from Down to !Down
+ bool MouseDownOwned[5]; // Track if button was clicked inside a dear imgui window. We don't request mouse capture from the application if click started outside ImGui bounds.
+ bool MouseDownWasDoubleClick[5]; // Track if button down was a double-click
+ float MouseDownDuration[5]; // Duration the mouse button has been down (0.0f == just clicked)
+ float MouseDownDurationPrev[5]; // Previous time the mouse button has been down
+ ImVec2 MouseDragMaxDistanceAbs[5]; // Maximum distance, absolute, on each axis, of how much mouse has traveled from the clicking point
+ float MouseDragMaxDistanceSqr[5]; // Squared maximum distance of how much mouse has traveled from the clicking point
+ float KeysDownDuration[512]; // Duration the keyboard key has been down (0.0f == just pressed)
+ float KeysDownDurationPrev[512]; // Previous duration the key has been down
float NavInputsDownDuration[ImGuiNavInput_COUNT];
float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
+ ImVector InputQueueCharacters; // Queue of _characters_ input (obtained by platform back-end). Fill using AddInputCharacter() helper.
IMGUI_API ImGuiIO();
};
+//-----------------------------------------------------------------------------
+// Misc data structures
+//-----------------------------------------------------------------------------
+
+// Shared state of InputText(), passed as an argument to your callback when a ImGuiInputTextFlags_Callback* flag is used.
+// The callback function should return 0 by default.
+// Callbacks (follow a flag name and see comments in ImGuiInputTextFlags_ declarations for more details)
+// - ImGuiInputTextFlags_CallbackCompletion: Callback on pressing TAB
+// - ImGuiInputTextFlags_CallbackHistory: Callback on pressing Up/Down arrows
+// - ImGuiInputTextFlags_CallbackAlways: Callback on each iteration
+// - ImGuiInputTextFlags_CallbackCharFilter: Callback on character inputs to replace or discard them. Modify 'EventChar' to replace or discard, or return 1 in callback to discard.
+// - ImGuiInputTextFlags_CallbackResize: Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow.
+struct ImGuiInputTextCallbackData
+{
+ ImGuiInputTextFlags EventFlag; // One ImGuiInputTextFlags_Callback* // Read-only
+ ImGuiInputTextFlags Flags; // What user passed to InputText() // Read-only
+ void* UserData; // What user passed to InputText() // Read-only
+
+ // Arguments for the different callback events
+ // - To modify the text buffer in a callback, prefer using the InsertChars() / DeleteChars() function. InsertChars() will take care of calling the resize callback if necessary.
+ // - If you know your edits are not going to resize the underlying buffer allocation, you may modify the contents of 'Buf[]' directly. You need to update 'BufTextLen' accordingly (0 <= BufTextLen < BufSize) and set 'BufDirty'' to true so InputText can update its internal state.
+ ImWchar EventChar; // Character input // Read-write // [CharFilter] Replace character with another one, or set to zero to drop. return 1 is equivalent to setting EventChar=0;
+ ImGuiKey EventKey; // Key pressed (Up/Down/TAB) // Read-only // [Completion,History]
+ char* Buf; // Text buffer // Read-write // [Resize] Can replace pointer / [Completion,History,Always] Only write to pointed data, don't replace the actual pointer!
+ int BufTextLen; // Text length (in bytes) // Read-write // [Resize,Completion,History,Always] Exclude zero-terminator storage. In C land: == strlen(some_text), in C++ land: string.length()
+ int BufSize; // Buffer size (in bytes) = capacity+1 // Read-only // [Resize,Completion,History,Always] Include zero-terminator storage. In C land == ARRAYSIZE(my_char_array), in C++ land: string.capacity()+1
+ bool BufDirty; // Set if you modify Buf/BufTextLen! // Write // [Completion,History,Always]
+ int CursorPos; // // Read-write // [Completion,History,Always]
+ int SelectionStart; // // Read-write // [Completion,History,Always] == to SelectionEnd when no selection)
+ int SelectionEnd; // // Read-write // [Completion,History,Always]
+
+ // Helper functions for text manipulation.
+ // Use those function to benefit from the CallbackResize behaviors. Calling those function reset the selection.
+ IMGUI_API ImGuiInputTextCallbackData();
+ IMGUI_API void DeleteChars(int pos, int bytes_count);
+ IMGUI_API void InsertChars(int pos, const char* text, const char* text_end = NULL);
+ bool HasSelection() const { return SelectionStart != SelectionEnd; }
+};
+
+// Resizing callback data to apply custom constraint. As enabled by SetNextWindowSizeConstraints(). Callback is called during the next Begin().
+// NB: For basic min/max size constraint on each axis you don't need to use the callback! The SetNextWindowSizeConstraints() parameters are enough.
+struct ImGuiSizeCallbackData
+{
+ void* UserData; // Read-only. What user passed to SetNextWindowSizeConstraints()
+ ImVec2 Pos; // Read-only. Window position, for reference.
+ ImVec2 CurrentSize; // Read-only. Current window size.
+ ImVec2 DesiredSize; // Read-write. Desired size, based on user's mouse position. Write to this field to restrain resizing.
+};
+
+// Data payload for Drag and Drop operations: AcceptDragDropPayload(), GetDragDropPayload()
+struct ImGuiPayload
+{
+ // Members
+ void* Data; // Data (copied and owned by dear imgui)
+ int DataSize; // Data size
+
+ // [Internal]
+ ImGuiID SourceId; // Source item id
+ ImGuiID SourceParentId; // Source parent id (if available)
+ int DataFrameCount; // Data timestamp
+ char DataType[32+1]; // Data type tag (short user-supplied string, 32 characters max)
+ bool Preview; // Set when AcceptDragDropPayload() was called and mouse has been hovering the target item (nb: handle overlapping drag targets)
+ bool Delivery; // Set when AcceptDragDropPayload() was called and mouse button is released over the target item.
+
+ ImGuiPayload() { Clear(); }
+ void Clear() { SourceId = SourceParentId = 0; Data = NULL; DataSize = 0; memset(DataType, 0, sizeof(DataType)); DataFrameCount = -1; Preview = Delivery = false; }
+ bool IsDataType(const char* type) const { return DataFrameCount != -1 && strcmp(type, DataType) == 0; }
+ bool IsPreview() const { return Preview; }
+ bool IsDelivery() const { return Delivery; }
+};
+
//-----------------------------------------------------------------------------
// Obsolete functions (Will be removed! Read 'API BREAKING CHANGES' section in imgui.cpp for details)
+// Please keep your copy of dear imgui up to date! Occasionally set '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' in imconfig.h to stay ahead.
//-----------------------------------------------------------------------------
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
namespace ImGui
{
+ // OBSOLETED in 1.72 (from July 2019)
+ static inline void TreeAdvanceToLabelPos() { SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()); }
+ // OBSOLETED in 1.71 (from June 2019)
+ static inline void SetNextTreeNodeOpen(bool open, ImGuiCond cond = 0) { SetNextItemOpen(open, cond); }
+ // OBSOLETED in 1.70 (from May 2019)
+ static inline float GetContentRegionAvailWidth() { return GetContentRegionAvail().x; }
+ // OBSOLETED in 1.69 (from Mar 2019)
+ static inline ImDrawList* GetOverlayDrawList() { return GetForegroundDrawList(); }
// OBSOLETED in 1.66 (from Sep 2018)
static inline void SetScrollHere(float center_ratio=0.5f){ SetScrollHereY(center_ratio); }
- // OBSOLETED in 1.63 (from Aug 2018)
+ // OBSOLETED in 1.63 (between Aug 2018 and Sept 2018)
static inline bool IsItemDeactivatedAfterChange() { return IsItemDeactivatedAfterEdit(); }
- // OBSOLETED in 1.61 (from Apr 2018)
- IMGUI_API bool InputFloat(const char* label, float* v, float step, float step_fast, int decimal_precision, ImGuiInputTextFlags extra_flags = 0); // Use the 'const char* format' version instead of 'decimal_precision'!
- IMGUI_API bool InputFloat2(const char* label, float v[2], int decimal_precision, ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputFloat3(const char* label, float v[3], int decimal_precision, ImGuiInputTextFlags extra_flags = 0);
- IMGUI_API bool InputFloat4(const char* label, float v[4], int decimal_precision, ImGuiInputTextFlags extra_flags = 0);
- // OBSOLETED in 1.60 (from Dec 2017)
+ // OBSOLETED in 1.61 (between Apr 2018 and Aug 2018)
+ IMGUI_API bool InputFloat(const char* label, float* v, float step, float step_fast, int decimal_precision, ImGuiInputTextFlags flags = 0); // Use the 'const char* format' version instead of 'decimal_precision'!
+ IMGUI_API bool InputFloat2(const char* label, float v[2], int decimal_precision, ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputFloat3(const char* label, float v[3], int decimal_precision, ImGuiInputTextFlags flags = 0);
+ IMGUI_API bool InputFloat4(const char* label, float v[4], int decimal_precision, ImGuiInputTextFlags flags = 0);
+ // OBSOLETED in 1.60 (between Dec 2017 and Apr 2018)
static inline bool IsAnyWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_AnyWindow); }
static inline bool IsAnyWindowHovered() { return IsWindowHovered(ImGuiHoveredFlags_AnyWindow); }
- static inline ImVec2 CalcItemRectClosestPoint(const ImVec2& pos, bool on_edge = false, float outward = 0.f) { (void)on_edge; (void)outward; IM_ASSERT(0); return pos; }
- // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017)
- static inline void ShowTestWindow() { return ShowDemoWindow(); }
- static inline bool IsRootWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_RootWindow); }
- static inline bool IsRootWindowOrAnyChildFocused() { return IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows); }
- static inline void SetNextWindowContentWidth(float w) { SetNextWindowContentSize(ImVec2(w, 0.0f)); }
- static inline float GetItemsLineHeightWithSpacing() { return GetFrameHeightWithSpacing(); }
- // OBSOLETED in 1.52 (between Aug 2017 and Oct 2017)
- IMGUI_API bool Begin(const char* name, bool* p_open, const ImVec2& size_on_first_use, float bg_alpha_override = -1.0f, ImGuiWindowFlags flags = 0); // Use SetNextWindowSize(size, ImGuiCond_FirstUseEver) + SetNextWindowBgAlpha() instead.
- static inline bool IsRootWindowOrAnyChildHovered() { return IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows); }
- static inline void AlignFirstTextHeightToWidgets() { AlignTextToFramePadding(); }
- static inline void SetNextWindowPosCenter(ImGuiCond c=0) { ImGuiIO& io = GetIO(); SetNextWindowPos(ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.5f), c, ImVec2(0.5f, 0.5f)); }
- // OBSOLETED in 1.51 (between Jun 2017 and Aug 2017)
- static inline bool IsItemHoveredRect() { return IsItemHovered(ImGuiHoveredFlags_RectOnly); }
- static inline bool IsPosHoveringAnyWindow(const ImVec2&) { IM_ASSERT(0); return false; } // This was misleading and partly broken. You probably want to use the ImGui::GetIO().WantCaptureMouse flag instead.
- static inline bool IsMouseHoveringAnyWindow() { return IsWindowHovered(ImGuiHoveredFlags_AnyWindow); }
- static inline bool IsMouseHoveringWindow() { return IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem); }
+ static inline ImVec2 CalcItemRectClosestPoint(const ImVec2& pos, bool on_edge = false, float outward = 0.f) { IM_UNUSED(on_edge); IM_UNUSED(outward); IM_ASSERT(0); return pos; }
}
+typedef ImGuiInputTextCallback ImGuiTextEditCallback; // OBSOLETED in 1.63 (from Aug 2018): made the names consistent
+typedef ImGuiInputTextCallbackData ImGuiTextEditCallbackData;
#endif
//-----------------------------------------------------------------------------
// Helpers
//-----------------------------------------------------------------------------
-// Helper: Lightweight std::vector<> like class to avoid dragging dependencies (also: Windows implementation of STL with debug enabled is absurdly slow, so let's bypass it so our code runs fast in debug).
-// *Important* Our implementation does NOT call C++ constructors/destructors. This is intentional, we do not require it but you have to be mindful of that. Do _not_ use this class as a std::vector replacement in your code!
-template
-class ImVector
-{
-public:
- int Size;
- int Capacity;
- T* Data;
-
- typedef T value_type;
- typedef value_type* iterator;
- typedef const value_type* const_iterator;
-
- inline ImVector() { Size = Capacity = 0; Data = NULL; }
- inline ~ImVector() { if (Data) ImGui::MemFree(Data); }
- inline ImVector(const ImVector& src) { Size = Capacity = 0; Data = NULL; operator=(src); }
- inline ImVector& operator=(const ImVector& src) { clear(); resize(src.Size); memcpy(Data, src.Data, (size_t)Size * sizeof(value_type)); return *this; }
-
- inline bool empty() const { return Size == 0; }
- inline int size() const { return Size; }
- inline int capacity() const { return Capacity; }
- inline value_type& operator[](int i) { IM_ASSERT(i < Size); return Data[i]; }
- inline const value_type& operator[](int i) const { IM_ASSERT(i < Size); return Data[i]; }
-
- inline void clear() { if (Data) { Size = Capacity = 0; ImGui::MemFree(Data); Data = NULL; } }
- inline iterator begin() { return Data; }
- inline const_iterator begin() const { return Data; }
- inline iterator end() { return Data + Size; }
- inline const_iterator end() const { return Data + Size; }
- inline value_type& front() { IM_ASSERT(Size > 0); return Data[0]; }
- inline const value_type& front() const { IM_ASSERT(Size > 0); return Data[0]; }
- inline value_type& back() { IM_ASSERT(Size > 0); return Data[Size - 1]; }
- inline const value_type& back() const { IM_ASSERT(Size > 0); return Data[Size - 1]; }
- inline void swap(ImVector& rhs) { int rhs_size = rhs.Size; rhs.Size = Size; Size = rhs_size; int rhs_cap = rhs.Capacity; rhs.Capacity = Capacity; Capacity = rhs_cap; value_type* rhs_data = rhs.Data; rhs.Data = Data; Data = rhs_data; }
-
- inline int _grow_capacity(int sz) const { int new_capacity = Capacity ? (Capacity + Capacity/2) : 8; return new_capacity > sz ? new_capacity : sz; }
- inline void resize(int new_size) { if (new_size > Capacity) reserve(_grow_capacity(new_size)); Size = new_size; }
- inline void resize(int new_size,const value_type& v){ if (new_size > Capacity) reserve(_grow_capacity(new_size)); if (new_size > Size) for (int n = Size; n < new_size; n++) memcpy(&Data[n], &v, sizeof(v)); Size = new_size; }
- inline void reserve(int new_capacity)
- {
- if (new_capacity <= Capacity)
- return;
- value_type* new_data = (value_type*)ImGui::MemAlloc((size_t)new_capacity * sizeof(value_type));
- if (Data)
- {
- memcpy(new_data, Data, (size_t)Size * sizeof(value_type));
- ImGui::MemFree(Data);
- }
- Data = new_data;
- Capacity = new_capacity;
- }
-
- // NB: It is forbidden to call push_back/push_front/insert with a reference pointing inside the ImVector data itself! e.g. v.push_back(v[10]) is forbidden.
- inline void push_back(const value_type& v) { if (Size == Capacity) reserve(_grow_capacity(Size + 1)); memcpy(&Data[Size], &v, sizeof(v)); Size++; }
- inline void pop_back() { IM_ASSERT(Size > 0); Size--; }
- inline void push_front(const value_type& v) { if (Size == 0) push_back(v); else insert(Data, v); }
- inline iterator erase(const_iterator it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + 1, ((size_t)Size - (size_t)off - 1) * sizeof(value_type)); Size--; return Data + off; }
- inline iterator erase(const_iterator it, const_iterator it_last){ IM_ASSERT(it >= Data && it < Data+Size && it_last > it && it_last <= Data+Size); const ptrdiff_t count = it_last - it; const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + count, ((size_t)Size - (size_t)off - count) * sizeof(value_type)); Size -= (int)count; return Data + off; }
- inline iterator erase_unsorted(const_iterator it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; if (it < Data+Size-1) memcpy(Data + off, Data + Size - 1, sizeof(value_type)); Size--; return Data + off; }
- inline iterator insert(const_iterator it, const value_type& v) { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; if (Size == Capacity) reserve(_grow_capacity(Size + 1)); if (off < (int)Size) memmove(Data + off + 1, Data + off, ((size_t)Size - (size_t)off) * sizeof(value_type)); memcpy(&Data[off], &v, sizeof(v)); Size++; return Data + off; }
- inline bool contains(const value_type& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data++ == v) return true; return false; }
- inline int index_from_pointer(const_iterator it) const { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; return (int)off; }
-};
-
-// Helper: IM_NEW(), IM_PLACEMENT_NEW(), IM_DELETE() macros to call MemAlloc + Placement New, Placement Delete + MemFree
-// We call C++ constructor on own allocated memory via the placement "new(ptr) Type()" syntax.
-// Defining a custom placement new() with a dummy parameter allows us to bypass including which on some platforms complains when user has disabled exceptions.
-struct ImNewDummy {};
-inline void* operator new(size_t, ImNewDummy, void* ptr) { return ptr; }
-inline void operator delete(void*, ImNewDummy, void*) {} // This is only required so we can use the symetrical new()
-#define IM_PLACEMENT_NEW(_PTR) new(ImNewDummy(), _PTR)
-#define IM_NEW(_TYPE) new(ImNewDummy(), ImGui::MemAlloc(sizeof(_TYPE))) _TYPE
-template void IM_DELETE(T* p) { if (p) { p->~T(); ImGui::MemFree(p); } }
-
// Helper: Execute a block of code at maximum once a frame. Convenient if you want to quickly create an UI within deep-nested code that runs multiple times every frame.
// Usage: static ImGuiOnceUponAFrame oaf; if (oaf) ImGui::Text("This will be called only once per frame");
struct ImGuiOnceUponAFrame
@@ -1336,37 +1623,30 @@ struct ImGuiOnceUponAFrame
operator bool() const { int current_frame = ImGui::GetFrameCount(); if (RefFrame == current_frame) return false; RefFrame = current_frame; return true; }
};
-// Helper: Macro for ImGuiOnceUponAFrame. Attention: The macro expands into 2 statement so make sure you don't use it within e.g. an if() statement without curly braces.
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS // Will obsolete
-#define IMGUI_ONCE_UPON_A_FRAME static ImGuiOnceUponAFrame imgui_oaf; if (imgui_oaf)
-#endif
-
// Helper: Parse and apply text filters. In format "aaaaa[,bbbb][,ccccc]"
struct ImGuiTextFilter
{
IMGUI_API ImGuiTextFilter(const char* default_filter = "");
- IMGUI_API bool Draw(const char* label = "Filter (inc,-exc)", float width = 0.0f); // Helper calling InputText+Build
+ IMGUI_API bool Draw(const char* label = "Filter (inc,-exc)", float width = 0.0f); // Helper calling InputText+Build
IMGUI_API bool PassFilter(const char* text, const char* text_end = NULL) const;
IMGUI_API void Build();
void Clear() { InputBuf[0] = 0; Build(); }
bool IsActive() const { return !Filters.empty(); }
// [Internal]
- struct TextRange
+ struct ImGuiTextRange
{
- const char* b;
- const char* e;
+ const char* b;
+ const char* e;
- TextRange() { b = e = NULL; }
- TextRange(const char* _b, const char* _e) { b = _b; e = _e; }
- const char* begin() const { return b; }
- const char* end () const { return e; }
- bool empty() const { return b == e; }
- IMGUI_API void split(char separator, ImVector* out) const;
+ ImGuiTextRange() { b = e = NULL; }
+ ImGuiTextRange(const char* _b, const char* _e) { b = _b; e = _e; }
+ bool empty() const { return b == e; }
+ IMGUI_API void split(char separator, ImVector* out) const;
};
- char InputBuf[256];
- ImVector Filters;
- int CountGrep;
+ char InputBuf[256];
+ ImVectorFilters;
+ int CountGrep;
};
// Helper: Growable text buffer for logging/accumulating text
@@ -1374,17 +1654,18 @@ struct ImGuiTextFilter
struct ImGuiTextBuffer
{
ImVector Buf;
- static char EmptyString[1];
+ IMGUI_API static char EmptyString[1];
ImGuiTextBuffer() { }
- inline char operator[](int i) { IM_ASSERT(Buf.Data != NULL); return Buf.Data[i]; }
+ inline char operator[](int i) const { IM_ASSERT(Buf.Data != NULL); return Buf.Data[i]; }
const char* begin() const { return Buf.Data ? &Buf.front() : EmptyString; }
const char* end() const { return Buf.Data ? &Buf.back() : EmptyString; } // Buf is zero-terminated, so end() will point on the zero-terminator
- int size() const { return Buf.Data ? Buf.Size - 1 : 0; }
- bool empty() { return Buf.Size <= 1; }
+ int size() const { return Buf.Size ? Buf.Size - 1 : 0; }
+ bool empty() const { return Buf.Size <= 1; }
void clear() { Buf.clear(); }
void reserve(int capacity) { Buf.reserve(capacity); }
const char* c_str() const { return Buf.Data ? Buf.Data : EmptyString; }
+ IMGUI_API void append(const char* str, const char* str_end = NULL);
IMGUI_API void appendf(const char* fmt, ...) IM_FMTARGS(2);
IMGUI_API void appendfv(const char* fmt, va_list args) IM_FMTLIST(2);
};
@@ -1399,15 +1680,17 @@ struct ImGuiTextBuffer
// Types are NOT stored, so it is up to you to make sure your Key don't collide with different types.
struct ImGuiStorage
{
- struct Pair
+ // [Internal]
+ struct ImGuiStoragePair
{
ImGuiID key;
union { int val_i; float val_f; void* val_p; };
- Pair(ImGuiID _key, int _val_i) { key = _key; val_i = _val_i; }
- Pair(ImGuiID _key, float _val_f) { key = _key; val_f = _val_f; }
- Pair(ImGuiID _key, void* _val_p) { key = _key; val_p = _val_p; }
+ ImGuiStoragePair(ImGuiID _key, int _val_i) { key = _key; val_i = _val_i; }
+ ImGuiStoragePair(ImGuiID _key, float _val_f) { key = _key; val_f = _val_f; }
+ ImGuiStoragePair(ImGuiID _key, void* _val_p) { key = _key; val_p = _val_p; }
};
- ImVector Data;
+
+ ImVector Data;
// - Get***() functions find pair, never add/allocate. Pairs are sorted so a query is O(log N)
// - Set***() functions find pair, insertion on demand if missing.
@@ -1438,79 +1721,41 @@ struct ImGuiStorage
IMGUI_API void BuildSortByKey();
};
-// Shared state of InputText(), passed as an argument to your callback when a ImGuiInputTextFlags_Callback* flag is used.
-// The callback function should return 0 by default.
-// Callbacks (follow a flag name and see comments in ImGuiInputTextFlags_ declarations for more details)
-// - ImGuiInputTextFlags_CallbackCompletion: Callback on pressing TAB
-// - ImGuiInputTextFlags_CallbackHistory: Callback on pressing Up/Down arrows
-// - ImGuiInputTextFlags_CallbackAlways: Callback on each iteration
-// - ImGuiInputTextFlags_CallbackCharFilter: Callback on character inputs to replace or discard them. Modify 'EventChar' to replace or discard, or return 1 in callback to discard.
-// - ImGuiInputTextFlags_CallbackResize: Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow.
-struct ImGuiInputTextCallbackData
+// Helper: Manually clip large list of items.
+// If you are submitting lots of evenly spaced items and you have a random access to the list, you can perform coarse clipping based on visibility to save yourself from processing those items at all.
+// The clipper calculates the range of visible items and advance the cursor to compensate for the non-visible items we have skipped.
+// ImGui already clip items based on their bounds but it needs to measure text size to do so. Coarse clipping before submission makes this cost and your own data fetching/submission cost null.
+// Usage:
+// ImGuiListClipper clipper(1000); // we have 1000 elements, evenly spaced.
+// while (clipper.Step())
+// for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
+// ImGui::Text("line number %d", i);
+// - Step 0: the clipper let you process the first element, regardless of it being visible or not, so we can measure the element height (step skipped if we passed a known height as second arg to constructor).
+// - Step 1: the clipper infer height from first element, calculate the actual range of elements to display, and position the cursor before the first element.
+// - (Step 2: dummy step only required if an explicit items_height was passed to constructor or Begin() and user call Step(). Does nothing and switch to Step 3.)
+// - Step 3: the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd), advance the cursor to the end of the list and then returns 'false' to end the loop.
+struct ImGuiListClipper
{
- ImGuiInputTextFlags EventFlag; // One ImGuiInputTextFlags_Callback* // Read-only
- ImGuiInputTextFlags Flags; // What user passed to InputText() // Read-only
- void* UserData; // What user passed to InputText() // Read-only
-
- // Arguments for the different callback events
- // - To modify the text buffer in a callback, prefer using the InsertChars() / DeleteChars() function. InsertChars() will take care of calling the resize callback if necessary.
- // - If you know your edits are not going to resize the underlying buffer allocation, you may modify the contents of 'Buf[]' directly. You need to update 'BufTextLen' accordingly (0 <= BufTextLen < BufSize) and set 'BufDirty'' to true so InputText can update its internal state.
- ImWchar EventChar; // Character input // Read-write // [CharFilter] Replace character with another one, or set to zero to drop. return 1 is equivalent to setting EventChar=0;
- ImGuiKey EventKey; // Key pressed (Up/Down/TAB) // Read-only // [Completion,History]
- char* Buf; // Text buffer // Read-write // [Resize] Can replace pointer / [Completion,History,Always] Only write to pointed data, don't replace the actual pointer!
- int BufTextLen; // Text length (in bytes) // Read-write // [Resize,Completion,History,Always] Exclude zero-terminator storage. In C land: == strlen(some_text), in C++ land: string.length()
- int BufSize; // Buffer size (in bytes) = capacity+1 // Read-only // [Resize,Completion,History,Always] Include zero-terminator storage. In C land == ARRAYSIZE(my_char_array), in C++ land: string.capacity()+1
- bool BufDirty; // Set if you modify Buf/BufTextLen! // Write // [Completion,History,Always]
- int CursorPos; // // Read-write // [Completion,History,Always]
- int SelectionStart; // // Read-write // [Completion,History,Always] == to SelectionEnd when no selection)
- int SelectionEnd; // // Read-write // [Completion,History,Always]
-
- // Helper functions for text manipulation.
- // Use those function to benefit from the CallbackResize behaviors. Calling those function reset the selection.
- IMGUI_API ImGuiInputTextCallbackData();
- IMGUI_API void DeleteChars(int pos, int bytes_count);
- IMGUI_API void InsertChars(int pos, const char* text, const char* text_end = NULL);
- bool HasSelection() const { return SelectionStart != SelectionEnd; }
-};
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-typedef ImGuiInputTextCallback ImGuiTextEditCallback; // [OBSOLETE 1.63+] Made the names consistent
-typedef ImGuiInputTextCallbackData ImGuiTextEditCallbackData;
-#endif
-
-// Resizing callback data to apply custom constraint. As enabled by SetNextWindowSizeConstraints(). Callback is called during the next Begin().
-// NB: For basic min/max size constraint on each axis you don't need to use the callback! The SetNextWindowSizeConstraints() parameters are enough.
-struct ImGuiSizeCallbackData
-{
- void* UserData; // Read-only. What user passed to SetNextWindowSizeConstraints()
- ImVec2 Pos; // Read-only. Window position, for reference.
- ImVec2 CurrentSize; // Read-only. Current window size.
- ImVec2 DesiredSize; // Read-write. Desired size, based on user's mouse position. Write to this field to restrain resizing.
-};
-
-// Data payload for Drag and Drop operations
-struct ImGuiPayload
-{
- // Members
- void* Data; // Data (copied and owned by dear imgui)
- int DataSize; // Data size
+ int DisplayStart, DisplayEnd;
+ int ItemsCount;
// [Internal]
- ImGuiID SourceId; // Source item id
- ImGuiID SourceParentId; // Source parent id (if available)
- int DataFrameCount; // Data timestamp
- char DataType[32+1]; // Data type tag (short user-supplied string, 32 characters max)
- bool Preview; // Set when AcceptDragDropPayload() was called and mouse has been hovering the target item (nb: handle overlapping drag targets)
- bool Delivery; // Set when AcceptDragDropPayload() was called and mouse button is released over the target item.
+ int StepNo;
+ float ItemsHeight;
+ float StartPosY;
- ImGuiPayload() { Clear(); }
- void Clear() { SourceId = SourceParentId = 0; Data = NULL; DataSize = 0; memset(DataType, 0, sizeof(DataType)); DataFrameCount = -1; Preview = Delivery = false; }
- bool IsDataType(const char* type) const { return DataFrameCount != -1 && strcmp(type, DataType) == 0; }
- bool IsPreview() const { return Preview; }
- bool IsDelivery() const { return Delivery; }
+ // items_count: Use -1 to ignore (you can call Begin later). Use INT_MAX if you don't know how many items you have (in which case the cursor won't be advanced in the final step).
+ // items_height: Use -1.0f to be calculated automatically on first step. Otherwise pass in the distance between your items, typically GetTextLineHeightWithSpacing() or GetFrameHeightWithSpacing().
+ // If you don't specify an items_height, you NEED to call Step(). If you specify items_height you may call the old Begin()/End() api directly, but prefer calling Step().
+ ImGuiListClipper(int items_count = -1, float items_height = -1.0f) { Begin(items_count, items_height); } // NB: Begin() initialize every fields (as we allow user to call Begin/End multiple times on a same instance if they want).
+ ~ImGuiListClipper() { IM_ASSERT(ItemsCount == -1); } // Assert if user forgot to call End() or Step() until false.
+
+ IMGUI_API bool Step(); // Call until it returns false. The DisplayStart/DisplayEnd fields will be set and you can process/draw those items.
+ IMGUI_API void Begin(int items_count, float items_height = -1.0f); // Automatically called by constructor if you passed 'items_count' or by Step() in Step 1.
+ IMGUI_API void End(); // Automatically called on the last call of Step() that returns false.
};
-// Helpers macros to generate 32-bits encoded colors
+// Helpers macros to generate 32-bit encoded colors
#ifdef IMGUI_USE_BGRA_PACKED_COLOR
#define IM_COL32_R_SHIFT 16
#define IM_COL32_G_SHIFT 8
@@ -1529,7 +1774,7 @@ struct ImGuiPayload
#define IM_COL32_BLACK IM_COL32(0,0,0,255) // Opaque black
#define IM_COL32_BLACK_TRANS IM_COL32(0,0,0,0) // Transparent black = 0x00000000
-// Helper: ImColor() implicity converts colors to either ImU32 (packed 4x1 byte) or ImVec4 (4x1 float)
+// Helper: ImColor() implicitly converts colors to either ImU32 (packed 4x1 byte) or ImVec4 (4x1 float)
// Prefer using IM_COL32() macros if you want a guaranteed compile-time ImU32 for usage with ImDrawList API.
// **Avoid storing ImColor! Store either u32 of ImVec4. This is not a full-featured color class. MAY OBSOLETE.
// **None of the ImGui API are using ImColor directly but you can use it as a convenience to pass colors in either ImU32 or ImVec4 formats. Explicitly cast to ImU32 or ImVec4 if needed.
@@ -1550,60 +1795,47 @@ struct ImColor
static ImColor HSV(float h, float s, float v, float a = 1.0f) { float r,g,b; ImGui::ColorConvertHSVtoRGB(h, s, v, r, g, b); return ImColor(r,g,b,a); }
};
-// Helper: Manually clip large list of items.
-// If you are submitting lots of evenly spaced items and you have a random access to the list, you can perform coarse clipping based on visibility to save yourself from processing those items at all.
-// The clipper calculates the range of visible items and advance the cursor to compensate for the non-visible items we have skipped.
-// ImGui already clip items based on their bounds but it needs to measure text size to do so. Coarse clipping before submission makes this cost and your own data fetching/submission cost null.
-// Usage:
-// ImGuiListClipper clipper(1000); // we have 1000 elements, evenly spaced.
-// while (clipper.Step())
-// for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
-// ImGui::Text("line number %d", i);
-// - Step 0: the clipper let you process the first element, regardless of it being visible or not, so we can measure the element height (step skipped if we passed a known height as second arg to constructor).
-// - Step 1: the clipper infer height from first element, calculate the actual range of elements to display, and position the cursor before the first element.
-// - (Step 2: dummy step only required if an explicit items_height was passed to constructor or Begin() and user call Step(). Does nothing and switch to Step 3.)
-// - Step 3: the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd), advance the cursor to the end of the list and then returns 'false' to end the loop.
-struct ImGuiListClipper
-{
- float StartPosY;
- float ItemsHeight;
- int ItemsCount, StepNo, DisplayStart, DisplayEnd;
-
- // items_count: Use -1 to ignore (you can call Begin later). Use INT_MAX if you don't know how many items you have (in which case the cursor won't be advanced in the final step).
- // items_height: Use -1.0f to be calculated automatically on first step. Otherwise pass in the distance between your items, typically GetTextLineHeightWithSpacing() or GetFrameHeightWithSpacing().
- // If you don't specify an items_height, you NEED to call Step(). If you specify items_height you may call the old Begin()/End() api directly, but prefer calling Step().
- ImGuiListClipper(int items_count = -1, float items_height = -1.0f) { Begin(items_count, items_height); } // NB: Begin() initialize every fields (as we allow user to call Begin/End multiple times on a same instance if they want).
- ~ImGuiListClipper() { IM_ASSERT(ItemsCount == -1); } // Assert if user forgot to call End() or Step() until false.
-
- IMGUI_API bool Step(); // Call until it returns false. The DisplayStart/DisplayEnd fields will be set and you can process/draw those items.
- IMGUI_API void Begin(int items_count, float items_height = -1.0f); // Automatically called by constructor if you passed 'items_count' or by Step() in Step 1.
- IMGUI_API void End(); // Automatically called on the last call of Step() that returns false.
-};
-
//-----------------------------------------------------------------------------
-// Draw List
+// Draw List API (ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData)
// Hold a series of drawing commands. The user provides a renderer for ImDrawData which essentially contains an array of ImDrawList.
//-----------------------------------------------------------------------------
// Draw callbacks for advanced uses.
-// NB- You most likely do NOT need to use draw callbacks just to create your own widget or customized UI rendering (you can poke into the draw list for that)
-// Draw callback may be useful for example, A) Change your GPU render state, B) render a complex 3D scene inside a UI element (without an intermediate texture/render target), etc.
-// The expected behavior from your rendering function is 'if (cmd.UserCallback != NULL) cmd.UserCallback(parent_list, cmd); else RenderTriangles()'
+// NB: You most likely do NOT need to use draw callbacks just to create your own widget or customized UI rendering,
+// you can poke into the draw list for that! Draw callback may be useful for example to:
+// A) Change your GPU render state,
+// B) render a complex 3D scene inside a UI element without an intermediate texture/render target, etc.
+// The expected behavior from your rendering function is 'if (cmd.UserCallback != NULL) { cmd.UserCallback(parent_list, cmd); } else { RenderTriangles() }'
+// If you want to override the signature of ImDrawCallback, you can simply use e.g. '#define ImDrawCallback MyDrawCallback' (in imconfig.h) + update rendering back-end accordingly.
+#ifndef ImDrawCallback
typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
+#endif
+
+// Special Draw callback value to request renderer back-end to reset the graphics/render state.
+// The renderer back-end needs to handle this special value, otherwise it will crash trying to call a function at this address.
+// This is useful for example if you submitted callbacks which you know have altered the render state and you want it to be restored.
+// It is not done by default because they are many perfectly useful way of altering render state for imgui contents (e.g. changing shader/blending settings before an Image call).
+#define ImDrawCallback_ResetRenderState (ImDrawCallback)(-1)
// Typically, 1 command = 1 GPU draw call (unless command is a callback)
+// Pre 1.71 back-ends will typically ignore the VtxOffset/IdxOffset fields. When 'io.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset'
+// is enabled, those fields allow us to render meshes larger than 64K vertices while keeping 16-bit indices.
struct ImDrawCmd
{
unsigned int ElemCount; // Number of indices (multiple of 3) to be rendered as triangles. Vertices are stored in the callee ImDrawList's vtx_buffer[] array, indices in idx_buffer[].
ImVec4 ClipRect; // Clipping rectangle (x1, y1, x2, y2). Subtract ImDrawData->DisplayPos to get clipping rectangle in "viewport" coordinates
ImTextureID TextureId; // User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. Ignore if never using images or multiple fonts atlas.
+ unsigned int VtxOffset; // Start offset in vertex buffer. Pre-1.71 or without ImGuiBackendFlags_RendererHasVtxOffset: always 0. With ImGuiBackendFlags_RendererHasVtxOffset: may be >0 to support meshes larger than 64K vertices with 16-bit indices.
+ unsigned int IdxOffset; // Start offset in index buffer. Always equal to sum of ElemCount drawn so far.
ImDrawCallback UserCallback; // If != NULL, call the function instead of rendering the vertices. clip_rect and texture_id will be set normally.
void* UserCallbackData; // The draw callback code can access this.
- ImDrawCmd() { ElemCount = 0; ClipRect.x = ClipRect.y = ClipRect.z = ClipRect.w = 0.0f; TextureId = (ImTextureID)NULL; UserCallback = NULL; UserCallbackData = NULL; }
+ ImDrawCmd() { ElemCount = 0; TextureId = (ImTextureID)NULL; VtxOffset = IdxOffset = 0; UserCallback = NULL; UserCallbackData = NULL; }
};
-// Vertex index (override with '#define ImDrawIdx unsigned int' inside in imconfig.h)
+// Vertex index
+// (to allow large meshes with 16-bit indices: set 'io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset' and handle ImDrawCmd::VtxOffset in the renderer back-end)
+// (to use 32-bit indices: override with '#define ImDrawIdx unsigned int' in imconfig.h)
#ifndef ImDrawIdx
typedef unsigned short ImDrawIdx;
#endif
@@ -1619,21 +1851,38 @@ struct ImDrawVert
#else
// You can override the vertex format layout by defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
// The code expect ImVec2 pos (8 bytes), ImVec2 uv (8 bytes), ImU32 col (4 bytes), but you can re-order them or add other fields as needed to simplify integration in your engine.
-// The type has to be described within the macro (you can either declare the struct or use a typedef)
+// The type has to be described within the macro (you can either declare the struct or use a typedef). This is because ImVec2/ImU32 are likely not declared a the time you'd want to set your type up.
// NOTE: IMGUI DOESN'T CLEAR THE STRUCTURE AND DOESN'T CALL A CONSTRUCTOR SO ANY CUSTOM FIELD WILL BE UNINITIALIZED. IF YOU ADD EXTRA FIELDS (SUCH AS A 'Z' COORDINATES) YOU WILL NEED TO CLEAR THEM DURING RENDER OR TO IGNORE THEM.
IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT;
#endif
-// Draw channels are used by the Columns API to "split" the render list into different channels while building, so items of each column can be batched together.
-// You can also use them to simulate drawing layers and submit primitives in a different order than how they will be rendered.
+// For use by ImDrawListSplitter.
struct ImDrawChannel
{
- ImVector CmdBuffer;
- ImVector IdxBuffer;
+ ImVector _CmdBuffer;
+ ImVector _IdxBuffer;
+};
+
+// Split/Merge functions are used to split the draw list into different layers which can be drawn into out of order.
+// This is used by the Columns api, so items of each column can be batched together in a same draw call.
+struct ImDrawListSplitter
+{
+ int _Current; // Current channel number (0)
+ int _Count; // Number of active channels (1+)
+ ImVector _Channels; // Draw channels (not resized down so _Count might be < Channels.Size)
+
+ inline ImDrawListSplitter() { Clear(); }
+ inline ~ImDrawListSplitter() { ClearFreeMemory(); }
+ inline void Clear() { _Current = 0; _Count = 1; } // Do not clear Channels[] so our allocations are reused next frame
+ IMGUI_API void ClearFreeMemory();
+ IMGUI_API void Split(ImDrawList* draw_list, int count);
+ IMGUI_API void Merge(ImDrawList* draw_list);
+ IMGUI_API void SetCurrentChannel(ImDrawList* draw_list, int channel_idx);
};
enum ImDrawCornerFlags_
{
+ ImDrawCornerFlags_None = 0,
ImDrawCornerFlags_TopLeft = 1 << 0, // 0x1
ImDrawCornerFlags_TopRight = 1 << 1, // 0x2
ImDrawCornerFlags_BotLeft = 1 << 2, // 0x4
@@ -1647,13 +1896,17 @@ enum ImDrawCornerFlags_
enum ImDrawListFlags_
{
- ImDrawListFlags_AntiAliasedLines = 1 << 0,
- ImDrawListFlags_AntiAliasedFill = 1 << 1
+ ImDrawListFlags_None = 0,
+ ImDrawListFlags_AntiAliasedLines = 1 << 0, // Lines are anti-aliased (*2 the number of triangles for 1.0f wide line, otherwise *3 the number of triangles)
+ ImDrawListFlags_AntiAliasedFill = 1 << 1, // Filled shapes have anti-aliased edges (*2 the number of vertices)
+ ImDrawListFlags_AllowVtxOffset = 1 << 2 // Can emit 'VtxOffset > 0' to allow large meshes. Set when 'ImGuiBackendFlags_RendererHasVtxOffset' is enabled.
};
// Draw command list
-// This is the low-level list of polygons that ImGui functions are filling. At the end of the frame, all command lists are passed to your ImGuiIO::RenderDrawListFn function for rendering.
-// Each ImGui window contains its own ImDrawList. You can use ImGui::GetWindowDrawList() to access the current window draw list and draw custom primitives.
+// This is the low-level list of polygons that ImGui:: functions are filling. At the end of the frame,
+// all command lists are passed to your ImGuiIO::RenderDrawListFn function for rendering.
+// Each dear imgui window contains its own ImDrawList. You can use ImGui::GetWindowDrawList() to
+// access the current window draw list and draw custom primitives.
// You can interleave normal ImGui:: calls and adding primitives to the current draw list.
// All positions are generally in pixel coordinates (top-left at (0,0), bottom-right at io.DisplaySize), but you are totally free to apply whatever transformation matrix to want to the data (if you apply such transformation you'll want to apply it to ClipRect as well)
// Important: Primitives are always added to the list and not culled (culling is done at higher-level by ImGui:: functions), if you use this API a lot consider coarse culling your drawn objects.
@@ -1668,15 +1921,14 @@ struct ImDrawList
// [Internal, used while building lists]
const ImDrawListSharedData* _Data; // Pointer to shared draw data (you can use ImGui::GetDrawListSharedData() to get the one from current ImGui context)
const char* _OwnerName; // Pointer to owner window's name for debugging
- unsigned int _VtxCurrentIdx; // [Internal] == VtxBuffer.Size
+ unsigned int _VtxCurrentOffset; // [Internal] Always 0 unless 'Flags & ImDrawListFlags_AllowVtxOffset'.
+ unsigned int _VtxCurrentIdx; // [Internal] Generally == VtxBuffer.Size unless we are past 64K vertices, in which case this gets reset to 0.
ImDrawVert* _VtxWritePtr; // [Internal] point within VtxBuffer.Data after each add command (to avoid using the ImVector<> operators too much)
ImDrawIdx* _IdxWritePtr; // [Internal] point within IdxBuffer.Data after each add command (to avoid using the ImVector<> operators too much)
ImVector _ClipRectStack; // [Internal]
ImVector _TextureIdStack; // [Internal]
ImVector _Path; // [Internal] current path building
- int _ChannelsCurrent; // [Internal] current channel number (0)
- int _ChannelsCount; // [Internal] number of active channels (1+)
- ImVector _Channels; // [Internal] draw channels for columns API (not resized down so _ChannelsCount may be smaller than _Channels.Size)
+ ImDrawListSplitter _Splitter; // [Internal] for channels api
// If you want to create ImDrawList instances, pass them ImGui::GetDrawListSharedData() or create and use your own ImDrawListSharedData (so you can use ImDrawList without ImGui)
ImDrawList(const ImDrawListSharedData* shared_data) { _Data = shared_data; _OwnerName = NULL; Clear(); }
@@ -1690,53 +1942,68 @@ struct ImDrawList
inline ImVec2 GetClipRectMax() const { const ImVec4& cr = _ClipRectStack.back(); return ImVec2(cr.z, cr.w); }
// Primitives
- IMGUI_API void AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f);
- IMGUI_API void AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners_flags = ImDrawCornerFlags_All, float thickness = 1.0f); // a: upper-left, b: lower-right, rounding_corners_flags: 4-bits corresponding to which corner to round
- IMGUI_API void AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners_flags = ImDrawCornerFlags_All); // a: upper-left, b: lower-right
- IMGUI_API void AddRectFilledMultiColor(const ImVec2& a, const ImVec2& b, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left);
- IMGUI_API void AddQuad(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, ImU32 col, float thickness = 1.0f);
- IMGUI_API void AddQuadFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, ImU32 col);
- IMGUI_API void AddTriangle(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col, float thickness = 1.0f);
- IMGUI_API void AddTriangleFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col);
- IMGUI_API void AddCircle(const ImVec2& centre, float radius, ImU32 col, int num_segments = 12, float thickness = 1.0f);
- IMGUI_API void AddCircleFilled(const ImVec2& centre, float radius, ImU32 col, int num_segments = 12);
+ // - For rectangular primitives, "p_min" and "p_max" represent the upper-left and lower-right corners.
+ // - For circle primitives, use "num_segments == 0" to automatically calculate tessellation (preferred).
+ // In future versions we will use textures to provide cheaper and higher-quality circles.
+ // Use AddNgon() and AddNgonFilled() functions if you need to guaranteed a specific number of sides.
+ IMGUI_API void AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float thickness = 1.0f);
+ IMGUI_API void AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All, float thickness = 1.0f); // a: upper-left, b: lower-right (== upper-left + size), rounding_corners_flags: 4 bits corresponding to which corner to round
+ IMGUI_API void AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All); // a: upper-left, b: lower-right (== upper-left + size)
+ IMGUI_API void AddRectFilledMultiColor(const ImVec2& p_min, const ImVec2& p_max, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left);
+ IMGUI_API void AddQuad(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness = 1.0f);
+ IMGUI_API void AddQuadFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col);
+ IMGUI_API void AddTriangle(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness = 1.0f);
+ IMGUI_API void AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col);
+ IMGUI_API void AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments = 12, float thickness = 1.0f);
+ IMGUI_API void AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments = 12);
+ IMGUI_API void AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness = 1.0f);
+ IMGUI_API void AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments);
IMGUI_API void AddText(const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL);
IMGUI_API void AddText(const ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL, float wrap_width = 0.0f, const ImVec4* cpu_fine_clip_rect = NULL);
- IMGUI_API void AddImage(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a = ImVec2(0,0), const ImVec2& uv_b = ImVec2(1,1), ImU32 col = 0xFFFFFFFF);
- IMGUI_API void AddImageQuad(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a = ImVec2(0,0), const ImVec2& uv_b = ImVec2(1,0), const ImVec2& uv_c = ImVec2(1,1), const ImVec2& uv_d = ImVec2(0,1), ImU32 col = 0xFFFFFFFF);
- IMGUI_API void AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col, float rounding, int rounding_corners = ImDrawCornerFlags_All);
- IMGUI_API void AddPolyline(const ImVec2* points, const int num_points, ImU32 col, bool closed, float thickness);
- IMGUI_API void AddConvexPolyFilled(const ImVec2* points, const int num_points, ImU32 col); // Note: Anti-aliased filling requires points to be in clockwise order.
- IMGUI_API void AddBezierCurve(const ImVec2& pos0, const ImVec2& cp0, const ImVec2& cp1, const ImVec2& pos1, ImU32 col, float thickness, int num_segments = 0);
+ IMGUI_API void AddPolyline(const ImVec2* points, int num_points, ImU32 col, bool closed, float thickness);
+ IMGUI_API void AddConvexPolyFilled(const ImVec2* points, int num_points, ImU32 col); // Note: Anti-aliased filling requires points to be in clockwise order.
+ IMGUI_API void AddBezierCurve(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0);
+
+ // Image primitives
+ // - Read FAQ to understand what ImTextureID is.
+ // - "p_min" and "p_max" represent the upper-left and lower-right corners of the rectangle.
+ // - "uv_min" and "uv_max" represent the normalized texture coordinates to use for those corners. Using (0,0)->(1,1) texture coordinates will generally display the entire texture.
+ IMGUI_API void AddImage(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min = ImVec2(0, 0), const ImVec2& uv_max = ImVec2(1, 1), ImU32 col = IM_COL32_WHITE);
+ IMGUI_API void AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& uv1 = ImVec2(0, 0), const ImVec2& uv2 = ImVec2(1, 0), const ImVec2& uv3 = ImVec2(1, 1), const ImVec2& uv4 = ImVec2(0, 1), ImU32 col = IM_COL32_WHITE);
+ IMGUI_API void AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);
// Stateful path API, add points then finish with PathFillConvex() or PathStroke()
- inline void PathClear() { _Path.resize(0); }
+ inline void PathClear() { _Path.Size = 0; }
inline void PathLineTo(const ImVec2& pos) { _Path.push_back(pos); }
- inline void PathLineToMergeDuplicate(const ImVec2& pos) { if (_Path.Size == 0 || memcmp(&_Path[_Path.Size-1], &pos, 8) != 0) _Path.push_back(pos); }
- inline void PathFillConvex(ImU32 col) { AddConvexPolyFilled(_Path.Data, _Path.Size, col); PathClear(); } // Note: Anti-aliased filling requires points to be in clockwise order.
- inline void PathStroke(ImU32 col, bool closed, float thickness = 1.0f) { AddPolyline(_Path.Data, _Path.Size, col, closed, thickness); PathClear(); }
- IMGUI_API void PathArcTo(const ImVec2& centre, float radius, float a_min, float a_max, int num_segments = 10);
- IMGUI_API void PathArcToFast(const ImVec2& centre, float radius, int a_min_of_12, int a_max_of_12); // Use precomputed angles for a 12 steps circle
- IMGUI_API void PathBezierCurveTo(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, int num_segments = 0);
- IMGUI_API void PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, int rounding_corners_flags = ImDrawCornerFlags_All);
-
- // Channels
- // - Use to simulate layers. By switching channels to can render out-of-order (e.g. submit foreground primitives before background primitives)
- // - Use to minimize draw calls (e.g. if going back-and-forth between multiple non-overlapping clipping rectangles, prefer to append into separate channels then merge at the end)
- IMGUI_API void ChannelsSplit(int channels_count);
- IMGUI_API void ChannelsMerge();
- IMGUI_API void ChannelsSetCurrent(int channel_index);
+ inline void PathLineToMergeDuplicate(const ImVec2& pos) { if (_Path.Size == 0 || memcmp(&_Path.Data[_Path.Size-1], &pos, 8) != 0) _Path.push_back(pos); }
+ inline void PathFillConvex(ImU32 col) { AddConvexPolyFilled(_Path.Data, _Path.Size, col); _Path.Size = 0; } // Note: Anti-aliased filling requires points to be in clockwise order.
+ inline void PathStroke(ImU32 col, bool closed, float thickness = 1.0f) { AddPolyline(_Path.Data, _Path.Size, col, closed, thickness); _Path.Size = 0; }
+ IMGUI_API void PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments = 10);
+ IMGUI_API void PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12); // Use precomputed angles for a 12 steps circle
+ IMGUI_API void PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0);
+ IMGUI_API void PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);
// Advanced
IMGUI_API void AddCallback(ImDrawCallback callback, void* callback_data); // Your rendering function must check for 'UserCallback' in ImDrawCmd and call the function instead of rendering triangles.
IMGUI_API void AddDrawCmd(); // This is useful if you need to forcefully create a new draw call (to allow for dependent rendering / blending). Otherwise primitives are merged into the same draw-call as much as possible
IMGUI_API ImDrawList* CloneOutput() const; // Create a clone of the CmdBuffer/IdxBuffer/VtxBuffer.
+ // Advanced: Channels
+ // - Use to split render into layers. By switching channels to can render out-of-order (e.g. submit FG primitives before BG primitives)
+ // - Use to minimize draw calls (e.g. if going back-and-forth between multiple clipping rectangles, prefer to append into separate channels then merge at the end)
+ // - FIXME-OBSOLETE: This API shouldn't have been in ImDrawList in the first place!
+ // Prefer using your own persistent copy of ImDrawListSplitter as you can stack them.
+ // Using the ImDrawList::ChannelsXXXX you cannot stack a split over another.
+ inline void ChannelsSplit(int count) { _Splitter.Split(this, count); }
+ inline void ChannelsMerge() { _Splitter.Merge(this); }
+ inline void ChannelsSetCurrent(int n) { _Splitter.SetCurrentChannel(this, n); }
+
// Internal helpers
// NB: all primitives needs to be reserved via PrimReserve() beforehand!
IMGUI_API void Clear();
IMGUI_API void ClearFreeMemory();
IMGUI_API void PrimReserve(int idx_count, int vtx_count);
+ IMGUI_API void PrimUnreserve(int idx_count, int vtx_count);
IMGUI_API void PrimRect(const ImVec2& a, const ImVec2& b, ImU32 col); // Axis aligned rectangle (composed of two triangles)
IMGUI_API void PrimRectUV(const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col);
IMGUI_API void PrimQuadUV(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a, const ImVec2& uv_b, const ImVec2& uv_c, const ImVec2& uv_d, ImU32 col);
@@ -1747,8 +2014,9 @@ struct ImDrawList
IMGUI_API void UpdateTextureID();
};
-// All draw data to render an ImGui frame
-// (NB: the style and the naming convention here is a little inconsistent but we preserve them for backward compatibility purpose)
+// All draw data to render a Dear ImGui frame
+// (NB: the style and the naming convention here is a little inconsistent, we currently preserve them for backward compatibility purpose,
+// as this is one of the oldest structure exposed by the library! Basically, ImDrawList == CmdList)
struct ImDrawData
{
bool Valid; // Only valid after Render() is called and before the next NewFrame() is called.
@@ -1758,15 +2026,20 @@ struct ImDrawData
int TotalVtxCount; // For convenience, sum of all ImDrawList's VtxBuffer.Size
ImVec2 DisplayPos; // Upper-left position of the viewport to render (== upper-left of the orthogonal projection matrix to use)
ImVec2 DisplaySize; // Size of the viewport to render (== io.DisplaySize for the main viewport) (DisplayPos + DisplaySize == lower-right of the orthogonal projection matrix to use)
+ ImVec2 FramebufferScale; // Amount of pixels for each unit of DisplaySize. Based on io.DisplayFramebufferScale. Generally (1,1) on normal display, (2,2) on OSX with Retina display.
// Functions
ImDrawData() { Valid = false; Clear(); }
~ImDrawData() { Clear(); }
- void Clear() { Valid = false; CmdLists = NULL; CmdListsCount = TotalVtxCount = TotalIdxCount = 0; DisplayPos = DisplaySize = ImVec2(0.f, 0.f); } // The ImDrawList are owned by ImGuiContext!
- IMGUI_API void DeIndexAllBuffers(); // Helper to convert all buffers from indexed to non-indexed, in case you cannot render indexed. Note: this is slow and most likely a waste of resources. Always prefer indexed rendering!
- IMGUI_API void ScaleClipRects(const ImVec2& sc); // Helper to scale the ClipRect field of each ImDrawCmd. Use if your final output buffer is at a different scale than ImGui expects, or if there is a difference between your window resolution and framebuffer resolution.
+ void Clear() { Valid = false; CmdLists = NULL; CmdListsCount = TotalVtxCount = TotalIdxCount = 0; DisplayPos = DisplaySize = FramebufferScale = ImVec2(0.f, 0.f); } // The ImDrawList are owned by ImGuiContext!
+ IMGUI_API void DeIndexAllBuffers(); // Helper to convert all buffers from indexed to non-indexed, in case you cannot render indexed. Note: this is slow and most likely a waste of resources. Always prefer indexed rendering!
+ IMGUI_API void ScaleClipRects(const ImVec2& fb_scale); // Helper to scale the ClipRect field of each ImDrawCmd. Use if your final output buffer is at a different scale than Dear ImGui expects, or if there is a difference between your window resolution and framebuffer resolution.
};
+//-----------------------------------------------------------------------------
+// Font API (ImFontConfig, ImFontGlyph, ImFontAtlasFlags, ImFontAtlas, ImFontGlyphRangesBuilder, ImFont)
+//-----------------------------------------------------------------------------
+
struct ImFontConfig
{
void* FontData; // // TTF/OTF data
@@ -1774,7 +2047,7 @@ struct ImFontConfig
bool FontDataOwnedByAtlas; // true // TTF/OTF data ownership taken by the container ImFontAtlas (will delete memory itself).
int FontNo; // 0 // Index of font within TTF/OTF file
float SizePixels; // // Size in pixels for rasterizer (more or less maps to the resulting font height).
- int OversampleH; // 3 // Rasterize at higher quality for sub-pixel positioning. We don't use sub-pixel positions on the Y axis.
+ int OversampleH; // 3 // Rasterize at higher quality for sub-pixel positioning. Read https://github.com/nothings/stb/blob/master/tests/oversample/README.md for details.
int OversampleV; // 1 // Rasterize at higher quality for sub-pixel positioning. We don't use sub-pixel positions on the Y axis.
bool PixelSnapH; // false // Align every glyph to pixel boundary. Useful e.g. if you are merging a non-pixel aligned font with the default font. If enabled, you can set OversampleH/V to 1.
ImVec2 GlyphExtraSpacing; // 0, 0 // Extra spacing (in pixels) between glyphs. Only X axis is supported for now.
@@ -1785,6 +2058,7 @@ struct ImFontConfig
bool MergeMode; // false // Merge into previous ImFont, so you can combine multiple inputs font into one ImFont (e.g. ASCII font + icons + Japanese glyphs). You may want to use GlyphOffset.y when merge font of different heights.
unsigned int RasterizerFlags; // 0x00 // Settings for custom font rasterizer (e.g. ImGuiFreeType). Leave as zero if you aren't using one.
float RasterizerMultiply; // 1.0f // Brighten (>1.0f) or darken (<1.0f) font output. Brightening small fonts may be a good workaround to make them more readable.
+ ImWchar EllipsisChar; // -1 // Explicitly specify unicode codepoint of ellipsis character. When fonts are being merged first specified ellipsis will be used.
// [Internal]
char Name[40]; // Name (strictly to ease debugging)
@@ -1801,6 +2075,35 @@ struct ImFontGlyph
float U0, V0, U1, V1; // Texture coordinates
};
+// Helper to build glyph ranges from text/string data. Feed your application strings/characters to it then call BuildRanges().
+// This is essentially a tightly packed of vector of 64k booleans = 8KB storage.
+struct ImFontGlyphRangesBuilder
+{
+ ImVector UsedChars; // Store 1-bit per Unicode code point (0=unused, 1=used)
+
+ ImFontGlyphRangesBuilder() { Clear(); }
+ inline void Clear() { int size_in_bytes = (IM_UNICODE_CODEPOINT_MAX+1) / 8; UsedChars.resize(size_in_bytes / (int)sizeof(ImU32)); memset(UsedChars.Data, 0, (size_t)size_in_bytes); }
+ inline bool GetBit(int n) const { int off = (n >> 5); ImU32 mask = 1u << (n & 31); return (UsedChars[off] & mask) != 0; } // Get bit n in the array
+ inline void SetBit(int n) { int off = (n >> 5); ImU32 mask = 1u << (n & 31); UsedChars[off] |= mask; } // Set bit n in the array
+ inline void AddChar(ImWchar c) { SetBit(c); } // Add character
+ IMGUI_API void AddText(const char* text, const char* text_end = NULL); // Add string (each character of the UTF-8 string are added)
+ IMGUI_API void AddRanges(const ImWchar* ranges); // Add ranges, e.g. builder.AddRanges(ImFontAtlas::GetGlyphRangesDefault()) to force add all of ASCII/Latin+Ext
+ IMGUI_API void BuildRanges(ImVector* out_ranges); // Output new ranges
+};
+
+// See ImFontAtlas::AddCustomRectXXX functions.
+struct ImFontAtlasCustomRect
+{
+ unsigned int ID; // Input // User ID. Use < 0x110000 to map into a font glyph, >= 0x110000 for other/internal/custom texture data.
+ unsigned short Width, Height; // Input // Desired rectangle dimension
+ unsigned short X, Y; // Output // Packed position in Atlas
+ float GlyphAdvanceX; // Input // For custom font glyphs only (ID < 0x110000): glyph xadvance
+ ImVec2 GlyphOffset; // Input // For custom font glyphs only (ID < 0x110000): glyph display offset
+ ImFont* Font; // Input // For custom font glyphs only (ID < 0x110000): target font
+ ImFontAtlasCustomRect() { ID = 0xFFFFFFFF; Width = Height = 0; X = Y = 0xFFFF; GlyphAdvanceX = 0.0f; GlyphOffset = ImVec2(0,0); Font = NULL; }
+ bool IsPacked() const { return X != 0xFFFF; }
+};
+
enum ImFontAtlasFlags_
{
ImFontAtlasFlags_None = 0,
@@ -1816,13 +2119,13 @@ enum ImFontAtlasFlags_
// - Optionally, call any of the AddFont*** functions. If you don't call any, the default font embedded in the code will be loaded for you.
// - Call GetTexDataAsAlpha8() or GetTexDataAsRGBA32() to build and retrieve pixels data.
// - Upload the pixels data into a texture within your graphics system (see imgui_impl_xxxx.cpp examples)
-// - Call SetTexID(my_tex_id); and pass the pointer/identifier to your texture in a format natural to your graphics API.
+// - Call SetTexID(my_tex_id); and pass the pointer/identifier to your texture in a format natural to your graphics API.
// This value will be passed back to you during rendering to identify the texture. Read FAQ entry about ImTextureID for more details.
// Common pitfalls:
-// - If you pass a 'glyph_ranges' array to AddFont*** functions, you need to make sure that your array persist up until the
+// - If you pass a 'glyph_ranges' array to AddFont*** functions, you need to make sure that your array persist up until the
// atlas is build (when calling GetTexData*** or Build()). We only copy the pointer, not the data.
// - Important: By default, AddFontFromMemoryTTF() takes ownership of the data. Even though we are not writing to it, we will free the pointer on destruction.
-// You can set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed,
+// You can set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed,
// - Even though many functions are suffixed with "TTF", OTF data is supported just as well.
// - This is an old API and it is currently awkward for those and and various other reasons! We will address them in the future!
struct ImFontAtlas
@@ -1843,12 +2146,12 @@ struct ImFontAtlas
// Build atlas, retrieve pixel data.
// User is in charge of copying the pixels into graphics memory (e.g. create a texture with your engine). Then store your texture handle with SetTexID().
// The pitch is always = Width * BytesPerPixels (1 or 4)
- // Building in RGBA32 format is provided for convenience and compatibility, but note that unless you manually manipulate or copy color data into
+ // Building in RGBA32 format is provided for convenience and compatibility, but note that unless you manually manipulate or copy color data into
// the texture (e.g. when using the AddCustomRect*** api), then the RGB pixels emitted will always be white (~75% of memory/bandwidth waste.
IMGUI_API bool Build(); // Build pixels data. This is called automatically for you by the GetTexData*** functions.
- IMGUI_API bool IsBuilt() { return Fonts.Size > 0 && (TexPixelsAlpha8 != NULL || TexPixelsRGBA32 != NULL); }
IMGUI_API void GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL); // 1 byte per-pixel
IMGUI_API void GetTexDataAsRGBA32(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL); // 4 bytes-per-pixel
+ bool IsBuilt() const { return Fonts.Size > 0 && (TexPixelsAlpha8 != NULL || TexPixelsRGBA32 != NULL); }
void SetTexID(ImTextureID id) { TexID = id; }
//-------------------------------------------
@@ -1857,7 +2160,7 @@ struct ImFontAtlas
// Helpers to retrieve list of common Unicode ranges (2 value per range, values are inclusive, zero-terminated list)
// NB: Make sure that your string are UTF-8 and NOT in your local code page. In C++11, you can create UTF-8 string literal using the u8"Hello world" syntax. See FAQ for details.
- // NB: Consider using GlyphRangesBuilder to build glyph ranges from textual data.
+ // NB: Consider using ImFontGlyphRangesBuilder to build glyph ranges from textual data.
IMGUI_API const ImWchar* GetGlyphRangesDefault(); // Basic Latin, Extended Latin
IMGUI_API const ImWchar* GetGlyphRangesKorean(); // Default + Korean characters
IMGUI_API const ImWchar* GetGlyphRangesJapanese(); // Default + Hiragana, Katakana, Half-Width, Selection of 1946 Ideographs
@@ -1865,45 +2168,24 @@ struct ImFontAtlas
IMGUI_API const ImWchar* GetGlyphRangesChineseSimplifiedCommon();// Default + Half-Width + Japanese Hiragana/Katakana + set of 2500 CJK Unified Ideographs for common simplified Chinese
IMGUI_API const ImWchar* GetGlyphRangesCyrillic(); // Default + about 400 Cyrillic characters
IMGUI_API const ImWchar* GetGlyphRangesThai(); // Default + Thai characters
-
- // Helpers to build glyph ranges from text data. Feed your application strings/characters to it then call BuildRanges().
- struct GlyphRangesBuilder
- {
- ImVector UsedChars; // Store 1-bit per Unicode code point (0=unused, 1=used)
- GlyphRangesBuilder() { UsedChars.resize(0x10000 / 8); memset(UsedChars.Data, 0, 0x10000 / 8); }
- bool GetBit(int n) const { return (UsedChars[n >> 3] & (1 << (n & 7))) != 0; }
- void SetBit(int n) { UsedChars[n >> 3] |= 1 << (n & 7); } // Set bit 'c' in the array
- void AddChar(ImWchar c) { SetBit(c); } // Add character
- IMGUI_API void AddText(const char* text, const char* text_end = NULL); // Add string (each character of the UTF-8 string are added)
- IMGUI_API void AddRanges(const ImWchar* ranges); // Add ranges, e.g. builder.AddRanges(ImFontAtlas::GetGlyphRangesDefault()) to force add all of ASCII/Latin+Ext
- IMGUI_API void BuildRanges(ImVector* out_ranges); // Output new ranges
- };
+ IMGUI_API const ImWchar* GetGlyphRangesVietnamese(); // Default + Vietnamese characters
//-------------------------------------------
- // Custom Rectangles/Glyphs API
+ // [BETA] Custom Rectangles/Glyphs API
//-------------------------------------------
- // You can request arbitrary rectangles to be packed into the atlas, for your own purposes. After calling Build(), you can query the rectangle position and render your pixels.
- // You can also request your rectangles to be mapped as font glyph (given a font + Unicode point), so you can render e.g. custom colorful icons and use them as regular glyphs.
- struct CustomRect
- {
- unsigned int ID; // Input // User ID. Use <0x10000 to map into a font glyph, >=0x10000 for other/internal/custom texture data.
- unsigned short Width, Height; // Input // Desired rectangle dimension
- unsigned short X, Y; // Output // Packed position in Atlas
- float GlyphAdvanceX; // Input // For custom font glyphs only (ID<0x10000): glyph xadvance
- ImVec2 GlyphOffset; // Input // For custom font glyphs only (ID<0x10000): glyph display offset
- ImFont* Font; // Input // For custom font glyphs only (ID<0x10000): target font
- CustomRect() { ID = 0xFFFFFFFF; Width = Height = 0; X = Y = 0xFFFF; GlyphAdvanceX = 0.0f; GlyphOffset = ImVec2(0,0); Font = NULL; }
- bool IsPacked() const { return X != 0xFFFF; }
- };
-
- IMGUI_API int AddCustomRectRegular(unsigned int id, int width, int height); // Id needs to be >= 0x10000. Id >= 0x80000000 are reserved for ImGui and ImDrawList
- IMGUI_API int AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset = ImVec2(0,0)); // Id needs to be < 0x10000 to register a rectangle to map into a specific font.
- const CustomRect* GetCustomRectByIndex(int index) const { if (index < 0) return NULL; return &CustomRects[index]; }
+ // You can request arbitrary rectangles to be packed into the atlas, for your own purposes.
+ // After calling Build(), you can query the rectangle position and render your pixels.
+ // You can also request your rectangles to be mapped as font glyph (given a font + Unicode point),
+ // so you can render e.g. custom colorful icons and use them as regular glyphs.
+ // Read docs/FONTS.txt for more details about using colorful icons.
+ IMGUI_API int AddCustomRectRegular(unsigned int id, int width, int height); // Id needs to be >= 0x110000. Id >= 0x80000000 are reserved for ImGui and ImDrawList
+ IMGUI_API int AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset = ImVec2(0,0)); // Id needs to be < 0x110000 to register a rectangle to map into a specific font.
+ const ImFontAtlasCustomRect*GetCustomRectByIndex(int index) const { if (index < 0) return NULL; return &CustomRects[index]; }
// [Internal]
- IMGUI_API void CalcCustomRectUV(const CustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max);
- IMGUI_API bool GetMouseCursorTexData(ImGuiMouseCursor cursor, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]);
+ IMGUI_API void CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const;
+ IMGUI_API bool GetMouseCursorTexData(ImGuiMouseCursor cursor, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]);
//-------------------------------------------
// Members
@@ -1913,7 +2195,7 @@ struct ImFontAtlas
ImFontAtlasFlags Flags; // Build flags (see ImFontAtlasFlags_)
ImTextureID TexID; // User data to refer to the texture once it has been uploaded to user's graphic systems. It is passed back to you during rendering via the ImDrawCmd structure.
int TexDesiredWidth; // Texture width desired by user before Build(). Must be a power-of-two. If have many glyphs your graphics API have texture size restrictions you may want to increase texture width to decrease height.
- int TexGlyphPadding; // Padding between glyphs within texture in pixels. Defaults to 1.
+ int TexGlyphPadding; // Padding between glyphs within texture in pixels. Defaults to 1. If your rendering method doesn't rely on bilinear filtering you may set this to 0.
// [Internal]
// NB: Access texture data via GetTexData*() calls! Which will setup a default font for you.
@@ -1924,42 +2206,47 @@ struct ImFontAtlas
ImVec2 TexUvScale; // = (1.0f/TexWidth, 1.0f/TexHeight)
ImVec2 TexUvWhitePixel; // Texture coordinates to a white pixel
ImVector Fonts; // Hold all the fonts returned by AddFont*. Fonts[0] is the default font upon calling ImGui::NewFrame(), use ImGui::PushFont()/PopFont() to change the current font.
- ImVector CustomRects; // Rectangles for packing custom texture data into the atlas.
+ ImVector CustomRects; // Rectangles for packing custom texture data into the atlas.
ImVector ConfigData; // Internal data
int CustomRectIds[1]; // Identifiers of custom texture rectangle used by ImFontAtlas/ImDrawList
+
+#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+ typedef ImFontAtlasCustomRect CustomRect; // OBSOLETED in 1.72+
+ typedef ImFontGlyphRangesBuilder GlyphRangesBuilder; // OBSOLETED in 1.67+
+#endif
};
// Font runtime data and rendering
// ImFontAtlas automatically loads a default embedded font for you when you call GetTexDataAsAlpha8() or GetTexDataAsRGBA32().
struct ImFont
{
- // Members: Hot ~62/78 bytes
- float FontSize; // // Height of characters, set during loading (don't change after loading)
- float Scale; // = 1.f // Base font scale, multiplied by the per-window font scale which you can adjust with SetFontScale()
- ImVec2 DisplayOffset; // = (0.f,0.f) // Offset font rendering by xx pixels
- ImVector Glyphs; // // All glyphs.
- ImVector IndexAdvanceX; // // Sparse. Glyphs->AdvanceX in a directly indexable way (more cache-friendly, for CalcTextSize functions which are often bottleneck in large UI).
- ImVector IndexLookup; // // Sparse. Index glyphs by Unicode code-point.
- const ImFontGlyph* FallbackGlyph; // == FindGlyph(FontFallbackChar)
- float FallbackAdvanceX; // == FallbackGlyph->AdvanceX
- ImWchar FallbackChar; // = '?' // Replacement glyph if one isn't found. Only set via SetFallbackChar()
+ // Members: Hot ~20/24 bytes (for CalcTextSize)
+ ImVector IndexAdvanceX; // 12-16 // out // // Sparse. Glyphs->AdvanceX in a directly indexable way (cache-friendly for CalcTextSize functions which only this this info, and are often bottleneck in large UI).
+ float FallbackAdvanceX; // 4 // out // = FallbackGlyph->AdvanceX
+ float FontSize; // 4 // in // // Height of characters/line, set during loading (don't change after loading)
- // Members: Cold ~18/26 bytes
- short ConfigDataCount; // ~ 1 // Number of ImFontConfig involved in creating this font. Bigger than 1 when merging multiple font sources into one ImFont.
- ImFontConfig* ConfigData; // // Pointer within ContainerAtlas->ConfigData
- ImFontAtlas* ContainerAtlas; // // What we has been loaded into
- float Ascent, Descent; // // Ascent: distance from top to bottom of e.g. 'A' [0..FontSize]
- bool DirtyLookupTables;
- int MetricsTotalSurface;// // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs)
+ // Members: Hot ~36/48 bytes (for CalcTextSize + render loop)
+ ImVector IndexLookup; // 12-16 // out // // Sparse. Index glyphs by Unicode code-point.
+ ImVector Glyphs; // 12-16 // out // // All glyphs.
+ const ImFontGlyph* FallbackGlyph; // 4-8 // out // = FindGlyph(FontFallbackChar)
+ ImVec2 DisplayOffset; // 8 // in // = (0,0) // Offset font rendering by xx pixels
+
+ // Members: Cold ~32/40 bytes
+ ImFontAtlas* ContainerAtlas; // 4-8 // out // // What we has been loaded into
+ const ImFontConfig* ConfigData; // 4-8 // in // // Pointer within ContainerAtlas->ConfigData
+ short ConfigDataCount; // 2 // in // ~ 1 // Number of ImFontConfig involved in creating this font. Bigger than 1 when merging multiple font sources into one ImFont.
+ ImWchar FallbackChar; // 2 // in // = '?' // Replacement character if a glyph isn't found. Only set via SetFallbackChar()
+ ImWchar EllipsisChar; // 2 // out // = -1 // Character used for ellipsis rendering.
+ bool DirtyLookupTables; // 1 // out //
+ float Scale; // 4 // in // = 1.f // Base font scale, multiplied by the per-window font scale which you can adjust with SetWindowFontScale()
+ float Ascent, Descent; // 4+4 // out // // Ascent: distance from top to bottom of e.g. 'A' [0..FontSize]
+ int MetricsTotalSurface;// 4 // out // // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs)
// Methods
IMGUI_API ImFont();
IMGUI_API ~ImFont();
- IMGUI_API void ClearOutputData();
- IMGUI_API void BuildLookupTable();
IMGUI_API const ImFontGlyph*FindGlyph(ImWchar c) const;
IMGUI_API const ImFontGlyph*FindGlyphNoFallback(ImWchar c) const;
- IMGUI_API void SetFallbackChar(ImWchar c);
float GetCharAdvance(ImWchar c) const { return ((int)c < IndexAdvanceX.Size) ? IndexAdvanceX[(int)c] : FallbackAdvanceX; }
bool IsLoaded() const { return ContainerAtlas != NULL; }
const char* GetDebugName() const { return ConfigData ? ConfigData->Name : ""; }
@@ -1971,19 +2258,18 @@ struct ImFont
IMGUI_API void RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c) const;
IMGUI_API void RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width = 0.0f, bool cpu_fine_clip = false) const;
- // [Internal]
+ // [Internal] Don't use!
+ IMGUI_API void BuildLookupTable();
+ IMGUI_API void ClearOutputData();
IMGUI_API void GrowIndex(int new_size);
IMGUI_API void AddGlyph(ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x);
IMGUI_API void AddRemapChar(ImWchar dst, ImWchar src, bool overwrite_dst = true); // Makes 'dst' character/glyph points to 'src' character/glyph. Currently needs to be called AFTER fonts have been built.
-
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
- typedef ImFontGlyph Glyph; // OBSOLETE 1.52+
-#endif
+ IMGUI_API void SetFallbackChar(ImWchar c);
};
#if defined(__clang__)
#pragma clang diagnostic pop
-#elif defined(__GNUC__) && __GNUC__ >= 8
+#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
@@ -1991,3 +2277,5 @@ struct ImFont
#ifdef IMGUI_INCLUDE_IMGUI_USER_H
#include "imgui_user.h"
#endif
+
+#endif // #ifndef IMGUI_DISABLE
diff --git a/src/imgui/imgui_demo.cpp b/src/imgui/imgui_demo.cpp
index 3173ab858d..7664f1b4bb 100644
--- a/src/imgui/imgui_demo.cpp
+++ b/src/imgui/imgui_demo.cpp
@@ -1,25 +1,41 @@
-// dear imgui, v1.66 WIP
+// dear imgui, v1.75
// (demo code)
+// Help:
+// - Read FAQ at http://dearimgui.org/faq
+// - Newcomers, read 'Programmer guide' in imgui.cpp for notes on how to setup Dear ImGui in your codebase.
+// - Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. All applications in examples/ are doing that.
+// Read imgui.cpp for more details, documentation and comments.
+// Get latest version at https://github.com/ocornut/imgui
+
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base:
// Do NOT remove this file from your project! Think again! It is the most useful reference code that you and other coders
-// will want to refer to and call. Have the ImGui::ShowDemoWindow() function wired in an always-available debug menu of
-// your game/app! Removing this file from your project is hindering access to documentation for everyone in your team,
+// will want to refer to and call. Have the ImGui::ShowDemoWindow() function wired in an always-available debug menu of
+// your game/app! Removing this file from your project is hindering access to documentation for everyone in your team,
// likely leading you to poorer usage of the library.
// Everything in this file will be stripped out by the linker if you don't call ImGui::ShowDemoWindow().
-// If you want to link core Dear ImGui in your shipped builds but want an easy guarantee that the demo will not be linked,
+// If you want to link core Dear ImGui in your shipped builds but want a thorough guarantee that the demo will not be linked,
// you can setup your imconfig.h with #define IMGUI_DISABLE_DEMO_WINDOWS and those functions will be empty.
// In other situation, whenever you have Dear ImGui available you probably want this to be available for reference.
// Thank you,
-// -Your beloved friend, imgui_demo.cpp (that you won't delete)
+// -Your beloved friend, imgui_demo.cpp (which you won't delete)
-// Message to beginner C/C++ programmers about the meaning of the 'static' keyword:
-// In this demo code, we frequently we use 'static' variables inside functions. A static variable persist across calls, so it is
-// essentially like a global variable but declared inside the scope of the function. We do this as a way to gather code and data
+// Message to beginner C/C++ programmers about the meaning of the 'static' keyword:
+// In this demo code, we frequently we use 'static' variables inside functions. A static variable persist across calls, so it is
+// essentially like a global variable but declared inside the scope of the function. We do this as a way to gather code and data
// in the same place, to make the demo source code faster to read, faster to write, and smaller in size.
-// It also happens to be a convenient way of storing simple UI related information as long as your function doesn't need to be reentrant
-// or used in threads. This might be a pattern you will want to use in your code, but most of the real data you would be editing is
-// likely going to be stored outside your functions.
+// It also happens to be a convenient way of storing simple UI related information as long as your function doesn't need to be
+// reentrant or used in multiple threads. This might be a pattern you will want to use in your code, but most of the real data
+// you would be editing is likely going to be stored outside your functions.
+
+// The Demo code in this file is designed to be easy to copy-and-paste in into your application!
+// Because of this:
+// - We never omit the ImGui:: namespace when calling functions, even though most of our code is already in the same namespace.
+// - We try to declare static variables in the local scope, as close as possible to the code using them.
+// - We never use any of the helpers/facilities used internally by Dear ImGui, unless it has been exposed in the public API (imgui.h).
+// - We never use maths operators on ImVec2/ImVec4. For other of our sources files, they are provided by imgui_internal.h w/ IMGUI_DEFINE_MATH_OPERATORS.
+// For your own sources file they are optional and require you either enable those, either provide your own via IM_VEC2_CLASS_EXTRA in imconfig.h.
+// Because we don't want to assume anything about your support of maths operators, we don't use them in imgui_demo.cpp.
/*
@@ -27,6 +43,7 @@ Index of this file:
// [SECTION] Forward Declarations, Helpers
// [SECTION] Demo Window / ShowDemoWindow()
+// [SECTION] About Window / ShowAboutWindow()
// [SECTION] Style Editor / ShowStyleEditor()
// [SECTION] Example App: Main Menu Bar / ShowExampleAppMainMenuBar()
// [SECTION] Example App: Debug Console / ShowExampleAppConsole()
@@ -39,6 +56,7 @@ Index of this file:
// [SECTION] Example App: Simple Overlay / ShowExampleAppSimpleOverlay()
// [SECTION] Example App: Manipulating Window Titles / ShowExampleAppWindowTitles()
// [SECTION] Example App: Custom Rendering using ImDrawList API / ShowExampleAppCustomRendering()
+// [SECTION] Example App: Documents Handling / ShowExampleAppDocuments()
*/
@@ -47,7 +65,9 @@ Index of this file:
#endif
#include "imgui.h"
-#include // toupper, isprint
+#ifndef IMGUI_DISABLE
+
+#include // toupper
#include // INT_MIN, INT_MAX
#include // sqrtf, powf, cosf, sinf, floorf, ceilf
#include // vsnprintf, sscanf, printf
@@ -60,47 +80,54 @@ Index of this file:
#ifdef _MSC_VER
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
-#define vsnprintf _vsnprintf
#endif
-#ifdef __clang__
+#if defined(__clang__)
#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse.
#pragma clang diagnostic ignored "-Wdeprecated-declarations" // warning : 'xx' is deprecated: The POSIX name for this item.. // for strdup used in demo code (so user can copy & paste the code)
#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int'
#pragma clang diagnostic ignored "-Wformat-security" // warning : warning: format string is not a string literal
#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning : declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals.
+#pragma clang diagnostic ignored "-Wunused-macros" // warning : warning: macro is not used // we define snprintf/vsnprintf on Windows so they are available, but not always used.
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0
+#endif
+#if __has_warning("-Wdouble-promotion")
+#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
+#endif
#if __has_warning("-Wreserved-id-macro")
#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning : macro name is a reserved identifier //
#endif
#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size
#pragma GCC diagnostic ignored "-Wformat-security" // warning : format string is not a string literal (potentially insecure)
#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function
#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value
-#if (__GNUC__ >= 6)
-#pragma GCC diagnostic ignored "-Wmisleading-indentation" // warning: this 'if' clause does not guard this statement // GCC 6.0+ only. See #883 on GitHub.
-#endif
+#pragma GCC diagnostic ignored "-Wmisleading-indentation" // [__GNUC__ >= 6] warning: this 'if' clause does not guard this statement // GCC 6.0+ only. See #883 on GitHub.
#endif
-// Play it nice with Windows users. Notepad in 2017 still doesn't display text data with Unix-style \n.
+// Play it nice with Windows users (Update: since 2018-05, Notepad finally appears to support Unix-style carriage returns!)
#ifdef _WIN32
-#define IM_NEWLINE "\r\n"
+#define IM_NEWLINE "\r\n"
#else
-#define IM_NEWLINE "\n"
+#define IM_NEWLINE "\n"
#endif
-#define IM_MAX(_A,_B) (((_A) >= (_B)) ? (_A) : (_B))
+#if defined(_MSC_VER) && !defined(snprintf)
+#define snprintf _snprintf
+#endif
+#if defined(_MSC_VER) && !defined(vsnprintf)
+#define vsnprintf _vsnprintf
+#endif
//-----------------------------------------------------------------------------
// [SECTION] Forward Declarations, Helpers
//-----------------------------------------------------------------------------
-#if !defined(IMGUI_DISABLE_OBSOLETE_FUNCTIONS) && defined(IMGUI_DISABLE_TEST_WINDOWS) && !defined(IMGUI_DISABLE_DEMO_WINDOWS) // Obsolete name since 1.53, TEST->DEMO
-#define IMGUI_DISABLE_DEMO_WINDOWS
-#endif
-
#if !defined(IMGUI_DISABLE_DEMO_WINDOWS)
// Forward Declarations
+static void ShowExampleAppDocuments(bool* p_open);
static void ShowExampleAppMainMenuBar();
static void ShowExampleAppConsole(bool* p_open);
static void ShowExampleAppLog(bool* p_open);
@@ -115,7 +142,8 @@ static void ShowExampleAppCustomRendering(bool* p_open);
static void ShowExampleMenuFile();
// Helper to display a little (?) mark which shows a tooltip when hovered.
-static void ShowHelpMarker(const char* desc)
+// In your own code you may want to display an actual icon if you are using a merged icon fonts (see docs/FONTS.txt)
+static void HelpMarker(const char* desc)
{
ImGui::TextDisabled("(?)");
if (ImGui::IsItemHovered())
@@ -131,29 +159,42 @@ static void ShowHelpMarker(const char* desc)
// Helper to display basic user controls.
void ImGui::ShowUserGuide()
{
+ ImGuiIO& io = ImGui::GetIO();
ImGui::BulletText("Double-click on title bar to collapse window.");
- ImGui::BulletText("Click and drag on lower right corner to resize window\n(double-click to auto fit window to its contents).");
- ImGui::BulletText("Click and drag on any empty space to move window.");
- ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields.");
+ ImGui::BulletText("Click and drag on lower corner to resize window\n(double-click to auto fit window to its contents).");
ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text.");
- if (ImGui::GetIO().FontAllowUserScaling)
+ ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields.");
+ if (io.FontAllowUserScaling)
ImGui::BulletText("CTRL+Mouse Wheel to zoom window contents.");
- ImGui::BulletText("Mouse Wheel to scroll.");
- ImGui::BulletText("While editing text:\n");
+ ImGui::BulletText("While inputing text:\n");
ImGui::Indent();
- ImGui::BulletText("Hold SHIFT or use mouse to select text.");
ImGui::BulletText("CTRL+Left/Right to word jump.");
ImGui::BulletText("CTRL+A or double-click to select all.");
- ImGui::BulletText("CTRL+X,CTRL+C,CTRL+V to use clipboard.");
+ ImGui::BulletText("CTRL+X/C/V to use clipboard cut/copy/paste.");
ImGui::BulletText("CTRL+Z,CTRL+Y to undo/redo.");
ImGui::BulletText("ESCAPE to revert.");
ImGui::BulletText("You can apply arithmetic operators +,*,/ on numerical values.\nUse +- to subtract.");
ImGui::Unindent();
+ ImGui::BulletText("With keyboard navigation enabled:");
+ ImGui::Indent();
+ ImGui::BulletText("Arrow keys to navigate.");
+ ImGui::BulletText("Space to activate a widget.");
+ ImGui::BulletText("Return to input text into a widget.");
+ ImGui::BulletText("Escape to deactivate a widget, close popup, exit child window.");
+ ImGui::BulletText("Alt to jump to the menu layer of a window.");
+ ImGui::BulletText("CTRL+Tab to select a window.");
+ ImGui::Unindent();
}
//-----------------------------------------------------------------------------
// [SECTION] Demo Window / ShowDemoWindow()
//-----------------------------------------------------------------------------
+// - ShowDemoWindowWidgets()
+// - ShowDemoWindowLayout()
+// - ShowDemoWindowPopups()
+// - ShowDemoWindowColumns()
+// - ShowDemoWindowMisc()
+//-----------------------------------------------------------------------------
// We split the contents of the big ShowDemoWindow() function into smaller functions (because the link time of very large functions grow non-linearly)
static void ShowDemoWindowWidgets();
@@ -166,7 +207,10 @@ static void ShowDemoWindowMisc();
// You may execute this function to experiment with the UI and understand what it does. You may then search for keywords in the code when you are interested by a specific feature.
void ImGui::ShowDemoWindow(bool* p_open)
{
+ IM_ASSERT(ImGui::GetCurrentContext() != NULL && "Missing dear imgui context. Refer to examples app!"); // Exceptionally add an extra assert here for people confused with initial dear imgui setup
+
// Examples Apps (accessible from the "Examples" menu)
+ static bool show_app_documents = false;
static bool show_app_main_menu_bar = false;
static bool show_app_console = false;
static bool show_app_log = false;
@@ -179,6 +223,7 @@ void ImGui::ShowDemoWindow(bool* p_open)
static bool show_app_window_titles = false;
static bool show_app_custom_rendering = false;
+ if (show_app_documents) ShowExampleAppDocuments(&show_app_documents);
if (show_app_main_menu_bar) ShowExampleAppMainMenuBar();
if (show_app_console) ShowExampleAppConsole(&show_app_console);
if (show_app_log) ShowExampleAppLog(&show_app_log);
@@ -191,22 +236,14 @@ void ImGui::ShowDemoWindow(bool* p_open)
if (show_app_window_titles) ShowExampleAppWindowTitles(&show_app_window_titles);
if (show_app_custom_rendering) ShowExampleAppCustomRendering(&show_app_custom_rendering);
- // Dear ImGui Apps (accessible from the "Help" menu)
+ // Dear ImGui Apps (accessible from the "Tools" menu)
static bool show_app_metrics = false;
static bool show_app_style_editor = false;
static bool show_app_about = false;
if (show_app_metrics) { ImGui::ShowMetricsWindow(&show_app_metrics); }
if (show_app_style_editor) { ImGui::Begin("Style Editor", &show_app_style_editor); ImGui::ShowStyleEditor(); ImGui::End(); }
- if (show_app_about)
- {
- ImGui::Begin("About Dear ImGui", &show_app_about, ImGuiWindowFlags_AlwaysAutoResize);
- ImGui::Text("Dear ImGui, %s", ImGui::GetVersion());
- ImGui::Separator();
- ImGui::Text("By Omar Cornut and all dear imgui contributors.");
- ImGui::Text("Dear ImGui is licensed under the MIT License, see LICENSE for more information.");
- ImGui::End();
- }
+ if (show_app_about) { ImGui::ShowAboutWindow(&show_app_about); }
// Demonstrate the various window flags. Typically you would just use the default!
static bool no_titlebar = false;
@@ -237,19 +274,18 @@ void ImGui::ShowDemoWindow(bool* p_open)
ImGui::SetNextWindowSize(ImVec2(550, 680), ImGuiCond_FirstUseEver);
// Main body of the Demo window starts here.
- if (!ImGui::Begin("ImGui Demo", p_open, window_flags))
+ if (!ImGui::Begin("Dear ImGui Demo", p_open, window_flags))
{
// Early out if the window is collapsed, as an optimization.
ImGui::End();
return;
}
- ImGui::Text("dear imgui says hello. (%s)", IMGUI_VERSION);
// Most "big" widgets share a common width settings by default.
//ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.65f); // Use 2/3 of the space for widgets and 1/3 for labels (default)
ImGui::PushItemWidth(ImGui::GetFontSize() * -12); // Use fixed width for labels (by passing a negative value), the rest goes to widgets. We choose a width proportional to our font size.
- // Menu
+ // Menu Bar
if (ImGui::BeginMenuBar())
{
if (ImGui::BeginMenu("Menu"))
@@ -270,9 +306,10 @@ void ImGui::ShowDemoWindow(bool* p_open)
ImGui::MenuItem("Simple overlay", NULL, &show_app_simple_overlay);
ImGui::MenuItem("Manipulating window titles", NULL, &show_app_window_titles);
ImGui::MenuItem("Custom rendering", NULL, &show_app_custom_rendering);
+ ImGui::MenuItem("Documents", NULL, &show_app_documents);
ImGui::EndMenu();
}
- if (ImGui::BeginMenu("Help"))
+ if (ImGui::BeginMenu("Tools"))
{
ImGui::MenuItem("Metrics", NULL, &show_app_metrics);
ImGui::MenuItem("Style Editor", NULL, &show_app_style_editor);
@@ -282,15 +319,25 @@ void ImGui::ShowDemoWindow(bool* p_open)
ImGui::EndMenuBar();
}
+ ImGui::Text("dear imgui says hello. (%s)", IMGUI_VERSION);
ImGui::Spacing();
+
if (ImGui::CollapsingHeader("Help"))
{
+ ImGui::Text("ABOUT THIS DEMO:");
+ ImGui::BulletText("Sections below are demonstrating many aspects of the library.");
+ ImGui::BulletText("The \"Examples\" menu above leads to more demo contents.");
+ ImGui::BulletText("The \"Tools\" menu above gives access to: About Box, Style Editor,\n"
+ "and Metrics (general purpose Dear ImGui debugging tool).");
+ ImGui::Separator();
+
ImGui::Text("PROGRAMMER GUIDE:");
- ImGui::BulletText("Please see the ShowDemoWindow() code in imgui_demo.cpp. <- you are here!");
- ImGui::BulletText("Please see the comments in imgui.cpp.");
- ImGui::BulletText("Please see the examples/ in application.");
- ImGui::BulletText("Enable 'io.ConfigFlags |= NavEnableKeyboard' for keyboard controls.");
- ImGui::BulletText("Enable 'io.ConfigFlags |= NavEnableGamepad' for gamepad controls.");
+ ImGui::BulletText("See the ShowDemoWindow() code in imgui_demo.cpp. <- you are here!");
+ ImGui::BulletText("See comments in imgui.cpp.");
+ ImGui::BulletText("See example applications in the examples/ folder.");
+ ImGui::BulletText("Read the FAQ at http://www.dearimgui.org/faq/");
+ ImGui::BulletText("Set 'io.ConfigFlags |= NavEnableKeyboard' for keyboard controls.");
+ ImGui::BulletText("Set 'io.ConfigFlags |= NavEnableGamepad' for gamepad controls.");
ImGui::Separator();
ImGui::Text("USER GUIDE:");
@@ -305,9 +352,9 @@ void ImGui::ShowDemoWindow(bool* p_open)
{
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableKeyboard", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NavEnableKeyboard);
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableGamepad", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NavEnableGamepad);
- ImGui::SameLine(); ShowHelpMarker("Required back-end to feed in gamepad inputs in io.NavInputs[] and set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details.");
+ ImGui::SameLine(); HelpMarker("Required back-end to feed in gamepad inputs in io.NavInputs[] and set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details.");
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableSetMousePos", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NavEnableSetMousePos);
- ImGui::SameLine(); ShowHelpMarker("Instruct navigation to move the mouse cursor. See comment for ImGuiConfigFlags_NavEnableSetMousePos.");
+ ImGui::SameLine(); HelpMarker("Instruct navigation to move the mouse cursor. See comment for ImGuiConfigFlags_NavEnableSetMousePos.");
ImGui::CheckboxFlags("io.ConfigFlags: NoMouse", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NoMouse);
if (io.ConfigFlags & ImGuiConfigFlags_NoMouse) // Create a way to restore this flag otherwise we could be stuck completely!
{
@@ -320,29 +367,33 @@ void ImGui::ShowDemoWindow(bool* p_open)
io.ConfigFlags &= ~ImGuiConfigFlags_NoMouse;
}
ImGui::CheckboxFlags("io.ConfigFlags: NoMouseCursorChange", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NoMouseCursorChange);
- ImGui::SameLine(); ShowHelpMarker("Instruct back-end to not alter mouse cursor shape and visibility.");
+ ImGui::SameLine(); HelpMarker("Instruct back-end to not alter mouse cursor shape and visibility.");
ImGui::Checkbox("io.ConfigInputTextCursorBlink", &io.ConfigInputTextCursorBlink);
- ImGui::SameLine(); ShowHelpMarker("Set to false to disable blinking cursor, for users who consider it distracting");
- ImGui::Checkbox("io.ConfigResizeWindowsFromEdges [beta]", &io.ConfigResizeWindowsFromEdges);
- ImGui::SameLine(); ShowHelpMarker("Enable resizing of windows from their edges and from the lower-left corner.\nThis requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback.");
+ ImGui::SameLine(); HelpMarker("Set to false to disable blinking cursor, for users who consider it distracting");
+ ImGui::Checkbox("io.ConfigWindowsResizeFromEdges", &io.ConfigWindowsResizeFromEdges);
+ ImGui::SameLine(); HelpMarker("Enable resizing of windows from their edges and from the lower-left corner.\nThis requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback.");
+ ImGui::Checkbox("io.ConfigWindowsMoveFromTitleBarOnly", &io.ConfigWindowsMoveFromTitleBarOnly);
ImGui::Checkbox("io.MouseDrawCursor", &io.MouseDrawCursor);
- ImGui::SameLine(); ShowHelpMarker("Instruct Dear ImGui to render a mouse cursor for you. Note that a mouse cursor rendered via your application GPU rendering path will feel more laggy than hardware cursor, but will be more in sync with your other visuals.\n\nSome desktop applications may use both kinds of cursors (e.g. enable software cursor only when resizing/dragging something).");
+ ImGui::SameLine(); HelpMarker("Instruct Dear ImGui to render a mouse cursor for you. Note that a mouse cursor rendered via your application GPU rendering path will feel more laggy than hardware cursor, but will be more in sync with your other visuals.\n\nSome desktop applications may use both kinds of cursors (e.g. enable software cursor only when resizing/dragging something).");
ImGui::TreePop();
ImGui::Separator();
}
if (ImGui::TreeNode("Backend Flags"))
{
- ImGuiBackendFlags backend_flags = io.BackendFlags; // Make a local copy to avoid modifying the back-end flags.
+ HelpMarker("Those flags are set by the back-ends (imgui_impl_xxx files) to specify their capabilities.\nHere we expose then as read-only fields to avoid breaking interactions with your back-end.");
+ ImGuiBackendFlags backend_flags = io.BackendFlags; // Make a local copy to avoid modifying actual back-end flags.
ImGui::CheckboxFlags("io.BackendFlags: HasGamepad", (unsigned int *)&backend_flags, ImGuiBackendFlags_HasGamepad);
ImGui::CheckboxFlags("io.BackendFlags: HasMouseCursors", (unsigned int *)&backend_flags, ImGuiBackendFlags_HasMouseCursors);
ImGui::CheckboxFlags("io.BackendFlags: HasSetMousePos", (unsigned int *)&backend_flags, ImGuiBackendFlags_HasSetMousePos);
+ ImGui::CheckboxFlags("io.BackendFlags: RendererHasVtxOffset", (unsigned int *)&backend_flags, ImGuiBackendFlags_RendererHasVtxOffset);
ImGui::TreePop();
ImGui::Separator();
}
if (ImGui::TreeNode("Style"))
{
+ HelpMarker("The same contents can be accessed in 'Tools->Style Editor' or by calling the ShowStyleEditor() function.");
ImGui::ShowStyleEditor();
ImGui::TreePop();
ImGui::Separator();
@@ -351,7 +402,7 @@ void ImGui::ShowDemoWindow(bool* p_open)
if (ImGui::TreeNode("Capture/Logging"))
{
ImGui::TextWrapped("The logging API redirects all text output so you can easily capture the content of a window or a block. Tree nodes can be automatically expanded.");
- ShowHelpMarker("Try opening any of the contents below in this window and then click one of the \"Log To\" button.");
+ HelpMarker("Try opening any of the contents below in this window and then click one of the \"Log To\" button.");
ImGui::LogButtons();
ImGui::TextWrapped("You can also call ImGui::LogText() to output directly to the log without a visual output.");
if (ImGui::Button("Copy \"Hello, world!\" to clipboard"))
@@ -416,7 +467,7 @@ static void ShowDemoWindowWidgets()
// Color buttons, demonstrate using PushID() to add unique identifier in the ID stack, and changing style.
for (int i = 0; i < 7; i++)
{
- if (i > 0)
+ if (i > 0)
ImGui::SameLine();
ImGui::PushID(i);
ImGui::PushStyleColor(ImGuiCol_Button, (ImVec4)ImColor::HSV(i/7.0f, 0.6f, 0.6f));
@@ -468,27 +519,32 @@ static void ShowDemoWindowWidgets()
const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" };
static int item_current = 0;
ImGui::Combo("combo", &item_current, items, IM_ARRAYSIZE(items));
- ImGui::SameLine(); ShowHelpMarker("Refer to the \"Combo\" section below for an explanation of the full BeginCombo/EndCombo API, and demonstration of various flags.\n");
+ ImGui::SameLine(); HelpMarker("Refer to the \"Combo\" section below for an explanation of the full BeginCombo/EndCombo API, and demonstration of various flags.\n");
}
{
+ // To wire InputText() with std::string or any other custom string type,
+ // see the "Text Input > Resize Callback" section of this demo, and the misc/cpp/imgui_stdlib.h file.
static char str0[128] = "Hello, world!";
- static int i0 = 123;
ImGui::InputText("input text", str0, IM_ARRAYSIZE(str0));
- ImGui::SameLine(); ShowHelpMarker("USER:\nHold SHIFT or use mouse to select text.\n" "CTRL+Left/Right to word jump.\n" "CTRL+A or double-click to select all.\n" "CTRL+X,CTRL+C,CTRL+V clipboard.\n" "CTRL+Z,CTRL+Y undo/redo.\n" "ESCAPE to revert.\n\nPROGRAMMER:\nYou can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputText() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example (this is not demonstrated in imgui_demo.cpp).");
+ ImGui::SameLine(); HelpMarker("USER:\nHold SHIFT or use mouse to select text.\n" "CTRL+Left/Right to word jump.\n" "CTRL+A or double-click to select all.\n" "CTRL+X,CTRL+C,CTRL+V clipboard.\n" "CTRL+Z,CTRL+Y undo/redo.\n" "ESCAPE to revert.\n\nPROGRAMMER:\nYou can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputText() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example (this is not demonstrated in imgui_demo.cpp).");
+ static char str1[128] = "";
+ ImGui::InputTextWithHint("input text (w/ hint)", "enter text here", str1, IM_ARRAYSIZE(str1));
+
+ static int i0 = 123;
ImGui::InputInt("input int", &i0);
- ImGui::SameLine(); ShowHelpMarker("You can apply arithmetic operators +,*,/ on numerical values.\n e.g. [ 100 ], input \'*2\', result becomes [ 200 ]\nUse +- to subtract.\n");
+ ImGui::SameLine(); HelpMarker("You can apply arithmetic operators +,*,/ on numerical values.\n e.g. [ 100 ], input \'*2\', result becomes [ 200 ]\nUse +- to subtract.\n");
static float f0 = 0.001f;
- ImGui::InputFloat("input float", &f0, 0.01f, 1.0f);
+ ImGui::InputFloat("input float", &f0, 0.01f, 1.0f, "%.3f");
static double d0 = 999999.00000001;
ImGui::InputDouble("input double", &d0, 0.01f, 1.0f, "%.8f");
static float f1 = 1.e10f;
ImGui::InputFloat("input scientific", &f1, 0.0f, 0.0f, "%e");
- ImGui::SameLine(); ShowHelpMarker("You can input value using the scientific notation,\n e.g. \"1e+8\" becomes \"100000000\".\n");
+ ImGui::SameLine(); HelpMarker("You can input value using the scientific notation,\n e.g. \"1e+8\" becomes \"100000000\".\n");
static float vec4a[4] = { 0.10f, 0.20f, 0.30f, 0.44f };
ImGui::InputFloat3("input float3", vec4a);
@@ -497,7 +553,7 @@ static void ShowDemoWindowWidgets()
{
static int i1 = 50, i2 = 42;
ImGui::DragInt("drag int", &i1, 1);
- ImGui::SameLine(); ShowHelpMarker("Click and drag to edit value.\nHold SHIFT/ALT for faster/slower edit.\nDouble-click or CTRL+click to input value.");
+ ImGui::SameLine(); HelpMarker("Click and drag to edit value.\nHold SHIFT/ALT for faster/slower edit.\nDouble-click or CTRL+click to input value.");
ImGui::DragInt("drag int 0..100", &i2, 1, 0, 100, "%d%%");
@@ -509,20 +565,31 @@ static void ShowDemoWindowWidgets()
{
static int i1=0;
ImGui::SliderInt("slider int", &i1, -1, 3);
- ImGui::SameLine(); ShowHelpMarker("CTRL+click to input value.");
+ ImGui::SameLine(); HelpMarker("CTRL+click to input value.");
static float f1=0.123f, f2=0.0f;
ImGui::SliderFloat("slider float", &f1, 0.0f, 1.0f, "ratio = %.3f");
ImGui::SliderFloat("slider float (curve)", &f2, -10.0f, 10.0f, "%.4f", 2.0f);
+
static float angle = 0.0f;
ImGui::SliderAngle("slider angle", &angle);
+
+ // Using the format string to display a name instead of an integer.
+ // Here we completely omit '%d' from the format string, so it'll only display a name.
+ // This technique can also be used with DragInt().
+ enum Element { Element_Fire, Element_Earth, Element_Air, Element_Water, Element_COUNT };
+ const char* element_names[Element_COUNT] = { "Fire", "Earth", "Air", "Water" };
+ static int current_element = Element_Fire;
+ const char* current_element_name = (current_element >= 0 && current_element < Element_COUNT) ? element_names[current_element] : "Unknown";
+ ImGui::SliderInt("slider enum", ¤t_element, 0, Element_COUNT - 1, current_element_name);
+ ImGui::SameLine(); HelpMarker("Using the format string parameter to display a name instead of the underlying integer.");
}
{
static float col1[3] = { 1.0f,0.0f,0.2f };
static float col2[4] = { 0.4f,0.7f,0.0f,0.5f };
ImGui::ColorEdit3("color 1", col1);
- ImGui::SameLine(); ShowHelpMarker("Click on the colored square to open a color picker.\nClick and hold to use drag and drop.\nRight-click on the colored square to show options.\nCTRL+click on individual component to input value.\n");
+ ImGui::SameLine(); HelpMarker("Click on the colored square to open a color picker.\nClick and hold to use drag and drop.\nRight-click on the colored square to show options.\nCTRL+click on individual component to input value.\n");
ImGui::ColorEdit4("color 2", col2);
}
@@ -534,9 +601,8 @@ static void ShowDemoWindowWidgets()
ImGui::ListBox("listbox\n(single select)", &listbox_item_current, listbox_items, IM_ARRAYSIZE(listbox_items), 4);
//static int listbox_item_current2 = 2;
- //ImGui::PushItemWidth(-1);
+ //ImGui::SetNextItemWidth(-1);
//ImGui::ListBox("##listbox2", &listbox_item_current2, listbox_items, IM_ARRAYSIZE(listbox_items), 4);
- //ImGui::PopItemWidth();
}
ImGui::TreePop();
@@ -553,20 +619,32 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("Basic trees"))
{
for (int i = 0; i < 5; i++)
+ {
+ // Use SetNextItemOpen() so set the default state of a node to be open.
+ // We could also use TreeNodeEx() with the ImGuiTreeNodeFlags_DefaultOpen flag to achieve the same thing!
+ if (i == 0)
+ ImGui::SetNextItemOpen(true, ImGuiCond_Once);
+
if (ImGui::TreeNode((void*)(intptr_t)i, "Child %d", i))
{
ImGui::Text("blah blah");
ImGui::SameLine();
- if (ImGui::SmallButton("button")) { };
+ if (ImGui::SmallButton("button")) {};
ImGui::TreePop();
}
+ }
ImGui::TreePop();
}
if (ImGui::TreeNode("Advanced, with Selectable nodes"))
{
- ShowHelpMarker("This is a more standard looking tree with selectable nodes.\nClick to select, CTRL+Click to toggle, click on arrows or double-click to open.");
+ HelpMarker("This is a more typical looking tree with selectable nodes.\nClick to select, CTRL+Click to toggle, click on arrows or double-click to open.");
+ static ImGuiTreeNodeFlags base_flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_SpanAvailWidth;
static bool align_label_with_current_x_position = false;
+ ImGui::CheckboxFlags("ImGuiTreeNodeFlags_OpenOnArrow", (unsigned int*)&base_flags, ImGuiTreeNodeFlags_OpenOnArrow);
+ ImGui::CheckboxFlags("ImGuiTreeNodeFlags_OpenOnDoubleClick", (unsigned int*)&base_flags, ImGuiTreeNodeFlags_OpenOnDoubleClick);
+ ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanAvailWidth", (unsigned int*)&base_flags, ImGuiTreeNodeFlags_SpanAvailWidth);
+ ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanFullWidth", (unsigned int*)&base_flags, ImGuiTreeNodeFlags_SpanFullWidth);
ImGui::Checkbox("Align label with current X position)", &align_label_with_current_x_position);
ImGui::Text("Hello!");
if (align_label_with_current_x_position)
@@ -574,26 +652,30 @@ static void ShowDemoWindowWidgets()
static int selection_mask = (1 << 2); // Dumb representation of what may be user-side selection state. You may carry selection state inside or outside your objects in whatever format you see fit.
int node_clicked = -1; // Temporary storage of what node we have clicked to process selection at the end of the loop. May be a pointer to your own node type, etc.
- ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, ImGui::GetFontSize()*3); // Increase spacing to differentiate leaves from expanded contents.
for (int i = 0; i < 6; i++)
{
// Disable the default open on single-click behavior and pass in Selected flag according to our selection state.
- ImGuiTreeNodeFlags node_flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ((selection_mask & (1 << i)) ? ImGuiTreeNodeFlags_Selected : 0);
+ ImGuiTreeNodeFlags node_flags = base_flags;
+ const bool is_selected = (selection_mask & (1 << i)) != 0;
+ if (is_selected)
+ node_flags |= ImGuiTreeNodeFlags_Selected;
if (i < 3)
{
- // Node
+ // Items 0..2 are Tree Node
bool node_open = ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Node %d", i);
if (ImGui::IsItemClicked())
node_clicked = i;
if (node_open)
{
- ImGui::Text("Blah blah\nBlah Blah");
+ ImGui::BulletText("Blah blah\nBlah Blah");
ImGui::TreePop();
}
}
else
{
- // Leaf: The only reason we have a TreeNode at all is to allow selection of the leaf. Otherwise we can use BulletText() or TreeAdvanceToLabelPos()+Text().
+ // Items 3..5 are Tree Leaves
+ // The only reason we use TreeNode at all is to allow selection of the leaf.
+ // Otherwise we can use BulletText() or advance the cursor by GetTreeNodeToLabelSpacing() and call Text().
node_flags |= ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen; // ImGuiTreeNodeFlags_Bullet
ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Leaf %d", i);
if (ImGui::IsItemClicked())
@@ -608,7 +690,6 @@ static void ShowDemoWindowWidgets()
else //if (!(selection_mask & (1 << node_clicked))) // Depending on selection behavior you want, this commented bit preserve selection when clicking on item that is part of the selection
selection_mask = (1 << node_clicked); // Click to single-select
}
- ImGui::PopStyleVar();
if (align_label_with_current_x_position)
ImGui::Indent(ImGui::GetTreeNodeToLabelSpacing());
ImGui::TreePop();
@@ -619,8 +700,8 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("Collapsing Headers"))
{
static bool closable_group = true;
- ImGui::Checkbox("Enable extra group", &closable_group);
- if (ImGui::CollapsingHeader("Header"))
+ ImGui::Checkbox("Show 2nd header", &closable_group);
+ if (ImGui::CollapsingHeader("Header", ImGuiTreeNodeFlags_None))
{
ImGui::Text("IsItemHovered: %d", ImGui::IsItemHovered());
for (int i = 0; i < 5; i++)
@@ -632,6 +713,10 @@ static void ShowDemoWindowWidgets()
for (int i = 0; i < 5; i++)
ImGui::Text("More content %d", i);
}
+ /*
+ if (ImGui::CollapsingHeader("Header with a bullet", ImGuiTreeNodeFlags_Bullet))
+ ImGui::Text("IsItemHovered: %d", ImGui::IsItemHovered());
+ */
ImGui::TreePop();
}
@@ -639,6 +724,11 @@ static void ShowDemoWindowWidgets()
{
ImGui::BulletText("Bullet point 1");
ImGui::BulletText("Bullet point 2\nOn multiple lines");
+ if (ImGui::TreeNode("Tree node"))
+ {
+ ImGui::BulletText("Another bullet point");
+ ImGui::TreePop();
+ }
ImGui::Bullet(); ImGui::Text("Bullet point 3 (two calls)");
ImGui::Bullet(); ImGui::SmallButton("Button");
ImGui::TreePop();
@@ -652,7 +742,7 @@ static void ShowDemoWindowWidgets()
ImGui::TextColored(ImVec4(1.0f,0.0f,1.0f,1.0f), "Pink");
ImGui::TextColored(ImVec4(1.0f,1.0f,0.0f,1.0f), "Yellow");
ImGui::TextDisabled("Disabled");
- ImGui::SameLine(); ShowHelpMarker("The TextDisabled color is stored in ImGuiStyle.");
+ ImGui::SameLine(); HelpMarker("The TextDisabled color is stored in ImGuiStyle.");
ImGui::TreePop();
}
@@ -687,14 +777,14 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("UTF-8 Text"))
{
// UTF-8 test with Japanese characters
- // (Needs a suitable font, try Noto, or Arial Unicode, or M+ fonts. Read misc/fonts/README.txt for details.)
+ // (Needs a suitable font, try Noto, or Arial Unicode, or M+ fonts. Read docs/FONTS.txt for details.)
// - From C++11 you can use the u8"my text" syntax to encode literal strings as UTF-8
// - For earlier compiler, you may be able to encode your sources as UTF-8 (e.g. Visual Studio save your file as 'UTF-8 without signature')
// - FOR THIS DEMO FILE ONLY, BECAUSE WE WANT TO SUPPORT OLD COMPILERS, WE ARE *NOT* INCLUDING RAW UTF-8 CHARACTERS IN THIS SOURCE FILE.
// Instead we are encoding a few strings with hexadecimal constants. Don't do this in your application!
// Please use u8"text in any language" in your application!
// Note that characters values are preserved even by InputText() if the font cannot be displayed, so you can safely copy & paste garbled characters into another application.
- ImGui::TextWrapped("CJK text will only appears if the font was loaded with the appropriate CJK character ranges. Call io.Font->LoadFromFileTTF() manually to load extra character ranges. Read misc/fonts/README.txt for details.");
+ ImGui::TextWrapped("CJK text will only appears if the font was loaded with the appropriate CJK character ranges. Call io.Font->AddFontFromFileTTF() manually to load extra character ranges. Read docs/FONTS.txt for details.");
ImGui::Text("Hiragana: \xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91\xe3\x81\x93 (kakikukeko)"); // Normally we would use u8"blah blah" with the proper characters directly in the string.
ImGui::Text("Kanjis: \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e (nihongo)");
static char buf[32] = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e";
@@ -713,7 +803,7 @@ static void ShowDemoWindowWidgets()
// Here we are grabbing the font texture because that's the only one we have access to inside the demo code.
// Remember that ImTextureID is just storage for whatever you want it to be, it is essentially a value that will be passed to the render function inside the ImDrawCmd structure.
// If you use one of the default imgui_impl_XXXX.cpp renderer, they all have comments at the top of their file to specify what they expect to be stored in ImTextureID.
- // (for example, the imgui_impl_dx11.cpp renderer expect a 'ID3D11ShaderResourceView*' pointer. The imgui_impl_glfw_gl3.cpp renderer expect a GLuint OpenGL texture identifier etc.)
+ // (for example, the imgui_impl_dx11.cpp renderer expect a 'ID3D11ShaderResourceView*' pointer. The imgui_impl_opengl3.cpp renderer expect a GLuint OpenGL texture identifier etc.)
// If you decided that ImTextureID = MyEngineTexture*, then you can pass your MyEngineTexture* pointers to ImGui::Image(), and gather width/height through your own functions, etc.
// Using ShowMetricsWindow() as a "debugger" to inspect the draw data that are being passed to your render will help you debug issues if you are confused about this.
// Consider using the lower-level ImDrawList::AddImage() API, via ImGui::GetWindowDrawList()->AddImage().
@@ -723,7 +813,7 @@ static void ShowDemoWindowWidgets()
ImGui::Text("%.0fx%.0f", my_tex_w, my_tex_h);
ImVec2 pos = ImGui::GetCursorScreenPos();
- ImGui::Image(my_tex_id, ImVec2(my_tex_w, my_tex_h), ImVec2(0,0), ImVec2(1,1), ImColor(255,255,255,255), ImColor(255,255,255,128));
+ ImGui::Image(my_tex_id, ImVec2(my_tex_w, my_tex_h), ImVec2(0,0), ImVec2(1,1), ImVec4(1.0f,1.0f,1.0f,1.0f), ImVec4(1.0f,1.0f,1.0f,0.5f));
if (ImGui::IsItemHovered())
{
ImGui::BeginTooltip();
@@ -735,7 +825,7 @@ static void ShowDemoWindowWidgets()
ImGui::Text("Max: (%.2f, %.2f)", region_x + region_sz, region_y + region_sz);
ImVec2 uv0 = ImVec2((region_x) / my_tex_w, (region_y) / my_tex_h);
ImVec2 uv1 = ImVec2((region_x + region_sz) / my_tex_w, (region_y + region_sz) / my_tex_h);
- ImGui::Image(my_tex_id, ImVec2(region_sz * zoom, region_sz * zoom), uv0, uv1, ImColor(255,255,255,255), ImColor(255,255,255,128));
+ ImGui::Image(my_tex_id, ImVec2(region_sz * zoom, region_sz * zoom), uv0, uv1, ImVec4(1.0f, 1.0f, 1.0f, 1.0f), ImVec4(1.0f, 1.0f, 1.0f, 0.5f));
ImGui::EndTooltip();
}
ImGui::TextWrapped("And now some textured buttons..");
@@ -744,7 +834,7 @@ static void ShowDemoWindowWidgets()
{
ImGui::PushID(i);
int frame_padding = -1 + i; // -1 = uses default padding
- if (ImGui::ImageButton(my_tex_id, ImVec2(32,32), ImVec2(0,0), ImVec2(32.0f/my_tex_w,32/my_tex_h), frame_padding, ImColor(0,0,0,255)))
+ if (ImGui::ImageButton(my_tex_id, ImVec2(32,32), ImVec2(0,0), ImVec2(32.0f/my_tex_w,32/my_tex_h), frame_padding, ImVec4(0.0f,0.0f,0.0f,1.0f)))
pressed_count += 1;
ImGui::PopID();
ImGui::SameLine();
@@ -759,6 +849,7 @@ static void ShowDemoWindowWidgets()
// Expose flags as checkbox for the demo
static ImGuiComboFlags flags = 0;
ImGui::CheckboxFlags("ImGuiComboFlags_PopupAlignLeft", (unsigned int*)&flags, ImGuiComboFlags_PopupAlignLeft);
+ ImGui::SameLine(); HelpMarker("Only makes a difference if the popup is larger than the combo");
if (ImGui::CheckboxFlags("ImGuiComboFlags_NoArrowButton", (unsigned int*)&flags, ImGuiComboFlags_NoArrowButton))
flags &= ~ImGuiComboFlags_NoPreview; // Clear the other flag, as we cannot combine both
if (ImGui::CheckboxFlags("ImGuiComboFlags_NoPreview", (unsigned int*)&flags, ImGuiComboFlags_NoPreview))
@@ -829,7 +920,7 @@ static void ShowDemoWindowWidgets()
}
if (ImGui::TreeNode("Selection State: Multiple Selection"))
{
- ShowHelpMarker("Hold CTRL and click to select multiple items.");
+ HelpMarker("Hold CTRL and click to select multiple items.");
static bool selection[5] = { false, false, false, false, false };
for (int n = 0; n < 5; n++)
{
@@ -856,7 +947,7 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("In columns"))
{
ImGui::Columns(3, NULL, false);
- static bool selected[16] = { 0 };
+ static bool selected[16] = {};
for (int i = 0; i < 16; i++)
{
char label[32]; sprintf(label, "Item %d", i);
@@ -868,67 +959,139 @@ static void ShowDemoWindowWidgets()
}
if (ImGui::TreeNode("Grid"))
{
- static bool selected[16] = { true, false, false, false, false, true, false, false, false, false, true, false, false, false, false, true };
- for (int i = 0; i < 16; i++)
+ static bool selected[4*4] = { true, false, false, false, false, true, false, false, false, false, true, false, false, false, false, true };
+ for (int i = 0; i < 4*4; i++)
{
ImGui::PushID(i);
if (ImGui::Selectable("Sailor", &selected[i], 0, ImVec2(50,50)))
{
- int x = i % 4, y = i / 4;
- if (x > 0) selected[i - 1] ^= 1;
- if (x < 3) selected[i + 1] ^= 1;
- if (y > 0) selected[i - 4] ^= 1;
- if (y < 3) selected[i + 4] ^= 1;
+ // Note: We _unnecessarily_ test for both x/y and i here only to silence some static analyzer. The second part of each test is unnecessary.
+ int x = i % 4;
+ int y = i / 4;
+ if (x > 0) { selected[i - 1] ^= 1; }
+ if (x < 3 && i < 15) { selected[i + 1] ^= 1; }
+ if (y > 0 && i > 3) { selected[i - 4] ^= 1; }
+ if (y < 3 && i < 12) { selected[i + 4] ^= 1; }
}
if ((i % 4) < 3) ImGui::SameLine();
ImGui::PopID();
}
ImGui::TreePop();
}
+ if (ImGui::TreeNode("Alignment"))
+ {
+ HelpMarker("Alignment applies when a selectable is larger than its text content.\nBy default, Selectables uses style.SelectableTextAlign but it can be overriden on a per-item basis using PushStyleVar().");
+ static bool selected[3*3] = { true, false, true, false, true, false, true, false, true };
+ for (int y = 0; y < 3; y++)
+ {
+ for (int x = 0; x < 3; x++)
+ {
+ ImVec2 alignment = ImVec2((float)x / 2.0f, (float)y / 2.0f);
+ char name[32];
+ sprintf(name, "(%.1f,%.1f)", alignment.x, alignment.y);
+ if (x > 0) ImGui::SameLine();
+ ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, alignment);
+ ImGui::Selectable(name, &selected[3*y+x], ImGuiSelectableFlags_None, ImVec2(80,80));
+ ImGui::PopStyleVar();
+ }
+ }
+ ImGui::TreePop();
+ }
ImGui::TreePop();
}
- if (ImGui::TreeNode("Filtered Text Input"))
+ // To wire InputText() with std::string or any other custom string type,
+ // see the "Text Input > Resize Callback" section of this demo, and the misc/cpp/imgui_stdlib.h file.
+ if (ImGui::TreeNode("Text Input"))
{
- static char buf1[64] = ""; ImGui::InputText("default", buf1, 64);
- static char buf2[64] = ""; ImGui::InputText("decimal", buf2, 64, ImGuiInputTextFlags_CharsDecimal);
- static char buf3[64] = ""; ImGui::InputText("hexadecimal", buf3, 64, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase);
- static char buf4[64] = ""; ImGui::InputText("uppercase", buf4, 64, ImGuiInputTextFlags_CharsUppercase);
- static char buf5[64] = ""; ImGui::InputText("no blank", buf5, 64, ImGuiInputTextFlags_CharsNoBlank);
- struct TextFilters { static int FilterImGuiLetters(ImGuiInputTextCallbackData* data) { if (data->EventChar < 256 && strchr("imgui", (char)data->EventChar)) return 0; return 1; } };
- static char buf6[64] = ""; ImGui::InputText("\"imgui\" letters", buf6, 64, ImGuiInputTextFlags_CallbackCharFilter, TextFilters::FilterImGuiLetters);
+ if (ImGui::TreeNode("Multi-line Text Input"))
+ {
+ // Note: we are using a fixed-sized buffer for simplicity here. See ImGuiInputTextFlags_CallbackResize
+ // and the code in misc/cpp/imgui_stdlib.h for how to setup InputText() for dynamically resizing strings.
+ static char text[1024 * 16] =
+ "/*\n"
+ " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n"
+ " the hexadecimal encoding of one offending instruction,\n"
+ " more formally, the invalid operand with locked CMPXCHG8B\n"
+ " instruction bug, is a design flaw in the majority of\n"
+ " Intel Pentium, Pentium MMX, and Pentium OverDrive\n"
+ " processors (all in the P5 microarchitecture).\n"
+ "*/\n\n"
+ "label:\n"
+ "\tlock cmpxchg8b eax\n";
- ImGui::Text("Password input");
- static char bufpass[64] = "password123";
- ImGui::InputText("password", bufpass, 64, ImGuiInputTextFlags_Password | ImGuiInputTextFlags_CharsNoBlank);
- ImGui::SameLine(); ShowHelpMarker("Display all characters as '*'.\nDisable clipboard cut and copy.\nDisable logging.\n");
- ImGui::InputText("password (clear)", bufpass, 64, ImGuiInputTextFlags_CharsNoBlank);
+ static ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput;
+ HelpMarker("You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputTextMultiline() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example. (This is not demonstrated in imgui_demo.cpp because we don't want to include in here)");
+ ImGui::CheckboxFlags("ImGuiInputTextFlags_ReadOnly", (unsigned int*)&flags, ImGuiInputTextFlags_ReadOnly);
+ ImGui::CheckboxFlags("ImGuiInputTextFlags_AllowTabInput", (unsigned int*)&flags, ImGuiInputTextFlags_AllowTabInput);
+ ImGui::CheckboxFlags("ImGuiInputTextFlags_CtrlEnterForNewLine", (unsigned int*)&flags, ImGuiInputTextFlags_CtrlEnterForNewLine);
+ ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16), flags);
+ ImGui::TreePop();
+ }
+
+ if (ImGui::TreeNode("Filtered Text Input"))
+ {
+ static char buf1[64] = ""; ImGui::InputText("default", buf1, 64);
+ static char buf2[64] = ""; ImGui::InputText("decimal", buf2, 64, ImGuiInputTextFlags_CharsDecimal);
+ static char buf3[64] = ""; ImGui::InputText("hexadecimal", buf3, 64, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase);
+ static char buf4[64] = ""; ImGui::InputText("uppercase", buf4, 64, ImGuiInputTextFlags_CharsUppercase);
+ static char buf5[64] = ""; ImGui::InputText("no blank", buf5, 64, ImGuiInputTextFlags_CharsNoBlank);
+ struct TextFilters { static int FilterImGuiLetters(ImGuiInputTextCallbackData* data) { if (data->EventChar < 256 && strchr("imgui", (char)data->EventChar)) return 0; return 1; } };
+ static char buf6[64] = ""; ImGui::InputText("\"imgui\" letters", buf6, 64, ImGuiInputTextFlags_CallbackCharFilter, TextFilters::FilterImGuiLetters);
+
+ ImGui::Text("Password input");
+ static char bufpass[64] = "password123";
+ ImGui::InputText("password", bufpass, 64, ImGuiInputTextFlags_Password | ImGuiInputTextFlags_CharsNoBlank);
+ ImGui::SameLine(); HelpMarker("Display all characters as '*'.\nDisable clipboard cut and copy.\nDisable logging.\n");
+ ImGui::InputTextWithHint("password (w/ hint)", "", bufpass, 64, ImGuiInputTextFlags_Password | ImGuiInputTextFlags_CharsNoBlank);
+ ImGui::InputText("password (clear)", bufpass, 64, ImGuiInputTextFlags_CharsNoBlank);
+ ImGui::TreePop();
+ }
+
+ if (ImGui::TreeNode("Resize Callback"))
+ {
+ // To wire InputText() with std::string or any other custom string type,
+ // you can use the ImGuiInputTextFlags_CallbackResize flag + create a custom ImGui::InputText() wrapper using your prefered type.
+ // See misc/cpp/imgui_stdlib.h for an implementation of this using std::string.
+ HelpMarker("Demonstrate using ImGuiInputTextFlags_CallbackResize to wire your resizable string type to InputText().\n\nSee misc/cpp/imgui_stdlib.h for an implementation of this for std::string.");
+ struct Funcs
+ {
+ static int MyResizeCallback(ImGuiInputTextCallbackData* data)
+ {
+ if (data->EventFlag == ImGuiInputTextFlags_CallbackResize)
+ {
+ ImVector* my_str = (ImVector*)data->UserData;
+ IM_ASSERT(my_str->begin() == data->Buf);
+ my_str->resize(data->BufSize); // NB: On resizing calls, generally data->BufSize == data->BufTextLen + 1
+ data->Buf = my_str->begin();
+ }
+ return 0;
+ }
+
+ // Tip: Because ImGui:: is a namespace you would typicall add your own function into the namespace in your own source files.
+ // For example, you may add a function called ImGui::InputText(const char* label, MyString* my_str).
+ static bool MyInputTextMultiline(const char* label, ImVector* my_str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0)
+ {
+ IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0);
+ return ImGui::InputTextMultiline(label, my_str->begin(), (size_t)my_str->size(), size, flags | ImGuiInputTextFlags_CallbackResize, Funcs::MyResizeCallback, (void*)my_str);
+ }
+ };
+
+ // For this demo we are using ImVector as a string container.
+ // Note that because we need to store a terminating zero character, our size/capacity are 1 more than usually reported by a typical string class.
+ static ImVector my_str;
+ if (my_str.empty())
+ my_str.push_back(0);
+ Funcs::MyInputTextMultiline("##MyStr", &my_str, ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16));
+ ImGui::Text("Data: %p\nSize: %d\nCapacity: %d", (void*)my_str.begin(), my_str.size(), my_str.capacity());
+ ImGui::TreePop();
+ }
ImGui::TreePop();
}
- if (ImGui::TreeNode("Multi-line Text Input"))
- {
- static bool read_only = false;
- static char text[1024*16] =
- "/*\n"
- " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n"
- " the hexadecimal encoding of one offending instruction,\n"
- " more formally, the invalid operand with locked CMPXCHG8B\n"
- " instruction bug, is a design flaw in the majority of\n"
- " Intel Pentium, Pentium MMX, and Pentium OverDrive\n"
- " processors (all in the P5 microarchitecture).\n"
- "*/\n\n"
- "label:\n"
- "\tlock cmpxchg8b eax\n";
-
- ShowHelpMarker("You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputTextMultiline() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example. (This is not demonstrated in imgui_demo.cpp)");
- ImGui::Checkbox("Read-only", &read_only);
- ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput | (read_only ? ImGuiInputTextFlags_ReadOnly : 0);
- ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-1.0f, ImGui::GetTextLineHeight() * 16), flags);
- ImGui::TreePop();
- }
-
+ // Plot/Graph widgets are currently fairly limited.
+ // Consider writing your own plotting widget, or using a third-party one (see "Wiki->Useful Widgets", or github.com/ocornut/imgui/issues/2747)
if (ImGui::TreeNode("Plots Widgets"))
{
static bool animate = true;
@@ -939,10 +1102,10 @@ static void ShowDemoWindowWidgets()
// Create a dummy array of contiguous float values to plot
// Tip: If your float aren't contiguous but part of a structure, you can pass a pointer to your first float and the sizeof() of your structure in the Stride parameter.
- static float values[90] = { 0 };
+ static float values[90] = {};
static int values_offset = 0;
static double refresh_time = 0.0;
- if (!animate || refresh_time == 0.0f)
+ if (!animate || refresh_time == 0.0)
refresh_time = ImGui::GetTime();
while (refresh_time < ImGui::GetTime()) // Create dummy data at fixed 60 hz rate for the demo
{
@@ -952,7 +1115,18 @@ static void ShowDemoWindowWidgets()
phase += 0.10f*values_offset;
refresh_time += 1.0f/60.0f;
}
- ImGui::PlotLines("Lines", values, IM_ARRAYSIZE(values), values_offset, "avg 0.0", -1.0f, 1.0f, ImVec2(0,80));
+
+ // Plots can display overlay texts
+ // (in this example, we will display an average value)
+ {
+ float average = 0.0f;
+ for (int n = 0; n < IM_ARRAYSIZE(values); n++)
+ average += values[n];
+ average /= (float)IM_ARRAYSIZE(values);
+ char overlay[32];
+ sprintf(overlay, "avg %f", average);
+ ImGui::PlotLines("Lines", values, IM_ARRAYSIZE(values), values_offset, overlay, -1.0f, 1.0f, ImVec2(0,80));
+ }
ImGui::PlotHistogram("Histogram", arr, IM_ARRAYSIZE(arr), 0, NULL, 0.0f, 1.0f, ImVec2(0,80));
// Use functions to generate output
@@ -964,7 +1138,8 @@ static void ShowDemoWindowWidgets()
};
static int func_type = 0, display_count = 70;
ImGui::Separator();
- ImGui::PushItemWidth(100); ImGui::Combo("func", &func_type, "Sin\0Saw\0"); ImGui::PopItemWidth();
+ ImGui::SetNextItemWidth(100);
+ ImGui::Combo("func", &func_type, "Sin\0Saw\0");
ImGui::SameLine();
ImGui::SliderInt("Sample count", &display_count, 1, 400);
float (*func)(void*, int) = (func_type == 0) ? Funcs::Sin : Funcs::Saw;
@@ -981,7 +1156,8 @@ static void ShowDemoWindowWidgets()
if (progress <= -0.1f) { progress = -0.1f; progress_dir *= -1.0f; }
}
- // Typically we would use ImVec2(-1.0f,0.0f) to use all available width, or ImVec2(width,0.0f) for a specified width. ImVec2(0.0f,0.0f) uses ItemWidth.
+ // Typically we would use ImVec2(-1.0f,0.0f) or ImVec2(-FLT_MIN,0.0f) to use all available width,
+ // or ImVec2(width,0.0f) for a specified width. ImVec2(0.0f,0.0f) uses ItemWidth.
ImGui::ProgressBar(progress, ImVec2(0.0f,0.0f));
ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
ImGui::Text("Progress Bar");
@@ -995,7 +1171,7 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("Color/Picker Widgets"))
{
- static ImVec4 color = ImColor(114, 144, 154, 200);
+ static ImVec4 color = ImVec4(114.0f/255.0f, 144.0f/255.0f, 154.0f/255.0f, 200.0f/255.0f);
static bool alpha_preview = true;
static bool alpha_half_preview = false;
@@ -1005,40 +1181,42 @@ static void ShowDemoWindowWidgets()
ImGui::Checkbox("With Alpha Preview", &alpha_preview);
ImGui::Checkbox("With Half Alpha Preview", &alpha_half_preview);
ImGui::Checkbox("With Drag and Drop", &drag_and_drop);
- ImGui::Checkbox("With Options Menu", &options_menu); ImGui::SameLine(); ShowHelpMarker("Right-click on the individual color widget to show options.");
- ImGui::Checkbox("With HDR", &hdr); ImGui::SameLine(); ShowHelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets.");
- int misc_flags = (hdr ? ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : ImGuiColorEditFlags_NoOptions);
+ ImGui::Checkbox("With Options Menu", &options_menu); ImGui::SameLine(); HelpMarker("Right-click on the individual color widget to show options.");
+ ImGui::Checkbox("With HDR", &hdr); ImGui::SameLine(); HelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets.");
+ ImGuiColorEditFlags misc_flags = (hdr ? ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : ImGuiColorEditFlags_NoOptions);
ImGui::Text("Color widget:");
- ImGui::SameLine(); ShowHelpMarker("Click on the colored square to open a color picker.\nCTRL+click on individual component to input value.\n");
+ ImGui::SameLine(); HelpMarker("Click on the colored square to open a color picker.\nCTRL+click on individual component to input value.\n");
ImGui::ColorEdit3("MyColor##1", (float*)&color, misc_flags);
ImGui::Text("Color widget HSV with Alpha:");
- ImGui::ColorEdit4("MyColor##2", (float*)&color, ImGuiColorEditFlags_HSV | misc_flags);
+ ImGui::ColorEdit4("MyColor##2", (float*)&color, ImGuiColorEditFlags_DisplayHSV | misc_flags);
ImGui::Text("Color widget with Float Display:");
ImGui::ColorEdit4("MyColor##2f", (float*)&color, ImGuiColorEditFlags_Float | misc_flags);
ImGui::Text("Color button with Picker:");
- ImGui::SameLine(); ShowHelpMarker("With the ImGuiColorEditFlags_NoInputs flag you can hide all the slider/text inputs.\nWith the ImGuiColorEditFlags_NoLabel flag you can pass a non-empty label which will only be used for the tooltip and picker popup.");
+ ImGui::SameLine(); HelpMarker("With the ImGuiColorEditFlags_NoInputs flag you can hide all the slider/text inputs.\nWith the ImGuiColorEditFlags_NoLabel flag you can pass a non-empty label which will only be used for the tooltip and picker popup.");
ImGui::ColorEdit4("MyColor##3", (float*)&color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | misc_flags);
ImGui::Text("Color button with Custom Picker Popup:");
- // Generate a dummy palette
- static bool saved_palette_inited = false;
- static ImVec4 saved_palette[32];
- if (!saved_palette_inited)
+ // Generate a dummy default palette. The palette will persist and can be edited.
+ static bool saved_palette_init = true;
+ static ImVec4 saved_palette[32] = {};
+ if (saved_palette_init)
+ {
for (int n = 0; n < IM_ARRAYSIZE(saved_palette); n++)
{
ImGui::ColorConvertHSVtoRGB(n / 31.0f, 0.8f, 0.8f, saved_palette[n].x, saved_palette[n].y, saved_palette[n].z);
saved_palette[n].w = 1.0f; // Alpha
}
- saved_palette_inited = true;
+ saved_palette_init = false;
+ }
static ImVec4 backup_color;
bool open_popup = ImGui::ColorButton("MyColor##3b", color, misc_flags);
- ImGui::SameLine();
+ ImGui::SameLine(0, ImGui::GetStyle().ItemInnerSpacing.x);
open_popup |= ImGui::Button("Palette");
if (open_popup)
{
@@ -1047,12 +1225,12 @@ static void ShowDemoWindowWidgets()
}
if (ImGui::BeginPopup("mypicker"))
{
- // FIXME: Adding a drag and drop example here would be perfect!
ImGui::Text("MY CUSTOM COLOR PICKER WITH AN AMAZING PALETTE!");
ImGui::Separator();
ImGui::ColorPicker4("##picker", (float*)&color, misc_flags | ImGuiColorEditFlags_NoSidePreview | ImGuiColorEditFlags_NoSmallPreview);
ImGui::SameLine();
- ImGui::BeginGroup();
+
+ ImGui::BeginGroup(); // Lock X position
ImGui::Text("Current");
ImGui::ColorButton("##current", color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60,40));
ImGui::Text("Previous");
@@ -1068,6 +1246,8 @@ static void ShowDemoWindowWidgets()
if (ImGui::ColorButton("##palette", saved_palette[n], ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_NoTooltip, ImVec2(20,20)))
color = ImVec4(saved_palette[n].x, saved_palette[n].y, saved_palette[n].z, color.w); // Preserve alpha!
+ // Allow user to drop colors into each palette entry
+ // (Note that ColorButton is already a drag source by default, unless using ImGuiColorEditFlags_NoDragDrop)
if (ImGui::BeginDragDropTarget())
{
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_3F))
@@ -1092,7 +1272,7 @@ static void ShowDemoWindowWidgets()
static bool side_preview = true;
static bool ref_color = false;
static ImVec4 ref_color_v(1.0f,0.0f,1.0f,0.5f);
- static int inputs_mode = 2;
+ static int display_mode = 0;
static int picker_mode = 0;
ImGui::Checkbox("With Alpha", &alpha);
ImGui::Checkbox("With Alpha Bar", &alpha_bar);
@@ -1107,28 +1287,39 @@ static void ShowDemoWindowWidgets()
ImGui::ColorEdit4("##RefColor", &ref_color_v.x, ImGuiColorEditFlags_NoInputs | misc_flags);
}
}
- ImGui::Combo("Inputs Mode", &inputs_mode, "All Inputs\0No Inputs\0RGB Input\0HSV Input\0HEX Input\0");
+ ImGui::Combo("Display Mode", &display_mode, "Auto/Current\0None\0RGB Only\0HSV Only\0Hex Only\0");
+ ImGui::SameLine(); HelpMarker("ColorEdit defaults to displaying RGB inputs if you don't specify a display mode, but the user can change it with a right-click.\n\nColorPicker defaults to displaying RGB+HSV+Hex if you don't specify a display mode.\n\nYou can change the defaults using SetColorEditOptions().");
ImGui::Combo("Picker Mode", &picker_mode, "Auto/Current\0Hue bar + SV rect\0Hue wheel + SV triangle\0");
- ImGui::SameLine(); ShowHelpMarker("User can right-click the picker to change mode.");
+ ImGui::SameLine(); HelpMarker("User can right-click the picker to change mode.");
ImGuiColorEditFlags flags = misc_flags;
- if (!alpha) flags |= ImGuiColorEditFlags_NoAlpha; // This is by default if you call ColorPicker3() instead of ColorPicker4()
- if (alpha_bar) flags |= ImGuiColorEditFlags_AlphaBar;
- if (!side_preview) flags |= ImGuiColorEditFlags_NoSidePreview;
- if (picker_mode == 1) flags |= ImGuiColorEditFlags_PickerHueBar;
- if (picker_mode == 2) flags |= ImGuiColorEditFlags_PickerHueWheel;
- if (inputs_mode == 1) flags |= ImGuiColorEditFlags_NoInputs;
- if (inputs_mode == 2) flags |= ImGuiColorEditFlags_RGB;
- if (inputs_mode == 3) flags |= ImGuiColorEditFlags_HSV;
- if (inputs_mode == 4) flags |= ImGuiColorEditFlags_HEX;
+ if (!alpha) flags |= ImGuiColorEditFlags_NoAlpha; // This is by default if you call ColorPicker3() instead of ColorPicker4()
+ if (alpha_bar) flags |= ImGuiColorEditFlags_AlphaBar;
+ if (!side_preview) flags |= ImGuiColorEditFlags_NoSidePreview;
+ if (picker_mode == 1) flags |= ImGuiColorEditFlags_PickerHueBar;
+ if (picker_mode == 2) flags |= ImGuiColorEditFlags_PickerHueWheel;
+ if (display_mode == 1) flags |= ImGuiColorEditFlags_NoInputs; // Disable all RGB/HSV/Hex displays
+ if (display_mode == 2) flags |= ImGuiColorEditFlags_DisplayRGB; // Override display mode
+ if (display_mode == 3) flags |= ImGuiColorEditFlags_DisplayHSV;
+ if (display_mode == 4) flags |= ImGuiColorEditFlags_DisplayHex;
ImGui::ColorPicker4("MyColor##4", (float*)&color, flags, ref_color ? &ref_color_v.x : NULL);
ImGui::Text("Programmatically set defaults:");
- ImGui::SameLine(); ShowHelpMarker("SetColorEditOptions() is designed to allow you to set boot-time default.\nWe don't have Push/Pop functions because you can force options on a per-widget basis if needed, and the user can change non-forced ones with the options menu.\nWe don't have a getter to avoid encouraging you to persistently save values that aren't forward-compatible.");
+ ImGui::SameLine(); HelpMarker("SetColorEditOptions() is designed to allow you to set boot-time default.\nWe don't have Push/Pop functions because you can force options on a per-widget basis if needed, and the user can change non-forced ones with the options menu.\nWe don't have a getter to avoid encouraging you to persistently save values that aren't forward-compatible.");
if (ImGui::Button("Default: Uint8 + HSV + Hue Bar"))
- ImGui::SetColorEditOptions(ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_HSV | ImGuiColorEditFlags_PickerHueBar);
+ ImGui::SetColorEditOptions(ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_PickerHueBar);
if (ImGui::Button("Default: Float + HDR + Hue Wheel"))
ImGui::SetColorEditOptions(ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_PickerHueWheel);
+ // HSV encoded support (to avoid RGB<>HSV round trips and singularities when S==0 or V==0)
+ static ImVec4 color_stored_as_hsv(0.23f, 1.0f, 1.0f, 1.0f);
+ ImGui::Spacing();
+ ImGui::Text("HSV encoded colors");
+ ImGui::SameLine(); HelpMarker("By default, colors are given to ColorEdit and ColorPicker in RGB, but ImGuiColorEditFlags_InputHSV allows you to store colors as HSV and pass them to ColorEdit and ColorPicker as HSV. This comes with the added benefit that you can manipulate hue values with the picker even when saturation or value are zero.");
+ ImGui::Text("Color widget with InputHSV:");
+ ImGui::ColorEdit4("HSV shown as RGB##1", (float*)&color_stored_as_hsv, ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float);
+ ImGui::ColorEdit4("HSV shown as HSV##1", (float*)&color_stored_as_hsv, ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float);
+ ImGui::DragFloat4("Raw HSV values", (float*)&color_stored_as_hsv, 0.01f, 0.0f, 1.0f);
+
ImGui::TreePop();
}
@@ -1144,15 +1335,15 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("Data Types"))
{
// The DragScalar/InputScalar/SliderScalar functions allow various data types: signed/unsigned int/long long and float/double
- // To avoid polluting the public API with all possible combinations, we use the ImGuiDataType enum to pass the type,
- // and passing all arguments by address.
+ // To avoid polluting the public API with all possible combinations, we use the ImGuiDataType enum to pass the type,
+ // and passing all arguments by address.
// This is the reason the test code below creates local variables to hold "zero" "one" etc. for each types.
- // In practice, if you frequently use a given type that is not covered by the normal API entry points, you can wrap it
- // yourself inside a 1 line function which can take typed argument as value instead of void*, and then pass their address
+ // In practice, if you frequently use a given type that is not covered by the normal API entry points, you can wrap it
+ // yourself inside a 1 line function which can take typed argument as value instead of void*, and then pass their address
// to the generic function. For example:
- // bool MySliderU64(const char *label, u64* value, u64 min = 0, u64 max = 0, const char* format = "%lld")
- // {
- // return SliderScalar(label, ImGuiDataType_U64, value, &min, &max, format);
+ // bool MySliderU64(const char *label, u64* value, u64 min = 0, u64 max = 0, const char* format = "%lld")
+ // {
+ // return SliderScalar(label, ImGuiDataType_U64, value, &min, &max, format);
// }
// Limits (as helper variables that we can take the address of)
@@ -1162,6 +1353,10 @@ static void ShowDemoWindowWidgets()
ImS64 LLONG_MAX = 9223372036854775807LL;
ImU64 ULLONG_MAX = (2ULL * 9223372036854775807LL + 1);
#endif
+ const char s8_zero = 0, s8_one = 1, s8_fifty = 50, s8_min = -128, s8_max = 127;
+ const ImU8 u8_zero = 0, u8_one = 1, u8_fifty = 50, u8_min = 0, u8_max = 255;
+ const short s16_zero = 0, s16_one = 1, s16_fifty = 50, s16_min = -32768, s16_max = 32767;
+ const ImU16 u16_zero = 0, u16_one = 1, u16_fifty = 50, u16_min = 0, u16_max = 65535;
const ImS32 s32_zero = 0, s32_one = 1, s32_fifty = 50, s32_min = INT_MIN/2, s32_max = INT_MAX/2, s32_hi_a = INT_MAX/2 - 100, s32_hi_b = INT_MAX/2;
const ImU32 u32_zero = 0, u32_one = 1, u32_fifty = 50, u32_min = 0, u32_max = UINT_MAX/2, u32_hi_a = UINT_MAX/2 - 100, u32_hi_b = UINT_MAX/2;
const ImS64 s64_zero = 0, s64_one = 1, s64_fifty = 50, s64_min = LLONG_MIN/2, s64_max = LLONG_MAX/2, s64_hi_a = LLONG_MAX/2 - 100, s64_hi_b = LLONG_MAX/2;
@@ -1170,6 +1365,10 @@ static void ShowDemoWindowWidgets()
const double f64_zero = 0., f64_one = 1., f64_lo_a = -1000000000000000.0, f64_hi_a = +1000000000000000.0;
// State
+ static char s8_v = 127;
+ static ImU8 u8_v = 255;
+ static short s16_v = 32767;
+ static ImU16 u16_v = 65535;
static ImS32 s32_v = -1;
static ImU32 u32_v = (ImU32)-1;
static ImS64 s64_v = -1;
@@ -1180,17 +1379,25 @@ static void ShowDemoWindowWidgets()
const float drag_speed = 0.2f;
static bool drag_clamp = false;
ImGui::Text("Drags:");
- ImGui::Checkbox("Clamp integers to 0..50", &drag_clamp); ImGui::SameLine(); ShowHelpMarker("As with every widgets in dear imgui, we never modify values unless there is a user interaction.\nYou can override the clamping limits by using CTRL+Click to input a value.");
+ ImGui::Checkbox("Clamp integers to 0..50", &drag_clamp); ImGui::SameLine(); HelpMarker("As with every widgets in dear imgui, we never modify values unless there is a user interaction.\nYou can override the clamping limits by using CTRL+Click to input a value.");
+ ImGui::DragScalar("drag s8", ImGuiDataType_S8, &s8_v, drag_speed, drag_clamp ? &s8_zero : NULL, drag_clamp ? &s8_fifty : NULL);
+ ImGui::DragScalar("drag u8", ImGuiDataType_U8, &u8_v, drag_speed, drag_clamp ? &u8_zero : NULL, drag_clamp ? &u8_fifty : NULL, "%u ms");
+ ImGui::DragScalar("drag s16", ImGuiDataType_S16, &s16_v, drag_speed, drag_clamp ? &s16_zero : NULL, drag_clamp ? &s16_fifty : NULL);
+ ImGui::DragScalar("drag u16", ImGuiDataType_U16, &u16_v, drag_speed, drag_clamp ? &u16_zero : NULL, drag_clamp ? &u16_fifty : NULL, "%u ms");
ImGui::DragScalar("drag s32", ImGuiDataType_S32, &s32_v, drag_speed, drag_clamp ? &s32_zero : NULL, drag_clamp ? &s32_fifty : NULL);
ImGui::DragScalar("drag u32", ImGuiDataType_U32, &u32_v, drag_speed, drag_clamp ? &u32_zero : NULL, drag_clamp ? &u32_fifty : NULL, "%u ms");
ImGui::DragScalar("drag s64", ImGuiDataType_S64, &s64_v, drag_speed, drag_clamp ? &s64_zero : NULL, drag_clamp ? &s64_fifty : NULL);
ImGui::DragScalar("drag u64", ImGuiDataType_U64, &u64_v, drag_speed, drag_clamp ? &u64_zero : NULL, drag_clamp ? &u64_fifty : NULL);
ImGui::DragScalar("drag float", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f", 1.0f);
- ImGui::DragScalar("drag float ^2", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f", 2.0f); ImGui::SameLine(); ShowHelpMarker("You can use the 'power' parameter to increase tweaking precision on one side of the range.");
+ ImGui::DragScalar("drag float ^2", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f", 2.0f); ImGui::SameLine(); HelpMarker("You can use the 'power' parameter to increase tweaking precision on one side of the range.");
ImGui::DragScalar("drag double", ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, NULL, "%.10f grams", 1.0f);
ImGui::DragScalar("drag double ^2", ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, &f64_one, "0 < %.10f < 1", 2.0f);
ImGui::Text("Sliders");
+ ImGui::SliderScalar("slider s8 full", ImGuiDataType_S8, &s8_v, &s8_min, &s8_max, "%d");
+ ImGui::SliderScalar("slider u8 full", ImGuiDataType_U8, &u8_v, &u8_min, &u8_max, "%u");
+ ImGui::SliderScalar("slider s16 full", ImGuiDataType_S16, &s16_v, &s16_min, &s16_max, "%d");
+ ImGui::SliderScalar("slider u16 full", ImGuiDataType_U16, &u16_v, &u16_min, &u16_max, "%u");
ImGui::SliderScalar("slider s32 low", ImGuiDataType_S32, &s32_v, &s32_zero, &s32_fifty,"%d");
ImGui::SliderScalar("slider s32 high", ImGuiDataType_S32, &s32_v, &s32_hi_a, &s32_hi_b, "%d");
ImGui::SliderScalar("slider s32 full", ImGuiDataType_S32, &s32_v, &s32_min, &s32_max, "%d");
@@ -1213,6 +1420,10 @@ static void ShowDemoWindowWidgets()
static bool inputs_step = true;
ImGui::Text("Inputs");
ImGui::Checkbox("Show step buttons", &inputs_step);
+ ImGui::InputScalar("input s8", ImGuiDataType_S8, &s8_v, inputs_step ? &s8_one : NULL, NULL, "%d");
+ ImGui::InputScalar("input u8", ImGuiDataType_U8, &u8_v, inputs_step ? &u8_one : NULL, NULL, "%u");
+ ImGui::InputScalar("input s16", ImGuiDataType_S16, &s16_v, inputs_step ? &s16_one : NULL, NULL, "%d");
+ ImGui::InputScalar("input u16", ImGuiDataType_U16, &u16_v, inputs_step ? &u16_one : NULL, NULL, "%u");
ImGui::InputScalar("input s32", ImGuiDataType_S32, &s32_v, inputs_step ? &s32_one : NULL, NULL, "%d");
ImGui::InputScalar("input s32 hex", ImGuiDataType_S32, &s32_v, inputs_step ? &s32_one : NULL, NULL, "%08X", ImGuiInputTextFlags_CharsHexadecimal);
ImGui::InputScalar("input u32", ImGuiDataType_U32, &u32_v, inputs_step ? &u32_one : NULL, NULL, "%u");
@@ -1287,7 +1498,7 @@ static void ShowDemoWindowWidgets()
ImGui::PushID("set2");
static float values2[4] = { 0.20f, 0.80f, 0.40f, 0.25f };
const int rows = 3;
- const ImVec2 small_slider_size(18, (160.0f-(rows-1)*spacing)/rows);
+ const ImVec2 small_slider_size(18, (float)(int)((160.0f - (rows - 1) * spacing) / rows));
for (int nx = 0; nx < 4; nx++)
{
if (nx > 0) ImGui::SameLine();
@@ -1322,22 +1533,21 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("Drag and Drop"))
{
+ if (ImGui::TreeNode("Drag and drop in standard widgets"))
{
// ColorEdit widgets automatically act as drag source and drag target.
// They are using standardized payload strings IMGUI_PAYLOAD_TYPE_COLOR_3F and IMGUI_PAYLOAD_TYPE_COLOR_4F to allow your own widgets
// to use colors in their drag and drop interaction. Also see the demo in Color Picker -> Palette demo.
- ImGui::BulletText("Drag and drop in standard widgets");
- ImGui::Indent();
- static float col1[3] = { 1.0f,0.0f,0.2f };
- static float col2[4] = { 0.4f,0.7f,0.0f,0.5f };
+ HelpMarker("You can drag from the colored squares.");
+ static float col1[3] = { 1.0f, 0.0f, 0.2f };
+ static float col2[4] = { 0.4f, 0.7f, 0.0f, 0.5f };
ImGui::ColorEdit3("color 1", col1);
ImGui::ColorEdit4("color 2", col2);
- ImGui::Unindent();
+ ImGui::TreePop();
}
+ if (ImGui::TreeNode("Drag and drop to copy/swap items"))
{
- ImGui::BulletText("Drag and drop to copy/swap items");
- ImGui::Indent();
enum Mode
{
Mode_Copy,
@@ -1347,7 +1557,7 @@ static void ShowDemoWindowWidgets()
static int mode = 0;
if (ImGui::RadioButton("Copy", mode == Mode_Copy)) { mode = Mode_Copy; } ImGui::SameLine();
if (ImGui::RadioButton("Move", mode == Mode_Move)) { mode = Mode_Move; } ImGui::SameLine();
- if (ImGui::RadioButton("Swap", mode == Mode_Swap)) { mode = Mode_Swap; }
+ if (ImGui::RadioButton("Swap", mode == Mode_Swap)) { mode = Mode_Swap; }
static const char* names[9] = { "Bobby", "Beatrice", "Betty", "Brianna", "Barry", "Bernard", "Bibi", "Blaine", "Bryn" };
for (int n = 0; n < IM_ARRAYSIZE(names); n++)
{
@@ -1359,8 +1569,8 @@ static void ShowDemoWindowWidgets()
// Our buttons are both drag sources and drag targets here!
if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_None))
{
- ImGui::SetDragDropPayload("DND_DEMO_CELL", &n, sizeof(int)); // Set payload to carry the index of our item (could be anything)
- if (mode == Mode_Copy) { ImGui::Text("Copy %s", names[n]); } // Display preview (could be anything, e.g. when dragging an image we could decide to display the filename and a small preview of the image, etc.)
+ ImGui::SetDragDropPayload("DND_DEMO_CELL", &n, sizeof(int)); // Set payload to carry the index of our item (could be anything)
+ if (mode == Mode_Copy) { ImGui::Text("Copy %s", names[n]); } // Display preview (could be anything, e.g. when dragging an image we could decide to display the filename and a small preview of the image, etc.)
if (mode == Mode_Move) { ImGui::Text("Move %s", names[n]); }
if (mode == Mode_Swap) { ImGui::Text("Swap %s", names[n]); }
ImGui::EndDragDropSource();
@@ -1391,7 +1601,31 @@ static void ShowDemoWindowWidgets()
}
ImGui::PopID();
}
- ImGui::Unindent();
+ ImGui::TreePop();
+ }
+
+ if (ImGui::TreeNode("Drag to reorder items (simple)"))
+ {
+ // Simple reordering
+ HelpMarker("We don't use the drag and drop api at all here! Instead we query when the item is held but not hovered, and order items accordingly.");
+ static const char* item_names[] = { "Item One", "Item Two", "Item Three", "Item Four", "Item Five" };
+ for (int n = 0; n < IM_ARRAYSIZE(item_names); n++)
+ {
+ const char* item = item_names[n];
+ ImGui::Selectable(item);
+
+ if (ImGui::IsItemActive() && !ImGui::IsItemHovered())
+ {
+ int n_next = n + (ImGui::GetMouseDragDelta(0).y < 0.f ? -1 : 1);
+ if (n_next >= 0 && n_next < IM_ARRAYSIZE(item_names))
+ {
+ item_names[n] = item_names[n_next];
+ item_names[n_next] = item;
+ ImGui::ResetMouseDragDelta();
+ }
+ }
+ }
+ ImGui::TreePop();
}
ImGui::TreePop();
@@ -1399,25 +1633,33 @@ static void ShowDemoWindowWidgets()
if (ImGui::TreeNode("Querying Status (Active/Focused/Hovered etc.)"))
{
- // Display the value of IsItemHovered() and other common item state functions. Note that the flags can be combined.
- // (because BulletText is an item itself and that would affect the output of IsItemHovered() we pass all state in a single call to simplify the code).
+ // Submit an item (various types available) so we can query their status in the following block.
static int item_type = 1;
+ ImGui::Combo("Item Type", &item_type, "Text\0Button\0Button (w/ repeat)\0Checkbox\0SliderFloat\0InputText\0InputFloat\0InputFloat3\0ColorEdit4\0MenuItem\0TreeNode\0TreeNode (w/ double-click)\0ListBox\0", 20);
+ ImGui::SameLine();
+ HelpMarker("Testing how various types of items are interacting with the IsItemXXX functions.");
+ bool ret = false;
static bool b = false;
static float col4f[4] = { 1.0f, 0.5, 0.0f, 1.0f };
- ImGui::RadioButton("Text", &item_type, 0);
- ImGui::RadioButton("Button", &item_type, 1);
- ImGui::RadioButton("CheckBox", &item_type, 2);
- ImGui::RadioButton("SliderFloat", &item_type, 3);
- ImGui::RadioButton("ColorEdit4", &item_type, 4);
- ImGui::RadioButton("ListBox", &item_type, 5);
- ImGui::Separator();
- bool ret = false;
+ static char str[16] = {};
if (item_type == 0) { ImGui::Text("ITEM: Text"); } // Testing text items with no identifier/interaction
if (item_type == 1) { ret = ImGui::Button("ITEM: Button"); } // Testing button
- if (item_type == 2) { ret = ImGui::Checkbox("ITEM: CheckBox", &b); } // Testing checkbox
- if (item_type == 3) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); } // Testing basic item
- if (item_type == 4) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged)
- if (item_type == 5) { const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", ¤t, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); }
+ if (item_type == 2) { ImGui::PushButtonRepeat(true); ret = ImGui::Button("ITEM: Button"); ImGui::PopButtonRepeat(); } // Testing button (with repeater)
+ if (item_type == 3) { ret = ImGui::Checkbox("ITEM: Checkbox", &b); } // Testing checkbox
+ if (item_type == 4) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); } // Testing basic item
+ if (item_type == 5) { ret = ImGui::InputText("ITEM: InputText", &str[0], IM_ARRAYSIZE(str)); } // Testing input text (which handles tabbing)
+ if (item_type == 6) { ret = ImGui::InputFloat("ITEM: InputFloat", col4f, 1.0f); } // Testing +/- buttons on scalar input
+ if (item_type == 7) { ret = ImGui::InputFloat3("ITEM: InputFloat3", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged)
+ if (item_type == 8) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged)
+ if (item_type == 9) { ret = ImGui::MenuItem("ITEM: MenuItem"); } // Testing menu item (they use ImGuiButtonFlags_PressedOnRelease button policy)
+ if (item_type == 10){ ret = ImGui::TreeNode("ITEM: TreeNode"); if (ret) ImGui::TreePop(); } // Testing tree node
+ if (item_type == 11){ ret = ImGui::TreeNodeEx("ITEM: TreeNode w/ ImGuiTreeNodeFlags_OpenOnDoubleClick", ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_NoTreePushOnOpen); } // Testing tree node with ImGuiButtonFlags_PressedOnDoubleClick button policy.
+ if (item_type == 12){ const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", ¤t, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); }
+
+ // Display the value of IsItemHovered() and other common item state functions.
+ // Note that the ImGuiHoveredFlags_XXX flags can be combined.
+ // Because BulletText is an item itself and that would affect the output of IsItemXXX functions,
+ // we query every state in a single call to avoid storing them and to simplify the code
ImGui::BulletText(
"Return value = %d\n"
"IsItemFocused() = %d\n"
@@ -1428,9 +1670,12 @@ static void ShowDemoWindowWidgets()
"IsItemHovered(_RectOnly) = %d\n"
"IsItemActive() = %d\n"
"IsItemEdited() = %d\n"
+ "IsItemActivated() = %d\n"
"IsItemDeactivated() = %d\n"
- "IsItemDeactivatedEdit() = %d\n"
+ "IsItemDeactivatedAfterEdit() = %d\n"
"IsItemVisible() = %d\n"
+ "IsItemClicked() = %d\n"
+ "IsItemToggledOpen() = %d\n"
"GetItemRectMin() = (%.1f, %.1f)\n"
"GetItemRectMax() = (%.1f, %.1f)\n"
"GetItemRectSize() = (%.1f, %.1f)",
@@ -1443,9 +1688,12 @@ static void ShowDemoWindowWidgets()
ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly),
ImGui::IsItemActive(),
ImGui::IsItemEdited(),
+ ImGui::IsItemActivated(),
ImGui::IsItemDeactivated(),
ImGui::IsItemDeactivatedAfterEdit(),
ImGui::IsItemVisible(),
+ ImGui::IsItemClicked(),
+ ImGui::IsItemToggledOpen(),
ImGui::GetItemRectMin().x, ImGui::GetItemRectMin().y,
ImGui::GetItemRectMax().x, ImGui::GetItemRectMax().y,
ImGui::GetItemRectSize().x, ImGui::GetItemRectSize().y
@@ -1456,7 +1704,8 @@ static void ShowDemoWindowWidgets()
if (embed_all_inside_a_child_window)
ImGui::BeginChild("outer_child", ImVec2(0, ImGui::GetFontSize() * 20), true);
- // Testing IsWindowFocused() function with its various flags. Note that the flags can be combined.
+ // Testing IsWindowFocused() function with its various flags.
+ // Note that the ImGuiFocusedFlags_XXX flags can be combined.
ImGui::BulletText(
"IsWindowFocused() = %d\n"
"IsWindowFocused(_ChildWindows) = %d\n"
@@ -1469,13 +1718,15 @@ static void ShowDemoWindowWidgets()
ImGui::IsWindowFocused(ImGuiFocusedFlags_RootWindow),
ImGui::IsWindowFocused(ImGuiFocusedFlags_AnyWindow));
- // Testing IsWindowHovered() function with its various flags. Note that the flags can be combined.
+ // Testing IsWindowHovered() function with its various flags.
+ // Note that the ImGuiHoveredFlags_XXX flags can be combined.
ImGui::BulletText(
"IsWindowHovered() = %d\n"
"IsWindowHovered(_AllowWhenBlockedByPopup) = %d\n"
"IsWindowHovered(_AllowWhenBlockedByActiveItem) = %d\n"
"IsWindowHovered(_ChildWindows) = %d\n"
"IsWindowHovered(_ChildWindows|_RootWindow) = %d\n"
+ "IsWindowHovered(_ChildWindows|_AllowWhenBlockedByPopup) = %d\n"
"IsWindowHovered(_RootWindow) = %d\n"
"IsWindowHovered(_AnyWindow) = %d\n",
ImGui::IsWindowHovered(),
@@ -1483,16 +1734,20 @@ static void ShowDemoWindowWidgets()
ImGui::IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem),
ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows),
ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_RootWindow),
+ ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_AllowWhenBlockedByPopup),
ImGui::IsWindowHovered(ImGuiHoveredFlags_RootWindow),
ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow));
ImGui::BeginChild("child", ImVec2(0, 50), true);
- ImGui::Text("This is another child window for testing with the _ChildWindows flag.");
+ ImGui::Text("This is another child window for testing the _ChildWindows flag.");
ImGui::EndChild();
if (embed_all_inside_a_child_window)
ImGui::EndChild();
- // Calling IsItemHovered() after begin returns the hovered status of the title bar.
+ static char dummy_str[] = "This is a dummy field to be able to tab-out of the widgets above.";
+ ImGui::InputText("dummy", dummy_str, IM_ARRAYSIZE(dummy_str), ImGuiInputTextFlags_ReadOnly);
+
+ // Calling IsItemHovered() after begin returns the hovered status of the title bar.
// This is useful in particular if you want to create a context menu (with BeginPopupContextItem) associated to the title bar of a window.
static bool test_window = false;
ImGui::Checkbox("Hovered/Active tests after Begin() for title bar testing", &test_window);
@@ -1520,8 +1775,9 @@ static void ShowDemoWindowLayout()
if (!ImGui::CollapsingHeader("Layout"))
return;
- if (ImGui::TreeNode("Child regions"))
+ if (ImGui::TreeNode("Child windows"))
{
+ HelpMarker("Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window.");
static bool disable_mouse_wheel = false;
static bool disable_menu = false;
ImGui::Checkbox("Disable Mouse Wheel", &disable_mouse_wheel);
@@ -1530,13 +1786,13 @@ static void ShowDemoWindowLayout()
static int line = 50;
bool goto_line = ImGui::Button("Goto");
ImGui::SameLine();
- ImGui::PushItemWidth(100);
+ ImGui::SetNextItemWidth(100);
goto_line |= ImGui::InputInt("##Line", &line, 0, 0, ImGuiInputTextFlags_EnterReturnsTrue);
- ImGui::PopItemWidth();
// Child 1: no border, enable horizontal scrollbar
{
- ImGui::BeginChild("Child1", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.5f, 300), false, ImGuiWindowFlags_HorizontalScrollbar | (disable_mouse_wheel ? ImGuiWindowFlags_NoScrollWithMouse : 0));
+ ImGuiWindowFlags window_flags = ImGuiWindowFlags_HorizontalScrollbar | (disable_mouse_wheel ? ImGuiWindowFlags_NoScrollWithMouse : 0);
+ ImGui::BeginChild("ChildL", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.5f, 260), false, window_flags);
for (int i = 0; i < 100; i++)
{
ImGui::Text("%04d: scrollable region", i);
@@ -1552,8 +1808,9 @@ static void ShowDemoWindowLayout()
// Child 2: rounded border
{
+ ImGuiWindowFlags window_flags = (disable_mouse_wheel ? ImGuiWindowFlags_NoScrollWithMouse : 0) | (disable_menu ? 0 : ImGuiWindowFlags_MenuBar);
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 5.0f);
- ImGui::BeginChild("Child2", ImVec2(0, 300), true, (disable_mouse_wheel ? ImGuiWindowFlags_NoScrollWithMouse : 0) | (disable_menu ? 0 : ImGuiWindowFlags_MenuBar));
+ ImGui::BeginChild("ChildR", ImVec2(0, 260), true, window_flags);
if (!disable_menu && ImGui::BeginMenuBar())
{
if (ImGui::BeginMenu("Menu"))
@@ -1568,47 +1825,69 @@ static void ShowDemoWindowLayout()
{
char buf[32];
sprintf(buf, "%03d", i);
- ImGui::Button(buf, ImVec2(-1.0f, 0.0f));
+ ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f));
ImGui::NextColumn();
}
ImGui::EndChild();
ImGui::PopStyleVar();
}
+ ImGui::Separator();
+
+ // Demonstrate a few extra things
+ // - Changing ImGuiCol_ChildBg (which is transparent black in default styles)
+ // - Using SetCursorPos() to position the child window (because the child window is an item from the POV of the parent window)
+ // You can also call SetNextWindowPos() to position the child window. The parent window will effectively layout from this position.
+ // - Using ImGui::GetItemRectMin/Max() to query the "item" state (because the child window is an item from the POV of the parent window)
+ // See "Widgets" -> "Querying Status (Active/Focused/Hovered etc.)" section for more details about this.
+ {
+ ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10);
+ ImGui::PushStyleColor(ImGuiCol_ChildBg, IM_COL32(255, 0, 0, 100));
+ ImGui::BeginChild("Red", ImVec2(200, 100), true, ImGuiWindowFlags_None);
+ for (int n = 0; n < 50; n++)
+ ImGui::Text("Some test %d", n);
+ ImGui::EndChild();
+ ImVec2 child_rect_min = ImGui::GetItemRectMin();
+ ImVec2 child_rect_max = ImGui::GetItemRectMax();
+ ImGui::PopStyleColor();
+ ImGui::Text("Rect of child window is: (%.0f,%.0f) (%.0f,%.0f)", child_rect_min.x, child_rect_min.y, child_rect_max.x, child_rect_max.y);
+ }
+
ImGui::TreePop();
}
if (ImGui::TreeNode("Widgets Width"))
{
+ // Use SetNextItemWidth() to set the width of a single upcoming item.
+ // Use PushItemWidth()/PopItemWidth() to set the width of a group of items.
static float f = 0.0f;
- ImGui::Text("PushItemWidth(100)");
- ImGui::SameLine(); ShowHelpMarker("Fixed width.");
- ImGui::PushItemWidth(100);
+ ImGui::Text("SetNextItemWidth/PushItemWidth(100)");
+ ImGui::SameLine(); HelpMarker("Fixed width.");
+ ImGui::SetNextItemWidth(100);
ImGui::DragFloat("float##1", &f);
- ImGui::PopItemWidth();
- ImGui::Text("PushItemWidth(GetWindowWidth() * 0.5f)");
- ImGui::SameLine(); ShowHelpMarker("Half of window width.");
- ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
+ ImGui::Text("SetNextItemWidth/PushItemWidth(GetWindowWidth() * 0.5f)");
+ ImGui::SameLine(); HelpMarker("Half of window width.");
+ ImGui::SetNextItemWidth(ImGui::GetWindowWidth() * 0.5f);
ImGui::DragFloat("float##2", &f);
- ImGui::PopItemWidth();
- ImGui::Text("PushItemWidth(GetContentRegionAvailWidth() * 0.5f)");
- ImGui::SameLine(); ShowHelpMarker("Half of available width.\n(~ right-cursor_pos)\n(works within a column set)");
- ImGui::PushItemWidth(ImGui::GetContentRegionAvailWidth() * 0.5f);
+ ImGui::Text("SetNextItemWidth/PushItemWidth(GetContentRegionAvail().x * 0.5f)");
+ ImGui::SameLine(); HelpMarker("Half of available width.\n(~ right-cursor_pos)\n(works within a column set)");
+ ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x * 0.5f);
ImGui::DragFloat("float##3", &f);
- ImGui::PopItemWidth();
- ImGui::Text("PushItemWidth(-100)");
- ImGui::SameLine(); ShowHelpMarker("Align to right edge minus 100");
- ImGui::PushItemWidth(-100);
+ ImGui::Text("SetNextItemWidth/PushItemWidth(-100)");
+ ImGui::SameLine(); HelpMarker("Align to right edge minus 100");
+ ImGui::SetNextItemWidth(-100);
ImGui::DragFloat("float##4", &f);
- ImGui::PopItemWidth();
- ImGui::Text("PushItemWidth(-1)");
- ImGui::SameLine(); ShowHelpMarker("Align to right edge");
+ // Demonstrate using PushItemWidth to surround three items. Calling SetNextItemWidth() before each of them would have the same effect.
+ ImGui::Text("SetNextItemWidth/PushItemWidth(-1)");
+ ImGui::SameLine(); HelpMarker("Align to right edge");
ImGui::PushItemWidth(-1);
- ImGui::DragFloat("float##5", &f);
+ ImGui::DragFloat("##float5a", &f);
+ ImGui::DragFloat("##float5b", &f);
+ ImGui::DragFloat("##float5c", &f);
ImGui::PopItemWidth();
ImGui::TreePop();
@@ -1702,9 +1981,80 @@ static void ShowDemoWindowLayout()
ImGui::TreePop();
}
+ if (ImGui::TreeNode("Tabs"))
+ {
+ if (ImGui::TreeNode("Basic"))
+ {
+ ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_None;
+ if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags))
+ {
+ if (ImGui::BeginTabItem("Avocado"))
+ {
+ ImGui::Text("This is the Avocado tab!\nblah blah blah blah blah");
+ ImGui::EndTabItem();
+ }
+ if (ImGui::BeginTabItem("Broccoli"))
+ {
+ ImGui::Text("This is the Broccoli tab!\nblah blah blah blah blah");
+ ImGui::EndTabItem();
+ }
+ if (ImGui::BeginTabItem("Cucumber"))
+ {
+ ImGui::Text("This is the Cucumber tab!\nblah blah blah blah blah");
+ ImGui::EndTabItem();
+ }
+ ImGui::EndTabBar();
+ }
+ ImGui::Separator();
+ ImGui::TreePop();
+ }
+
+ if (ImGui::TreeNode("Advanced & Close Button"))
+ {
+ // Expose a couple of the available flags. In most cases you may just call BeginTabBar() with no flags (0).
+ static ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_Reorderable;
+ ImGui::CheckboxFlags("ImGuiTabBarFlags_Reorderable", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_Reorderable);
+ ImGui::CheckboxFlags("ImGuiTabBarFlags_AutoSelectNewTabs", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_AutoSelectNewTabs);
+ ImGui::CheckboxFlags("ImGuiTabBarFlags_TabListPopupButton", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_TabListPopupButton);
+ ImGui::CheckboxFlags("ImGuiTabBarFlags_NoCloseWithMiddleMouseButton", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_NoCloseWithMiddleMouseButton);
+ if ((tab_bar_flags & ImGuiTabBarFlags_FittingPolicyMask_) == 0)
+ tab_bar_flags |= ImGuiTabBarFlags_FittingPolicyDefault_;
+ if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyResizeDown", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_FittingPolicyResizeDown))
+ tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyResizeDown);
+ if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyScroll", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_FittingPolicyScroll))
+ tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyScroll);
+
+ // Tab Bar
+ const char* names[4] = { "Artichoke", "Beetroot", "Celery", "Daikon" };
+ static bool opened[4] = { true, true, true, true }; // Persistent user state
+ for (int n = 0; n < IM_ARRAYSIZE(opened); n++)
+ {
+ if (n > 0) { ImGui::SameLine(); }
+ ImGui::Checkbox(names[n], &opened[n]);
+ }
+
+ // Passing a bool* to BeginTabItem() is similar to passing one to Begin(): the underlying bool will be set to false when the tab is closed.
+ if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags))
+ {
+ for (int n = 0; n < IM_ARRAYSIZE(opened); n++)
+ if (opened[n] && ImGui::BeginTabItem(names[n], &opened[n], ImGuiTabItemFlags_None))
+ {
+ ImGui::Text("This is the %s tab!", names[n]);
+ if (n & 1)
+ ImGui::Text("I am an odd tab.");
+ ImGui::EndTabItem();
+ }
+ ImGui::EndTabBar();
+ }
+ ImGui::Separator();
+ ImGui::TreePop();
+ }
+ ImGui::TreePop();
+ }
+
if (ImGui::TreeNode("Groups"))
{
- ImGui::TextWrapped("(Using ImGui::BeginGroup()/EndGroup() to layout items. BeginGroup() basically locks the horizontal position. EndGroup() bundles the whole group so that you can use functions such as IsItemHovered() on it.)");
+ HelpMarker("BeginGroup() basically locks the horizontal position for new line. EndGroup() bundles the whole group so that you can use \"item\" functions such as IsItemHovered()/IsItemActive() or SameLine() etc. on the whole group.");
ImGui::BeginGroup();
{
ImGui::BeginGroup();
@@ -1748,104 +2098,219 @@ static void ShowDemoWindowLayout()
if (ImGui::TreeNode("Text Baseline Alignment"))
{
- ImGui::TextWrapped("(This is testing the vertical alignment that occurs on text to keep it at the same baseline as widgets. Lines only composed of text or \"small\" widgets fit in less vertical spaces than lines with normal widgets)");
+ {
+ ImGui::BulletText("Text baseline:");
+ ImGui::SameLine();
+ HelpMarker("This is testing the vertical alignment that gets applied on text to keep it aligned with widgets. Lines only composed of text or \"small\" widgets fit in less vertical spaces than lines with normal widgets.");
+ ImGui::Indent();
- ImGui::Text("One\nTwo\nThree"); ImGui::SameLine();
- ImGui::Text("Hello\nWorld"); ImGui::SameLine();
- ImGui::Text("Banana");
+ ImGui::Text("KO Blahblah"); ImGui::SameLine();
+ ImGui::Button("Some framed item"); ImGui::SameLine();
+ HelpMarker("Baseline of button will look misaligned with text..");
- ImGui::Text("Banana"); ImGui::SameLine();
- ImGui::Text("Hello\nWorld"); ImGui::SameLine();
- ImGui::Text("One\nTwo\nThree");
+ // If your line starts with text, call AlignTextToFramePadding() to align text to upcoming widgets.
+ // Because we don't know what's coming after the Text() statement, we need to move the text baseline down by FramePadding.y
+ ImGui::AlignTextToFramePadding();
+ ImGui::Text("OK Blahblah"); ImGui::SameLine();
+ ImGui::Button("Some framed item"); ImGui::SameLine();
+ HelpMarker("We call AlignTextToFramePadding() to vertically align the text baseline by +FramePadding.y");
- ImGui::Button("HOP##1"); ImGui::SameLine();
- ImGui::Text("Banana"); ImGui::SameLine();
- ImGui::Text("Hello\nWorld"); ImGui::SameLine();
- ImGui::Text("Banana");
+ // SmallButton() uses the same vertical padding as Text
+ ImGui::Button("TEST##1"); ImGui::SameLine();
+ ImGui::Text("TEST"); ImGui::SameLine();
+ ImGui::SmallButton("TEST##2");
- ImGui::Button("HOP##2"); ImGui::SameLine();
- ImGui::Text("Hello\nWorld"); ImGui::SameLine();
- ImGui::Text("Banana");
+ // If your line starts with text, call AlignTextToFramePadding() to align text to upcoming widgets.
+ ImGui::AlignTextToFramePadding();
+ ImGui::Text("Text aligned to framed item"); ImGui::SameLine();
+ ImGui::Button("Item##1"); ImGui::SameLine();
+ ImGui::Text("Item"); ImGui::SameLine();
+ ImGui::SmallButton("Item##2"); ImGui::SameLine();
+ ImGui::Button("Item##3");
- ImGui::Button("TEST##1"); ImGui::SameLine();
- ImGui::Text("TEST"); ImGui::SameLine();
- ImGui::SmallButton("TEST##2");
+ ImGui::Unindent();
+ }
- ImGui::AlignTextToFramePadding(); // If your line starts with text, call this to align it to upcoming widgets.
- ImGui::Text("Text aligned to Widget"); ImGui::SameLine();
- ImGui::Button("Widget##1"); ImGui::SameLine();
- ImGui::Text("Widget"); ImGui::SameLine();
- ImGui::SmallButton("Widget##2"); ImGui::SameLine();
- ImGui::Button("Widget##3");
+ ImGui::Spacing();
- // Tree
- const float spacing = ImGui::GetStyle().ItemInnerSpacing.x;
- ImGui::Button("Button##1");
- ImGui::SameLine(0.0f, spacing);
- if (ImGui::TreeNode("Node##1")) { for (int i = 0; i < 6; i++) ImGui::BulletText("Item %d..", i); ImGui::TreePop(); } // Dummy tree data
+ {
+ ImGui::BulletText("Multi-line text:");
+ ImGui::Indent();
+ ImGui::Text("One\nTwo\nThree"); ImGui::SameLine();
+ ImGui::Text("Hello\nWorld"); ImGui::SameLine();
+ ImGui::Text("Banana");
- ImGui::AlignTextToFramePadding(); // Vertically align text node a bit lower so it'll be vertically centered with upcoming widget. Otherwise you can use SmallButton (smaller fit).
- bool node_open = ImGui::TreeNode("Node##2"); // Common mistake to avoid: if we want to SameLine after TreeNode we need to do it before we add child content.
- ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##2");
- if (node_open) { for (int i = 0; i < 6; i++) ImGui::BulletText("Item %d..", i); ImGui::TreePop(); } // Dummy tree data
+ ImGui::Text("Banana"); ImGui::SameLine();
+ ImGui::Text("Hello\nWorld"); ImGui::SameLine();
+ ImGui::Text("One\nTwo\nThree");
- // Bullet
- ImGui::Button("Button##3");
- ImGui::SameLine(0.0f, spacing);
- ImGui::BulletText("Bullet text");
+ ImGui::Button("HOP##1"); ImGui::SameLine();
+ ImGui::Text("Banana"); ImGui::SameLine();
+ ImGui::Text("Hello\nWorld"); ImGui::SameLine();
+ ImGui::Text("Banana");
- ImGui::AlignTextToFramePadding();
- ImGui::BulletText("Node");
- ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##4");
+ ImGui::Button("HOP##2"); ImGui::SameLine();
+ ImGui::Text("Hello\nWorld"); ImGui::SameLine();
+ ImGui::Text("Banana");
+ ImGui::Unindent();
+ }
+
+ ImGui::Spacing();
+
+ {
+ ImGui::BulletText("Misc items:");
+ ImGui::Indent();
+
+ // SmallButton() sets FramePadding to zero. Text baseline is aligned to match baseline of previous Button
+ ImGui::Button("80x80", ImVec2(80, 80));
+ ImGui::SameLine();
+ ImGui::Button("50x50", ImVec2(50, 50));
+ ImGui::SameLine();
+ ImGui::Button("Button()");
+ ImGui::SameLine();
+ ImGui::SmallButton("SmallButton()");
+
+ // Tree
+ const float spacing = ImGui::GetStyle().ItemInnerSpacing.x;
+ ImGui::Button("Button##1");
+ ImGui::SameLine(0.0f, spacing);
+ if (ImGui::TreeNode("Node##1")) { for (int i = 0; i < 6; i++) ImGui::BulletText("Item %d..", i); ImGui::TreePop(); } // Dummy tree data
+
+ ImGui::AlignTextToFramePadding(); // Vertically align text node a bit lower so it'll be vertically centered with upcoming widget. Otherwise you can use SmallButton (smaller fit).
+ bool node_open = ImGui::TreeNode("Node##2");// Common mistake to avoid: if we want to SameLine after TreeNode we need to do it before we add child content.
+ ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##2");
+ if (node_open) { for (int i = 0; i < 6; i++) ImGui::BulletText("Item %d..", i); ImGui::TreePop(); } // Dummy tree data
+
+ // Bullet
+ ImGui::Button("Button##3");
+ ImGui::SameLine(0.0f, spacing);
+ ImGui::BulletText("Bullet text");
+
+ ImGui::AlignTextToFramePadding();
+ ImGui::BulletText("Node");
+ ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##4");
+ ImGui::Unindent();
+ }
ImGui::TreePop();
}
if (ImGui::TreeNode("Scrolling"))
{
- ImGui::TextWrapped("(Use SetScrollHereY() or SetScrollFromPosY() to scroll to a given position.)");
- static bool track = true;
- static int track_line = 50, scroll_to_px = 200;
- ImGui::Checkbox("Track", &track);
- ImGui::PushItemWidth(100);
- ImGui::SameLine(130); track |= ImGui::DragInt("##line", &track_line, 0.25f, 0, 99, "Line = %d");
- bool scroll_to = ImGui::Button("Scroll To Pos");
- ImGui::SameLine(130); scroll_to |= ImGui::DragInt("##pos_y", &scroll_to_px, 1.00f, 0, 9999, "Y = %d px");
- ImGui::PopItemWidth();
- if (scroll_to) track = false;
+ // Vertical scroll functions
+ HelpMarker("Use SetScrollHereY() or SetScrollFromPosY() to scroll to a given vertical position.");
+ static int track_item = 50;
+ static bool enable_track = true;
+ static bool enable_extra_decorations = false;
+ static float scroll_to_off_px = 0.0f;
+ static float scroll_to_pos_px = 200.0f;
+
+ ImGui::Checkbox("Decoration", &enable_extra_decorations);
+ ImGui::SameLine();
+ HelpMarker("We expose this for testing because scrolling sometimes had issues with window decoration such as menu-bars.");
+
+ ImGui::Checkbox("Track", &enable_track);
+ ImGui::PushItemWidth(100);
+ ImGui::SameLine(140); enable_track |= ImGui::DragInt("##item", &track_item, 0.25f, 0, 99, "Item = %d");
+
+ bool scroll_to_off = ImGui::Button("Scroll Offset");
+ ImGui::SameLine(140); scroll_to_off |= ImGui::DragFloat("##off", &scroll_to_off_px, 1.00f, 0, FLT_MAX, "+%.0f px");
+
+ bool scroll_to_pos = ImGui::Button("Scroll To Pos");
+ ImGui::SameLine(140); scroll_to_pos |= ImGui::DragFloat("##pos", &scroll_to_pos_px, 1.00f, -10, FLT_MAX, "X/Y = %.0f px");
+ ImGui::PopItemWidth();
+
+ if (scroll_to_off || scroll_to_pos)
+ enable_track = false;
+
+ ImGuiStyle& style = ImGui::GetStyle();
+ float child_w = (ImGui::GetContentRegionAvail().x - 4 * style.ItemSpacing.x) / 5;
+ if (child_w < 1.0f)
+ child_w = 1.0f;
+ ImGui::PushID("##VerticalScrolling");
for (int i = 0; i < 5; i++)
{
if (i > 0) ImGui::SameLine();
ImGui::BeginGroup();
- ImGui::Text("%s", i == 0 ? "Top" : i == 1 ? "25%" : i == 2 ? "Center" : i == 3 ? "75%" : "Bottom");
- ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(ImGui::GetWindowWidth() * 0.17f, 200.0f), true);
- if (scroll_to)
- ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + scroll_to_px, i * 0.25f);
- for (int line = 0; line < 100; line++)
+ const char* names[] = { "Top", "25%", "Center", "75%", "Bottom" };
+ ImGui::TextUnformatted(names[i]);
+
+ ImGuiWindowFlags child_flags = enable_extra_decorations ? ImGuiWindowFlags_MenuBar : 0;
+ bool window_visible = ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(child_w, 200.0f), true, child_flags);
+ if (ImGui::BeginMenuBar())
{
- if (track && line == track_line)
+ ImGui::TextUnformatted("abc");
+ ImGui::EndMenuBar();
+ }
+ if (scroll_to_off)
+ ImGui::SetScrollY(scroll_to_off_px);
+ if (scroll_to_pos)
+ ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + scroll_to_pos_px, i * 0.25f);
+ if (window_visible) // Avoid calling SetScrollHereY when running with culled items
+ {
+ for (int item = 0; item < 100; item++)
{
- ImGui::TextColored(ImVec4(1,1,0,1), "Line %d", line);
- ImGui::SetScrollHereY(i * 0.25f); // 0.0f:top, 0.5f:center, 1.0f:bottom
- }
- else
- {
- ImGui::Text("Line %d", line);
+ if (enable_track && item == track_item)
+ {
+ ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item);
+ ImGui::SetScrollHereY(i * 0.25f); // 0.0f:top, 0.5f:center, 1.0f:bottom
+ }
+ else
+ {
+ ImGui::Text("Item %d", item);
+ }
}
}
- float scroll_y = ImGui::GetScrollY(), scroll_max_y = ImGui::GetScrollMaxY();
+ float scroll_y = ImGui::GetScrollY();
+ float scroll_max_y = ImGui::GetScrollMaxY();
ImGui::EndChild();
- ImGui::Text("%.0f/%0.f", scroll_y, scroll_max_y);
+ ImGui::Text("%.0f/%.0f", scroll_y, scroll_max_y);
ImGui::EndGroup();
}
- ImGui::TreePop();
- }
+ ImGui::PopID();
- if (ImGui::TreeNode("Horizontal Scrolling"))
- {
- ImGui::Bullet(); ImGui::TextWrapped("Horizontal scrolling for a window has to be enabled explicitly via the ImGuiWindowFlags_HorizontalScrollbar flag.");
- ImGui::Bullet(); ImGui::TextWrapped("You may want to explicitly specify content width by calling SetNextWindowContentWidth() before Begin().");
+ // Horizontal scroll functions
+ ImGui::Spacing();
+ HelpMarker("Use SetScrollHereX() or SetScrollFromPosX() to scroll to a given horizontal position.\n\nUsing the \"Scroll To Pos\" button above will make the discontinuity at edges visible: scrolling to the top/bottom/left/right-most item will add an additional WindowPadding to reflect on reaching the edge of the list.\n\nBecause the clipping rectangle of most window hides half worth of WindowPadding on the left/right, using SetScrollFromPosX(+1) will usually result in clipped text whereas the equivalent SetScrollFromPosY(+1) wouldn't.");
+ ImGui::PushID("##HorizontalScrolling");
+ for (int i = 0; i < 5; i++)
+ {
+ float child_height = ImGui::GetTextLineHeight() + style.ScrollbarSize + style.WindowPadding.y * 2.0f;
+ ImGuiWindowFlags child_flags = ImGuiWindowFlags_HorizontalScrollbar | (enable_extra_decorations ? ImGuiWindowFlags_AlwaysVerticalScrollbar : 0);
+ bool window_visible = ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(-100, child_height), true, child_flags);
+ if (scroll_to_off)
+ ImGui::SetScrollX(scroll_to_off_px);
+ if (scroll_to_pos)
+ ImGui::SetScrollFromPosX(ImGui::GetCursorStartPos().x + scroll_to_pos_px, i * 0.25f);
+ if (window_visible) // Avoid calling SetScrollHereY when running with culled items
+ {
+ for (int item = 0; item < 100; item++)
+ {
+ if (enable_track && item == track_item)
+ {
+ ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item);
+ ImGui::SetScrollHereX(i * 0.25f); // 0.0f:left, 0.5f:center, 1.0f:right
+ }
+ else
+ {
+ ImGui::Text("Item %d", item);
+ }
+ ImGui::SameLine();
+ }
+ }
+ float scroll_x = ImGui::GetScrollX();
+ float scroll_max_x = ImGui::GetScrollMaxX();
+ ImGui::EndChild();
+ ImGui::SameLine();
+ const char* names[] = { "Left", "25%", "Center", "75%", "Right" };
+ ImGui::Text("%s\n%.0f/%.0f", names[i], scroll_x, scroll_max_x);
+ ImGui::Spacing();
+ }
+ ImGui::PopID();
+
+ // Miscellaneous Horizontal Scrolling Demo
+ HelpMarker("Horizontal scrolling for a window has to be enabled explicitly via the ImGuiWindowFlags_HorizontalScrollbar flag.\n\nYou may want to explicitly specify content width by calling SetNextWindowContentWidth() before Begin().");
static int lines = 7;
ImGui::SliderInt("Lines", &lines, 1, 15);
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
@@ -1872,20 +2337,112 @@ static void ShowDemoWindowLayout()
ImGui::PopID();
}
}
- float scroll_x = ImGui::GetScrollX(), scroll_max_x = ImGui::GetScrollMaxX();
+ float scroll_x = ImGui::GetScrollX();
+ float scroll_max_x = ImGui::GetScrollMaxX();
ImGui::EndChild();
ImGui::PopStyleVar(2);
float scroll_x_delta = 0.0f;
- ImGui::SmallButton("<<"); if (ImGui::IsItemActive()) scroll_x_delta = -ImGui::GetIO().DeltaTime * 1000.0f; ImGui::SameLine();
+ ImGui::SmallButton("<<"); if (ImGui::IsItemActive()) { scroll_x_delta = -ImGui::GetIO().DeltaTime * 1000.0f; } ImGui::SameLine();
ImGui::Text("Scroll from code"); ImGui::SameLine();
- ImGui::SmallButton(">>"); if (ImGui::IsItemActive()) scroll_x_delta = +ImGui::GetIO().DeltaTime * 1000.0f; ImGui::SameLine();
+ ImGui::SmallButton(">>"); if (ImGui::IsItemActive()) { scroll_x_delta = +ImGui::GetIO().DeltaTime * 1000.0f; } ImGui::SameLine();
ImGui::Text("%.0f/%.0f", scroll_x, scroll_max_x);
if (scroll_x_delta != 0.0f)
{
ImGui::BeginChild("scrolling"); // Demonstrate a trick: you can use Begin to set yourself in the context of another window (here we are already out of your child window)
ImGui::SetScrollX(ImGui::GetScrollX() + scroll_x_delta);
+ ImGui::EndChild();
+ }
+ ImGui::Spacing();
+
+ static bool show_horizontal_contents_size_demo_window = false;
+ ImGui::Checkbox("Show Horizontal contents size demo window", &show_horizontal_contents_size_demo_window);
+
+ if (show_horizontal_contents_size_demo_window)
+ {
+ static bool show_h_scrollbar = true;
+ static bool show_button = true;
+ static bool show_tree_nodes = true;
+ static bool show_text_wrapped = false;
+ static bool show_columns = true;
+ static bool show_tab_bar = true;
+ static bool show_child = false;
+ static bool explicit_content_size = false;
+ static float contents_size_x = 300.0f;
+ if (explicit_content_size)
+ ImGui::SetNextWindowContentSize(ImVec2(contents_size_x, 0.0f));
+ ImGui::Begin("Horizontal contents size demo window", &show_horizontal_contents_size_demo_window, show_h_scrollbar ? ImGuiWindowFlags_HorizontalScrollbar : 0);
+ ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(2, 0));
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 0));
+ HelpMarker("Test of different widgets react and impact the work rectangle growing when horizontal scrolling is enabled.\n\nUse 'Metrics->Tools->Show windows rectangles' to visualize rectangles.");
+ ImGui::Checkbox("H-scrollbar", &show_h_scrollbar);
+ ImGui::Checkbox("Button", &show_button); // Will grow contents size (unless explicitly overwritten)
+ ImGui::Checkbox("Tree nodes", &show_tree_nodes); // Will grow contents size and display highlight over full width
+ ImGui::Checkbox("Text wrapped", &show_text_wrapped);// Will grow and use contents size
+ ImGui::Checkbox("Columns", &show_columns); // Will use contents size
+ ImGui::Checkbox("Tab bar", &show_tab_bar); // Will use contents size
+ ImGui::Checkbox("Child", &show_child); // Will grow and use contents size
+ ImGui::Checkbox("Explicit content size", &explicit_content_size);
+ ImGui::Text("Scroll %.1f/%.1f %.1f/%.1f", ImGui::GetScrollX(), ImGui::GetScrollMaxX(), ImGui::GetScrollY(), ImGui::GetScrollMaxY());
+ if (explicit_content_size)
+ {
+ ImGui::SameLine();
+ ImGui::SetNextItemWidth(100);
+ ImGui::DragFloat("##csx", &contents_size_x);
+ ImVec2 p = ImGui::GetCursorScreenPos();
+ ImGui::GetWindowDrawList()->AddRectFilled(p, ImVec2(p.x + 10, p.y + 10), IM_COL32_WHITE);
+ ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(p.x + contents_size_x - 10, p.y), ImVec2(p.x + contents_size_x, p.y + 10), IM_COL32_WHITE);
+ ImGui::Dummy(ImVec2(0, 10));
+ }
+ ImGui::PopStyleVar(2);
+ ImGui::Separator();
+ if (show_button)
+ {
+ ImGui::Button("this is a 300-wide button", ImVec2(300, 0));
+ }
+ if (show_tree_nodes)
+ {
+ bool open = true;
+ if (ImGui::TreeNode("this is a tree node"))
+ {
+ if (ImGui::TreeNode("another one of those tree node..."))
+ {
+ ImGui::Text("Some tree contents");
+ ImGui::TreePop();
+ }
+ ImGui::TreePop();
+ }
+ ImGui::CollapsingHeader("CollapsingHeader", &open);
+ }
+ if (show_text_wrapped)
+ {
+ ImGui::TextWrapped("This text should automatically wrap on the edge of the work rectangle.");
+ }
+ if (show_columns)
+ {
+ ImGui::Columns(4);
+ for (int n = 0; n < 4; n++)
+ {
+ ImGui::Text("Width %.2f", ImGui::GetColumnWidth());
+ ImGui::NextColumn();
+ }
+ ImGui::Columns(1);
+ }
+ if (show_tab_bar && ImGui::BeginTabBar("Hello"))
+ {
+ if (ImGui::BeginTabItem("OneOneOne")) { ImGui::EndTabItem(); }
+ if (ImGui::BeginTabItem("TwoTwoTwo")) { ImGui::EndTabItem(); }
+ if (ImGui::BeginTabItem("ThreeThreeThree")) { ImGui::EndTabItem(); }
+ if (ImGui::BeginTabItem("FourFourFour")) { ImGui::EndTabItem(); }
+ ImGui::EndTabBar();
+ }
+ if (show_child)
+ {
+ ImGui::BeginChild("child", ImVec2(0,0), true);
+ ImGui::EndChild();
+ }
ImGui::End();
}
+
ImGui::TreePop();
}
@@ -1893,12 +2450,12 @@ static void ShowDemoWindowLayout()
{
static ImVec2 size(100, 100), offset(50, 20);
ImGui::TextWrapped("On a per-widget basis we are occasionally clipping text CPU-side if it won't fit in its frame. Otherwise we are doing coarser clipping + passing a scissor rectangle to the renderer. The system is designed to try minimizing both execution and CPU/GPU rendering cost.");
- ImGui::DragFloat2("size", (float*)&size, 0.5f, 0.0f, 200.0f, "%.0f");
+ ImGui::DragFloat2("size", (float*)&size, 0.5f, 1.0f, 200.0f, "%.0f");
ImGui::TextWrapped("(Click and drag)");
ImVec2 pos = ImGui::GetCursorScreenPos();
ImVec4 clip_rect(pos.x, pos.y, pos.x + size.x, pos.y + size.y);
ImGui::InvisibleButton("##dummy", size);
- if (ImGui::IsItemActive() && ImGui::IsMouseDragging()) { offset.x += ImGui::GetIO().MouseDelta.x; offset.y += ImGui::GetIO().MouseDelta.y; }
+ if (ImGui::IsItemActive() && ImGui::IsMouseDragging(0)) { offset.x += ImGui::GetIO().MouseDelta.x; offset.y += ImGui::GetIO().MouseDelta.y; }
ImGui::GetWindowDrawList()->AddRectFilled(pos, ImVec2(pos.x + size.x, pos.y + size.y), IM_COL32(90, 90, 120, 255));
ImGui::GetWindowDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize()*2.0f, ImVec2(pos.x + offset.x, pos.y + offset.y), IM_COL32(255, 255, 255, 255), "Line 1 hello\nLine 2 clip me!", NULL, 0.0f, &clip_rect);
ImGui::TreePop();
@@ -1910,12 +2467,13 @@ static void ShowDemoWindowPopups()
if (!ImGui::CollapsingHeader("Popups & Modal windows"))
return;
- // Popups are windows with a few special properties:
+ // The properties of popups windows are:
// - They block normal mouse hovering detection outside them. (*)
// - Unless modal, they can be closed by clicking anywhere outside them, or by pressing ESCAPE.
- // - Their visibility state (~bool) is held internally by imgui instead of being held by the programmer as we are used to with regular Begin() calls.
+ // - Their visibility state (~bool) is held internally by Dear ImGui instead of being held by the programmer as we are used to with regular Begin() calls.
+ // User can manipulate the visibility state by calling OpenPopup().
// (*) One can use IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup) to bypass it and detect hovering even when normally blocked by a popup.
- // Those three properties are intimately connected. The library needs to hold their visibility state because it can close popups at any time.
+ // Those three properties are connected. The library needs to hold their visibility state because it can close popups at any time.
// Typical use for regular windows:
// bool my_tool_is_active = false; if (ImGui::Button("Open")) my_tool_is_active = true; [...] if (my_tool_is_active) Begin("My Tool", &my_tool_is_active) { [...] } End();
@@ -1923,7 +2481,7 @@ static void ShowDemoWindowPopups()
// if (ImGui::Button("Open")) ImGui::OpenPopup("MyPopup"); if (ImGui::BeginPopup("MyPopup") { [...] EndPopup(); }
// With popups we have to go through a library call (here OpenPopup) to manipulate the visibility state.
- // This may be a bit confusing at first but it should quickly make sense. Follow on the examples below.
+ // This may be a bit confusing at first but it should quickly make sense. Follow on the examples below.
if (ImGui::TreeNode("Popups"))
{
@@ -1976,6 +2534,13 @@ static void ShowDemoWindowPopups()
if (ImGui::BeginMenu("Sub-menu"))
{
ImGui::MenuItem("Click me");
+ if (ImGui::Button("Stacked Popup"))
+ ImGui::OpenPopup("another popup");
+ if (ImGui::BeginPopup("another popup"))
+ {
+ ImGui::Text("I am the last one here.");
+ ImGui::EndPopup();
+ }
ImGui::EndMenu();
}
ImGui::EndPopup();
@@ -2008,18 +2573,17 @@ static void ShowDemoWindowPopups()
{
if (ImGui::Selectable("Set to zero")) value = 0.0f;
if (ImGui::Selectable("Set to PI")) value = 3.1415f;
- ImGui::PushItemWidth(-1);
+ ImGui::SetNextItemWidth(-1);
ImGui::DragFloat("##Value", &value, 0.1f, 0.0f, 0.0f);
- ImGui::PopItemWidth();
ImGui::EndPopup();
}
// We can also use OpenPopupOnItemClick() which is the same as BeginPopupContextItem() but without the Begin call.
// So here we will make it that clicking on the text field with the right mouse button (1) will toggle the visibility of the popup above.
- ImGui::Text("(You can also right-click me to the same popup as above.)");
+ ImGui::Text("(You can also right-click me to open the same popup as above.)");
ImGui::OpenPopupOnItemClick("item context menu", 1);
- // When used after an item that has an ID (here the Button), we can skip providing an ID to BeginPopupContextItem().
+ // When used after an item that has an ID (here the Button), we can skip providing an ID to BeginPopupContextItem().
// BeginPopupContextItem() will use the last item ID as the popup ID.
// In addition here, we want to include your editable label inside the button label. We use the ### operator to override the ID (read FAQ about ID for details)
static char name[32] = "Label1";
@@ -2044,6 +2608,7 @@ static void ShowDemoWindowPopups()
if (ImGui::Button("Delete.."))
ImGui::OpenPopup("Delete?");
+
if (ImGui::BeginPopupModal("Delete?", NULL, ImGuiWindowFlags_AlwaysAutoResize))
{
ImGui::Text("All those beautiful files will be deleted.\nThis operation cannot be undone!\n\n");
@@ -2066,17 +2631,32 @@ static void ShowDemoWindowPopups()
if (ImGui::Button("Stacked modals.."))
ImGui::OpenPopup("Stacked 1");
- if (ImGui::BeginPopupModal("Stacked 1"))
+ if (ImGui::BeginPopupModal("Stacked 1", NULL, ImGuiWindowFlags_MenuBar))
{
+ if (ImGui::BeginMenuBar())
+ {
+ if (ImGui::BeginMenu("File"))
+ {
+ if (ImGui::MenuItem("Dummy menu item")) {}
+ ImGui::EndMenu();
+ }
+ ImGui::EndMenuBar();
+ }
ImGui::Text("Hello from Stacked The First\nUsing style.Colors[ImGuiCol_ModalWindowDimBg] behind it.");
+
+ // Testing behavior of widgets stacking their own regular popups over the modal.
static int item = 1;
- ImGui::Combo("Combo", &item, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0");
static float color[4] = { 0.4f,0.7f,0.0f,0.5f };
- ImGui::ColorEdit4("color", color); // This is to test behavior of stacked regular popups over a modal
+ ImGui::Combo("Combo", &item, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0");
+ ImGui::ColorEdit4("color", color);
if (ImGui::Button("Add another modal.."))
ImGui::OpenPopup("Stacked 2");
- if (ImGui::BeginPopupModal("Stacked 2"))
+
+ // Also demonstrate passing a bool* to BeginPopupModal(), this will create a regular close button which will close the popup.
+ // Note that the visibility state of popups is owned by imgui, so the input value of the bool actually doesn't matter here.
+ bool dummy_open = true;
+ if (ImGui::BeginPopupModal("Stacked 2", &dummy_open))
{
ImGui::Text("Hello from Stacked The Second!");
if (ImGui::Button("Close"))
@@ -2119,6 +2699,13 @@ static void ShowDemoWindowColumns()
ImGui::PushID("Columns");
+ static bool disable_indent = false;
+ ImGui::Checkbox("Disable tree indentation", &disable_indent);
+ ImGui::SameLine();
+ HelpMarker("Disable the indenting of tree nodes so demo columns can use the full window width.");
+ if (disable_indent)
+ ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, 0.0f);
+
// Basic columns
if (ImGui::TreeNode("Basic"))
{
@@ -2130,7 +2717,7 @@ static void ShowDemoWindowColumns()
char label[32];
sprintf(label, "Item %d", n);
if (ImGui::Selectable(label)) {}
- //if (ImGui::Button(label, ImVec2(-1,0))) {}
+ //if (ImGui::Button(label, ImVec2(-FLT_MIN,0.0f))) {}
ImGui::NextColumn();
}
ImGui::Columns(1);
@@ -2164,6 +2751,40 @@ static void ShowDemoWindowColumns()
ImGui::TreePop();
}
+ if (ImGui::TreeNode("Borders"))
+ {
+ // NB: Future columns API should allow automatic horizontal borders.
+ static bool h_borders = true;
+ static bool v_borders = true;
+ static int columns_count = 4;
+ const int lines_count = 3;
+ ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8);
+ ImGui::DragInt("##columns_count", &columns_count, 0.1f, 2, 10, "%d columns");
+ if (columns_count < 2)
+ columns_count = 2;
+ ImGui::SameLine();
+ ImGui::Checkbox("horizontal", &h_borders);
+ ImGui::SameLine();
+ ImGui::Checkbox("vertical", &v_borders);
+ ImGui::Columns(columns_count, NULL, v_borders);
+ for (int i = 0; i < columns_count * lines_count; i++)
+ {
+ if (h_borders && ImGui::GetColumnIndex() == 0)
+ ImGui::Separator();
+ ImGui::Text("%c%c%c", 'a' + i, 'a' + i, 'a' + i);
+ ImGui::Text("Width %.2f", ImGui::GetColumnWidth());
+ ImGui::Text("Avail %.2f", ImGui::GetContentRegionAvail().x);
+ ImGui::Text("Offset %.2f", ImGui::GetColumnOffset());
+ ImGui::Text("Long text that is likely to clip");
+ ImGui::Button("Button", ImVec2(-FLT_MIN, 0.0f));
+ ImGui::NextColumn();
+ }
+ ImGui::Columns(1);
+ if (h_borders)
+ ImGui::Separator();
+ ImGui::TreePop();
+ }
+
// Create multiple items in a same cell before switching to next column
if (ImGui::TreeNode("Mixed items"))
{
@@ -2210,29 +2831,6 @@ static void ShowDemoWindowColumns()
ImGui::TreePop();
}
- if (ImGui::TreeNode("Borders"))
- {
- // NB: Future columns API should allow automatic horizontal borders.
- static bool h_borders = true;
- static bool v_borders = true;
- ImGui::Checkbox("horizontal", &h_borders);
- ImGui::SameLine();
- ImGui::Checkbox("vertical", &v_borders);
- ImGui::Columns(4, NULL, v_borders);
- for (int i = 0; i < 4*3; i++)
- {
- if (h_borders && ImGui::GetColumnIndex() == 0)
- ImGui::Separator();
- ImGui::Text("%c%c%c", 'a'+i, 'a'+i, 'a'+i);
- ImGui::Text("Width %.2f\nOffset %.2f", ImGui::GetColumnWidth(), ImGui::GetColumnOffset());
- ImGui::NextColumn();
- }
- ImGui::Columns(1);
- if (h_borders)
- ImGui::Separator();
- ImGui::TreePop();
- }
-
// Scrolling columns
/*
if (ImGui::TreeNode("Vertical Scrolling"))
@@ -2280,18 +2878,44 @@ static void ShowDemoWindowColumns()
ImGui::TreePop();
}
- bool node_open = ImGui::TreeNode("Tree within single cell");
- ImGui::SameLine(); ShowHelpMarker("NB: Tree node must be poped before ending the cell. There's no storage of state per-cell.");
- if (node_open)
+ if (ImGui::TreeNode("Tree"))
{
- ImGui::Columns(2, "tree items");
- ImGui::Separator();
- if (ImGui::TreeNode("Hello")) { ImGui::BulletText("Sailor"); ImGui::TreePop(); } ImGui::NextColumn();
- if (ImGui::TreeNode("Bonjour")) { ImGui::BulletText("Marin"); ImGui::TreePop(); } ImGui::NextColumn();
+ ImGui::Columns(2, "tree", true);
+ for (int x = 0; x < 3; x++)
+ {
+ bool open1 = ImGui::TreeNode((void*)(intptr_t)x, "Node%d", x);
+ ImGui::NextColumn();
+ ImGui::Text("Node contents");
+ ImGui::NextColumn();
+ if (open1)
+ {
+ for (int y = 0; y < 3; y++)
+ {
+ bool open2 = ImGui::TreeNode((void*)(intptr_t)y, "Node%d.%d", x, y);
+ ImGui::NextColumn();
+ ImGui::Text("Node contents");
+ if (open2)
+ {
+ ImGui::Text("Even more contents");
+ if (ImGui::TreeNode("Tree in column"))
+ {
+ ImGui::Text("The quick brown fox jumps over the lazy dog");
+ ImGui::TreePop();
+ }
+ }
+ ImGui::NextColumn();
+ if (open2)
+ ImGui::TreePop();
+ }
+ ImGui::TreePop();
+ }
+ }
ImGui::Columns(1);
- ImGui::Separator();
ImGui::TreePop();
}
+
+ if (disable_indent)
+ ImGui::PopStyleVar();
ImGui::PopID();
}
@@ -2299,6 +2923,8 @@ static void ShowDemoWindowMisc()
{
if (ImGui::CollapsingHeader("Filtering"))
{
+ // Helper class to easy setup a text filter.
+ // You may want to implement a more feature-full filtering scheme in your own application.
static ImGuiTextFilter filter;
ImGui::Text("Filter usage:\n"
" \"\" display all lines\n"
@@ -2316,12 +2942,14 @@ static void ShowDemoWindowMisc()
{
ImGuiIO& io = ImGui::GetIO();
+ // Display ImGuiIO output flags
ImGui::Text("WantCaptureMouse: %d", io.WantCaptureMouse);
ImGui::Text("WantCaptureKeyboard: %d", io.WantCaptureKeyboard);
ImGui::Text("WantTextInput: %d", io.WantTextInput);
ImGui::Text("WantSetMousePos: %d", io.WantSetMousePos);
ImGui::Text("NavActive: %d, NavVisible: %d", io.NavActive, io.NavVisible);
+ // Display Keyboard/Mouse state
if (ImGui::TreeNode("Keyboard, Mouse & Navigation State"))
{
if (ImGui::IsMousePosValid())
@@ -2335,10 +2963,11 @@ static void ShowDemoWindowMisc()
ImGui::Text("Mouse released:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseReleased(i)) { ImGui::SameLine(); ImGui::Text("b%d", i); }
ImGui::Text("Mouse wheel: %.1f", io.MouseWheel);
- ImGui::Text("Keys down:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (io.KeysDownDuration[i] >= 0.0f) { ImGui::SameLine(); ImGui::Text("%d (%.02f secs)", i, io.KeysDownDuration[i]); }
- ImGui::Text("Keys pressed:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyPressed(i)) { ImGui::SameLine(); ImGui::Text("%d", i); }
- ImGui::Text("Keys release:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyReleased(i)) { ImGui::SameLine(); ImGui::Text("%d", i); }
+ ImGui::Text("Keys down:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (io.KeysDownDuration[i] >= 0.0f) { ImGui::SameLine(); ImGui::Text("%d (0x%X) (%.02f secs)", i, i, io.KeysDownDuration[i]); }
+ ImGui::Text("Keys pressed:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyPressed(i)) { ImGui::SameLine(); ImGui::Text("%d (0x%X)", i, i); }
+ ImGui::Text("Keys release:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyReleased(i)) { ImGui::SameLine(); ImGui::Text("%d (0x%X)", i, i); }
ImGui::Text("Keys mods: %s%s%s%s", io.KeyCtrl ? "CTRL " : "", io.KeyShift ? "SHIFT " : "", io.KeyAlt ? "ALT " : "", io.KeySuper ? "SUPER " : "");
+ ImGui::Text("Chars queue:"); for (int i = 0; i < io.InputQueueCharacters.Size; i++) { ImWchar c = io.InputQueueCharacters[i]; ImGui::SameLine(); ImGui::Text("\'%c\' (0x%04X)", (c > ' ' && c <= 255) ? (char)c : '?', c); } // FIXME: We should convert 'c' to UTF-8 here but the functions are not public.
ImGui::Text("NavInputs down:"); for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputs[i] > 0.0f) { ImGui::SameLine(); ImGui::Text("[%d] %.2f", i, io.NavInputs[i]); }
ImGui::Text("NavInputs pressed:"); for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputsDownDuration[i] == 0.0f) { ImGui::SameLine(); ImGui::Text("[%d]", i); }
@@ -2364,7 +2993,7 @@ static void ShowDemoWindowMisc()
ImGui::InputText("3", buf, IM_ARRAYSIZE(buf));
ImGui::PushAllowKeyboardFocus(false);
ImGui::InputText("4 (tab skip)", buf, IM_ARRAYSIZE(buf));
- //ImGui::SameLine(); ShowHelperMarker("Use ImGui::PushAllowKeyboardFocus(bool)\nto disable tabbing through certain widgets.");
+ //ImGui::SameLine(); HelpMarker("Use ImGui::PushAllowKeyboardFocus(bool)\nto disable tabbing through certain widgets.");
ImGui::PopAllowKeyboardFocus();
ImGui::InputText("5", buf, IM_ARRAYSIZE(buf));
ImGui::TreePop();
@@ -2400,9 +3029,9 @@ static void ShowDemoWindowMisc()
// Use >= 0 parameter to SetKeyboardFocusHere() to focus an upcoming item
static float f3[3] = { 0.0f, 0.0f, 0.0f };
int focus_ahead = -1;
- if (ImGui::Button("Focus on X")) focus_ahead = 0; ImGui::SameLine();
- if (ImGui::Button("Focus on Y")) focus_ahead = 1; ImGui::SameLine();
- if (ImGui::Button("Focus on Z")) focus_ahead = 2;
+ if (ImGui::Button("Focus on X")) { focus_ahead = 0; } ImGui::SameLine();
+ if (ImGui::Button("Focus on Y")) { focus_ahead = 1; } ImGui::SameLine();
+ if (ImGui::Button("Focus on Z")) { focus_ahead = 2; }
if (focus_ahead != -1) ImGui::SetKeyboardFocusHere(focus_ahead);
ImGui::SliderFloat3("Float3", &f3[0], 0.0f, 1.0f);
@@ -2416,33 +3045,28 @@ static void ShowDemoWindowMisc()
for (int button = 0; button < 3; button++)
ImGui::Text("IsMouseDragging(%d):\n w/ default threshold: %d,\n w/ zero threshold: %d\n w/ large threshold: %d",
button, ImGui::IsMouseDragging(button), ImGui::IsMouseDragging(button, 0.0f), ImGui::IsMouseDragging(button, 20.0f));
+
ImGui::Button("Drag Me");
if (ImGui::IsItemActive())
- {
- // Draw a line between the button and the mouse cursor
- ImDrawList* draw_list = ImGui::GetWindowDrawList();
- draw_list->PushClipRectFullScreen();
- draw_list->AddLine(io.MouseClickedPos[0], io.MousePos, ImGui::GetColorU32(ImGuiCol_Button), 4.0f);
- draw_list->PopClipRect();
+ ImGui::GetForegroundDrawList()->AddLine(io.MouseClickedPos[0], io.MousePos, ImGui::GetColorU32(ImGuiCol_Button), 4.0f); // Draw a line between the button and the mouse cursor
- // Drag operations gets "unlocked" when the mouse has moved past a certain threshold (the default threshold is stored in io.MouseDragThreshold)
- // You can request a lower or higher threshold using the second parameter of IsMouseDragging() and GetMouseDragDelta()
- ImVec2 value_raw = ImGui::GetMouseDragDelta(0, 0.0f);
- ImVec2 value_with_lock_threshold = ImGui::GetMouseDragDelta(0);
- ImVec2 mouse_delta = io.MouseDelta;
- ImGui::SameLine(); ImGui::Text("Raw (%.1f, %.1f), WithLockThresold (%.1f, %.1f), MouseDelta (%.1f, %.1f)", value_raw.x, value_raw.y, value_with_lock_threshold.x, value_with_lock_threshold.y, mouse_delta.x, mouse_delta.y);
- }
+ // Drag operations gets "unlocked" when the mouse has moved past a certain threshold (the default threshold is stored in io.MouseDragThreshold)
+ // You can request a lower or higher threshold using the second parameter of IsMouseDragging() and GetMouseDragDelta()
+ ImVec2 value_raw = ImGui::GetMouseDragDelta(0, 0.0f);
+ ImVec2 value_with_lock_threshold = ImGui::GetMouseDragDelta(0);
+ ImVec2 mouse_delta = io.MouseDelta;
+ ImGui::Text("GetMouseDragDelta(0):\n w/ default threshold: (%.1f, %.1f),\n w/ zero threshold: (%.1f, %.1f)\nMouseDelta: (%.1f, %.1f)", value_with_lock_threshold.x, value_with_lock_threshold.y, value_raw.x, value_raw.y, mouse_delta.x, mouse_delta.y);
ImGui::TreePop();
}
if (ImGui::TreeNode("Mouse cursors"))
{
- const char* mouse_cursors_names[] = { "Arrow", "TextInput", "Move", "ResizeNS", "ResizeEW", "ResizeNESW", "ResizeNWSE", "Hand" };
+ const char* mouse_cursors_names[] = { "Arrow", "TextInput", "ResizeAll", "ResizeNS", "ResizeEW", "ResizeNESW", "ResizeNWSE", "Hand", "NotAllowed" };
IM_ASSERT(IM_ARRAYSIZE(mouse_cursors_names) == ImGuiMouseCursor_COUNT);
ImGui::Text("Current mouse cursor = %d: %s", ImGui::GetMouseCursor(), mouse_cursors_names[ImGui::GetMouseCursor()]);
ImGui::Text("Hover to see mouse cursors:");
- ImGui::SameLine(); ShowHelpMarker("Your application can render a different mouse cursor based on what ImGui::GetMouseCursor() returns. If software cursor rendering (io.MouseDrawCursor) is set ImGui will draw the right cursor for you, otherwise your backend needs to handle it.");
+ ImGui::SameLine(); HelpMarker("Your application can render a different mouse cursor based on what ImGui::GetMouseCursor() returns. If software cursor rendering (io.MouseDrawCursor) is set ImGui will draw the right cursor for you, otherwise your backend needs to handle it.");
for (int i = 0; i < ImGuiMouseCursor_COUNT; i++)
{
char label[32];
@@ -2456,9 +3080,150 @@ static void ShowDemoWindowMisc()
}
}
+//-----------------------------------------------------------------------------
+// [SECTION] About Window / ShowAboutWindow()
+// Access from Dear ImGui Demo -> Tools -> About
+//-----------------------------------------------------------------------------
+
+void ImGui::ShowAboutWindow(bool* p_open)
+{
+ if (!ImGui::Begin("About Dear ImGui", p_open, ImGuiWindowFlags_AlwaysAutoResize))
+ {
+ ImGui::End();
+ return;
+ }
+ ImGui::Text("Dear ImGui %s", ImGui::GetVersion());
+ ImGui::Separator();
+ ImGui::Text("By Omar Cornut and all Dear ImGui contributors.");
+ ImGui::Text("Dear ImGui is licensed under the MIT License, see LICENSE for more information.");
+
+ static bool show_config_info = false;
+ ImGui::Checkbox("Config/Build Information", &show_config_info);
+ if (show_config_info)
+ {
+ ImGuiIO& io = ImGui::GetIO();
+ ImGuiStyle& style = ImGui::GetStyle();
+
+ bool copy_to_clipboard = ImGui::Button("Copy to clipboard");
+ ImGui::BeginChildFrame(ImGui::GetID("cfginfos"), ImVec2(0, ImGui::GetTextLineHeightWithSpacing() * 18), ImGuiWindowFlags_NoMove);
+ if (copy_to_clipboard)
+ {
+ ImGui::LogToClipboard();
+ ImGui::LogText("```\n"); // Back quotes will make the text appears without formatting when pasting to GitHub
+ }
+
+ ImGui::Text("Dear ImGui %s (%d)", IMGUI_VERSION, IMGUI_VERSION_NUM);
+ ImGui::Separator();
+ ImGui::Text("sizeof(size_t): %d, sizeof(ImDrawIdx): %d, sizeof(ImDrawVert): %d", (int)sizeof(size_t), (int)sizeof(ImDrawIdx), (int)sizeof(ImDrawVert));
+ ImGui::Text("define: __cplusplus=%d", (int)__cplusplus);
+#ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_OBSOLETE_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_WIN32_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_WIN32_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_FILE_FUNCTIONS
+ ImGui::Text("define: IMGUI_DISABLE_FILE_FUNCTIONS");
+#endif
+#ifdef IMGUI_DISABLE_DEFAULT_ALLOCATORS
+ ImGui::Text("define: IMGUI_DISABLE_DEFAULT_ALLOCATORS");
+#endif
+#ifdef IMGUI_USE_BGRA_PACKED_COLOR
+ ImGui::Text("define: IMGUI_USE_BGRA_PACKED_COLOR");
+#endif
+#ifdef _WIN32
+ ImGui::Text("define: _WIN32");
+#endif
+#ifdef _WIN64
+ ImGui::Text("define: _WIN64");
+#endif
+#ifdef __linux__
+ ImGui::Text("define: __linux__");
+#endif
+#ifdef __APPLE__
+ ImGui::Text("define: __APPLE__");
+#endif
+#ifdef _MSC_VER
+ ImGui::Text("define: _MSC_VER=%d", _MSC_VER);
+#endif
+#ifdef __MINGW32__
+ ImGui::Text("define: __MINGW32__");
+#endif
+#ifdef __MINGW64__
+ ImGui::Text("define: __MINGW64__");
+#endif
+#ifdef __GNUC__
+ ImGui::Text("define: __GNUC__=%d", (int)__GNUC__);
+#endif
+#ifdef __clang_version__
+ ImGui::Text("define: __clang_version__=%s", __clang_version__);
+#endif
+ ImGui::Separator();
+ ImGui::Text("io.BackendPlatformName: %s", io.BackendPlatformName ? io.BackendPlatformName : "NULL");
+ ImGui::Text("io.BackendRendererName: %s", io.BackendRendererName ? io.BackendRendererName : "NULL");
+ ImGui::Text("io.ConfigFlags: 0x%08X", io.ConfigFlags);
+ if (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) ImGui::Text(" NavEnableKeyboard");
+ if (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) ImGui::Text(" NavEnableGamepad");
+ if (io.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) ImGui::Text(" NavEnableSetMousePos");
+ if (io.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard) ImGui::Text(" NavNoCaptureKeyboard");
+ if (io.ConfigFlags & ImGuiConfigFlags_NoMouse) ImGui::Text(" NoMouse");
+ if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) ImGui::Text(" NoMouseCursorChange");
+ if (io.MouseDrawCursor) ImGui::Text("io.MouseDrawCursor");
+ if (io.ConfigMacOSXBehaviors) ImGui::Text("io.ConfigMacOSXBehaviors");
+ if (io.ConfigInputTextCursorBlink) ImGui::Text("io.ConfigInputTextCursorBlink");
+ if (io.ConfigWindowsResizeFromEdges) ImGui::Text("io.ConfigWindowsResizeFromEdges");
+ if (io.ConfigWindowsMoveFromTitleBarOnly) ImGui::Text("io.ConfigWindowsMoveFromTitleBarOnly");
+ if (io.ConfigWindowsMemoryCompactTimer >= 0.0f) ImGui::Text("io.ConfigWindowsMemoryCompactTimer = %.1ff", io.ConfigWindowsMemoryCompactTimer);
+ ImGui::Text("io.BackendFlags: 0x%08X", io.BackendFlags);
+ if (io.BackendFlags & ImGuiBackendFlags_HasGamepad) ImGui::Text(" HasGamepad");
+ if (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) ImGui::Text(" HasMouseCursors");
+ if (io.BackendFlags & ImGuiBackendFlags_HasSetMousePos) ImGui::Text(" HasSetMousePos");
+ if (io.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) ImGui::Text(" RendererHasVtxOffset");
+ ImGui::Separator();
+ ImGui::Text("io.Fonts: %d fonts, Flags: 0x%08X, TexSize: %d,%d", io.Fonts->Fonts.Size, io.Fonts->Flags, io.Fonts->TexWidth, io.Fonts->TexHeight);
+ ImGui::Text("io.DisplaySize: %.2f,%.2f", io.DisplaySize.x, io.DisplaySize.y);
+ ImGui::Text("io.DisplayFramebufferScale: %.2f,%.2f", io.DisplayFramebufferScale.x, io.DisplayFramebufferScale.y);
+ ImGui::Separator();
+ ImGui::Text("style.WindowPadding: %.2f,%.2f", style.WindowPadding.x, style.WindowPadding.y);
+ ImGui::Text("style.WindowBorderSize: %.2f", style.WindowBorderSize);
+ ImGui::Text("style.FramePadding: %.2f,%.2f", style.FramePadding.x, style.FramePadding.y);
+ ImGui::Text("style.FrameRounding: %.2f", style.FrameRounding);
+ ImGui::Text("style.FrameBorderSize: %.2f", style.FrameBorderSize);
+ ImGui::Text("style.ItemSpacing: %.2f,%.2f", style.ItemSpacing.x, style.ItemSpacing.y);
+ ImGui::Text("style.ItemInnerSpacing: %.2f,%.2f", style.ItemInnerSpacing.x, style.ItemInnerSpacing.y);
+
+ if (copy_to_clipboard)
+ {
+ ImGui::LogText("\n```\n");
+ ImGui::LogFinish();
+ }
+ ImGui::EndChildFrame();
+ }
+ ImGui::End();
+}
+
//-----------------------------------------------------------------------------
// [SECTION] Style Editor / ShowStyleEditor()
//-----------------------------------------------------------------------------
+// - ShowStyleSelector()
+// - ShowFontSelector()
+// - ShowStyleEditor()
+//-----------------------------------------------------------------------------
// Demo helper function to select among default colors. See ShowStyleEditor() for more advanced options.
// Here we use the simplified Combo() api that packs items into a single literal string. Useful for quick combo boxes where the choices are known locally.
@@ -2487,15 +3252,20 @@ void ImGui::ShowFontSelector(const char* label)
if (ImGui::BeginCombo(label, font_current->GetDebugName()))
{
for (int n = 0; n < io.Fonts->Fonts.Size; n++)
- if (ImGui::Selectable(io.Fonts->Fonts[n]->GetDebugName(), io.Fonts->Fonts[n] == font_current))
- io.FontDefault = io.Fonts->Fonts[n];
+ {
+ ImFont* font = io.Fonts->Fonts[n];
+ ImGui::PushID((void*)font);
+ if (ImGui::Selectable(font->GetDebugName(), font == font_current))
+ io.FontDefault = font;
+ ImGui::PopID();
+ }
ImGui::EndCombo();
}
ImGui::SameLine();
- ShowHelpMarker(
+ HelpMarker(
"- Load additional fonts with io.Fonts->AddFontFromFileTTF().\n"
"- The font atlas is built when calling io.Fonts->GetTexDataAsXXXX() or io.Fonts->Build().\n"
- "- Read FAQ and documentation in misc/fonts/ for more details.\n"
+ "- Read FAQ and docs/FONTS.txt for more details.\n"
"- If you need to add/remove fonts at runtime (e.g. for DPI change), do it before calling NewFrame().");
}
@@ -2535,188 +3305,213 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
if (ImGui::Button("Revert Ref"))
style = *ref;
ImGui::SameLine();
- ShowHelpMarker("Save/Revert in local non-persistent storage. Default Colors definition are not affected. Use \"Export Colors\" below to save them somewhere.");
+ HelpMarker("Save/Revert in local non-persistent storage. Default Colors definition are not affected. Use \"Export\" below to save them somewhere.");
- if (ImGui::TreeNode("Rendering"))
- {
- ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines); ImGui::SameLine(); ShowHelpMarker("When disabling anti-aliasing lines, you'll probably want to disable borders in your style as well.");
- ImGui::Checkbox("Anti-aliased fill", &style.AntiAliasedFill);
- ImGui::PushItemWidth(100);
- ImGui::DragFloat("Curve Tessellation Tolerance", &style.CurveTessellationTol, 0.02f, 0.10f, FLT_MAX, "%.2f", 2.0f);
- if (style.CurveTessellationTol < 0.10f) style.CurveTessellationTol = 0.10f;
- ImGui::DragFloat("Global Alpha", &style.Alpha, 0.005f, 0.20f, 1.0f, "%.2f"); // Not exposing zero here so user doesn't "lose" the UI (zero alpha clips all widgets). But application code could have a toggle to switch between zero and non-zero.
- ImGui::PopItemWidth();
- ImGui::TreePop();
- }
+ ImGui::Separator();
- if (ImGui::TreeNode("Settings"))
+ if (ImGui::BeginTabBar("##tabs", ImGuiTabBarFlags_None))
{
- ImGui::SliderFloat2("WindowPadding", (float*)&style.WindowPadding, 0.0f, 20.0f, "%.0f");
- ImGui::SliderFloat("PopupRounding", &style.PopupRounding, 0.0f, 16.0f, "%.0f");
- ImGui::SliderFloat2("FramePadding", (float*)&style.FramePadding, 0.0f, 20.0f, "%.0f");
- ImGui::SliderFloat2("ItemSpacing", (float*)&style.ItemSpacing, 0.0f, 20.0f, "%.0f");
- ImGui::SliderFloat2("ItemInnerSpacing", (float*)&style.ItemInnerSpacing, 0.0f, 20.0f, "%.0f");
- ImGui::SliderFloat2("TouchExtraPadding", (float*)&style.TouchExtraPadding, 0.0f, 10.0f, "%.0f");
- ImGui::SliderFloat("IndentSpacing", &style.IndentSpacing, 0.0f, 30.0f, "%.0f");
- ImGui::SliderFloat("ScrollbarSize", &style.ScrollbarSize, 1.0f, 20.0f, "%.0f");
- ImGui::SliderFloat("GrabMinSize", &style.GrabMinSize, 1.0f, 20.0f, "%.0f");
- ImGui::Text("BorderSize");
- ImGui::SliderFloat("WindowBorderSize", &style.WindowBorderSize, 0.0f, 1.0f, "%.0f");
- ImGui::SliderFloat("ChildBorderSize", &style.ChildBorderSize, 0.0f, 1.0f, "%.0f");
- ImGui::SliderFloat("PopupBorderSize", &style.PopupBorderSize, 0.0f, 1.0f, "%.0f");
- ImGui::SliderFloat("FrameBorderSize", &style.FrameBorderSize, 0.0f, 1.0f, "%.0f");
- ImGui::Text("Rounding");
- ImGui::SliderFloat("WindowRounding", &style.WindowRounding, 0.0f, 14.0f, "%.0f");
- ImGui::SliderFloat("ChildRounding", &style.ChildRounding, 0.0f, 16.0f, "%.0f");
- ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f");
- ImGui::SliderFloat("ScrollbarRounding", &style.ScrollbarRounding, 0.0f, 12.0f, "%.0f");
- ImGui::SliderFloat("GrabRounding", &style.GrabRounding, 0.0f, 12.0f, "%.0f");
- ImGui::Text("Alignment");
- ImGui::SliderFloat2("WindowTitleAlign", (float*)&style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
- ImGui::SliderFloat2("ButtonTextAlign", (float*)&style.ButtonTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); ShowHelpMarker("Alignment applies when a button is larger than its text content.");
- ImGui::Text("Safe Area Padding"); ImGui::SameLine(); ShowHelpMarker("Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
- ImGui::SliderFloat2("DisplaySafeAreaPadding", (float*)&style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f");
- ImGui::TreePop();
- }
-
- if (ImGui::TreeNode("Colors"))
- {
- static int output_dest = 0;
- static bool output_only_modified = true;
- if (ImGui::Button("Export Unsaved"))
+ if (ImGui::BeginTabItem("Sizes"))
{
- if (output_dest == 0)
- ImGui::LogToClipboard();
- else
- ImGui::LogToTTY();
- ImGui::LogText("ImVec4* colors = ImGui::GetStyle().Colors;" IM_NEWLINE);
+ ImGui::Text("Main");
+ ImGui::SliderFloat2("WindowPadding", (float*)&style.WindowPadding, 0.0f, 20.0f, "%.0f");
+ ImGui::SliderFloat2("FramePadding", (float*)&style.FramePadding, 0.0f, 20.0f, "%.0f");
+ ImGui::SliderFloat2("ItemSpacing", (float*)&style.ItemSpacing, 0.0f, 20.0f, "%.0f");
+ ImGui::SliderFloat2("ItemInnerSpacing", (float*)&style.ItemInnerSpacing, 0.0f, 20.0f, "%.0f");
+ ImGui::SliderFloat2("TouchExtraPadding", (float*)&style.TouchExtraPadding, 0.0f, 10.0f, "%.0f");
+ ImGui::SliderFloat("IndentSpacing", &style.IndentSpacing, 0.0f, 30.0f, "%.0f");
+ ImGui::SliderFloat("ScrollbarSize", &style.ScrollbarSize, 1.0f, 20.0f, "%.0f");
+ ImGui::SliderFloat("GrabMinSize", &style.GrabMinSize, 1.0f, 20.0f, "%.0f");
+ ImGui::Text("Borders");
+ ImGui::SliderFloat("WindowBorderSize", &style.WindowBorderSize, 0.0f, 1.0f, "%.0f");
+ ImGui::SliderFloat("ChildBorderSize", &style.ChildBorderSize, 0.0f, 1.0f, "%.0f");
+ ImGui::SliderFloat("PopupBorderSize", &style.PopupBorderSize, 0.0f, 1.0f, "%.0f");
+ ImGui::SliderFloat("FrameBorderSize", &style.FrameBorderSize, 0.0f, 1.0f, "%.0f");
+ ImGui::SliderFloat("TabBorderSize", &style.TabBorderSize, 0.0f, 1.0f, "%.0f");
+ ImGui::Text("Rounding");
+ ImGui::SliderFloat("WindowRounding", &style.WindowRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::SliderFloat("ChildRounding", &style.ChildRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::SliderFloat("PopupRounding", &style.PopupRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::SliderFloat("ScrollbarRounding", &style.ScrollbarRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::SliderFloat("GrabRounding", &style.GrabRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::SliderFloat("TabRounding", &style.TabRounding, 0.0f, 12.0f, "%.0f");
+ ImGui::Text("Alignment");
+ ImGui::SliderFloat2("WindowTitleAlign", (float*)&style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
+ int window_menu_button_position = style.WindowMenuButtonPosition + 1;
+ if (ImGui::Combo("WindowMenuButtonPosition", (int*)&window_menu_button_position, "None\0Left\0Right\0"))
+ style.WindowMenuButtonPosition = window_menu_button_position - 1;
+ ImGui::Combo("ColorButtonPosition", (int*)&style.ColorButtonPosition, "Left\0Right\0");
+ ImGui::SliderFloat2("ButtonTextAlign", (float*)&style.ButtonTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Alignment applies when a button is larger than its text content.");
+ ImGui::SliderFloat2("SelectableTextAlign", (float*)&style.SelectableTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Alignment applies when a selectable is larger than its text content.");
+ ImGui::Text("Safe Area Padding"); ImGui::SameLine(); HelpMarker("Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
+ ImGui::SliderFloat2("DisplaySafeAreaPadding", (float*)&style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f");
+ ImGui::EndTabItem();
+ }
+
+ if (ImGui::BeginTabItem("Colors"))
+ {
+ static int output_dest = 0;
+ static bool output_only_modified = true;
+ if (ImGui::Button("Export"))
+ {
+ if (output_dest == 0)
+ ImGui::LogToClipboard();
+ else
+ ImGui::LogToTTY();
+ ImGui::LogText("ImVec4* colors = ImGui::GetStyle().Colors;" IM_NEWLINE);
+ for (int i = 0; i < ImGuiCol_COUNT; i++)
+ {
+ const ImVec4& col = style.Colors[i];
+ const char* name = ImGui::GetStyleColorName(i);
+ if (!output_only_modified || memcmp(&col, &ref->Colors[i], sizeof(ImVec4)) != 0)
+ ImGui::LogText("colors[ImGuiCol_%s]%*s= ImVec4(%.2ff, %.2ff, %.2ff, %.2ff);" IM_NEWLINE, name, 23 - (int)strlen(name), "", col.x, col.y, col.z, col.w);
+ }
+ ImGui::LogFinish();
+ }
+ ImGui::SameLine(); ImGui::SetNextItemWidth(120); ImGui::Combo("##output_type", &output_dest, "To Clipboard\0To TTY\0");
+ ImGui::SameLine(); ImGui::Checkbox("Only Modified Colors", &output_only_modified);
+
+ static ImGuiTextFilter filter;
+ filter.Draw("Filter colors", ImGui::GetFontSize() * 16);
+
+ static ImGuiColorEditFlags alpha_flags = 0;
+ if (ImGui::RadioButton("Opaque", alpha_flags == 0)) { alpha_flags = 0; } ImGui::SameLine();
+ if (ImGui::RadioButton("Alpha", alpha_flags == ImGuiColorEditFlags_AlphaPreview)) { alpha_flags = ImGuiColorEditFlags_AlphaPreview; } ImGui::SameLine();
+ if (ImGui::RadioButton("Both", alpha_flags == ImGuiColorEditFlags_AlphaPreviewHalf)) { alpha_flags = ImGuiColorEditFlags_AlphaPreviewHalf; } ImGui::SameLine();
+ HelpMarker("In the color list:\nLeft-click on colored square to open color picker,\nRight-click to open edit options menu.");
+
+ ImGui::BeginChild("##colors", ImVec2(0, 0), true, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_NavFlattened);
+ ImGui::PushItemWidth(-160);
for (int i = 0; i < ImGuiCol_COUNT; i++)
{
- const ImVec4& col = style.Colors[i];
const char* name = ImGui::GetStyleColorName(i);
- if (!output_only_modified || memcmp(&col, &ref->Colors[i], sizeof(ImVec4)) != 0)
- ImGui::LogText("colors[ImGuiCol_%s]%*s= ImVec4(%.2ff, %.2ff, %.2ff, %.2ff);" IM_NEWLINE, name, 23-(int)strlen(name), "", col.x, col.y, col.z, col.w);
- }
- ImGui::LogFinish();
- }
- ImGui::SameLine(); ImGui::PushItemWidth(120); ImGui::Combo("##output_type", &output_dest, "To Clipboard\0To TTY\0"); ImGui::PopItemWidth();
- ImGui::SameLine(); ImGui::Checkbox("Only Modified Colors", &output_only_modified);
-
- ImGui::Text("Tip: Left-click on colored square to open color picker,\nRight-click to open edit options menu.");
-
- static ImGuiTextFilter filter;
- filter.Draw("Filter colors", 200);
-
- static ImGuiColorEditFlags alpha_flags = 0;
- ImGui::RadioButton("Opaque", &alpha_flags, 0); ImGui::SameLine();
- ImGui::RadioButton("Alpha", &alpha_flags, ImGuiColorEditFlags_AlphaPreview); ImGui::SameLine();
- ImGui::RadioButton("Both", &alpha_flags, ImGuiColorEditFlags_AlphaPreviewHalf);
-
- ImGui::BeginChild("#colors", ImVec2(0, 300), true, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_NavFlattened);
- ImGui::PushItemWidth(-160);
- for (int i = 0; i < ImGuiCol_COUNT; i++)
- {
- const char* name = ImGui::GetStyleColorName(i);
- if (!filter.PassFilter(name))
- continue;
- ImGui::PushID(i);
- ImGui::ColorEdit4("##color", (float*)&style.Colors[i], ImGuiColorEditFlags_AlphaBar | alpha_flags);
- if (memcmp(&style.Colors[i], &ref->Colors[i], sizeof(ImVec4)) != 0)
- {
- // Tips: in a real user application, you may want to merge and use an icon font into the main font, so instead of "Save"/"Revert" you'd use icons.
- // Read the FAQ and misc/fonts/README.txt about using icon fonts. It's really easy and super convenient!
- ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Save")) ref->Colors[i] = style.Colors[i];
- ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Revert")) style.Colors[i] = ref->Colors[i];
- }
- ImGui::SameLine(0.0f, style.ItemInnerSpacing.x);
- ImGui::TextUnformatted(name);
- ImGui::PopID();
- }
- ImGui::PopItemWidth();
- ImGui::EndChild();
-
- ImGui::TreePop();
- }
-
- bool fonts_opened = ImGui::TreeNode("Fonts", "Fonts (%d)", ImGui::GetIO().Fonts->Fonts.Size);
- if (fonts_opened)
- {
- ImFontAtlas* atlas = ImGui::GetIO().Fonts;
- if (ImGui::TreeNode("Atlas texture", "Atlas texture (%dx%d pixels)", atlas->TexWidth, atlas->TexHeight))
- {
- ImGui::Image(atlas->TexID, ImVec2((float)atlas->TexWidth, (float)atlas->TexHeight), ImVec2(0,0), ImVec2(1,1), ImColor(255,255,255,255), ImColor(255,255,255,128));
- ImGui::TreePop();
- }
- ImGui::PushItemWidth(100);
- for (int i = 0; i < atlas->Fonts.Size; i++)
- {
- ImFont* font = atlas->Fonts[i];
- ImGui::PushID(font);
- bool font_details_opened = ImGui::TreeNode(font, "Font %d: \'%s\', %.2f px, %d glyphs", i, font->ConfigData ? font->ConfigData[0].Name : "", font->FontSize, font->Glyphs.Size);
- ImGui::SameLine(); if (ImGui::SmallButton("Set as default")) ImGui::GetIO().FontDefault = font;
- if (font_details_opened)
- {
- ImGui::PushFont(font);
- ImGui::Text("The quick brown fox jumps over the lazy dog");
- ImGui::PopFont();
- ImGui::DragFloat("Font scale", &font->Scale, 0.005f, 0.3f, 2.0f, "%.1f"); // Scale only this font
- ImGui::SameLine(); ShowHelpMarker("Note than the default embedded font is NOT meant to be scaled.\n\nFont are currently rendered into bitmaps at a given size at the time of building the atlas. You may oversample them to get some flexibility with scaling. You can also render at multiple sizes and select which one to use at runtime.\n\n(Glimmer of hope: the atlas system should hopefully be rewritten in the future to make scaling more natural and automatic.)");
- ImGui::InputFloat("Font offset", &font->DisplayOffset.y, 1, 1, "%.0f");
- ImGui::Text("Ascent: %f, Descent: %f, Height: %f", font->Ascent, font->Descent, font->Ascent - font->Descent);
- ImGui::Text("Fallback character: '%c' (%d)", font->FallbackChar, font->FallbackChar);
- ImGui::Text("Texture surface: %d pixels (approx) ~ %dx%d", font->MetricsTotalSurface, (int)sqrtf((float)font->MetricsTotalSurface), (int)sqrtf((float)font->MetricsTotalSurface));
- for (int config_i = 0; config_i < font->ConfigDataCount; config_i++)
- if (ImFontConfig* cfg = &font->ConfigData[config_i])
- ImGui::BulletText("Input %d: \'%s\', Oversample: (%d,%d), PixelSnapH: %d", config_i, cfg->Name, cfg->OversampleH, cfg->OversampleV, cfg->PixelSnapH);
- if (ImGui::TreeNode("Glyphs", "Glyphs (%d)", font->Glyphs.Size))
+ if (!filter.PassFilter(name))
+ continue;
+ ImGui::PushID(i);
+ ImGui::ColorEdit4("##color", (float*)&style.Colors[i], ImGuiColorEditFlags_AlphaBar | alpha_flags);
+ if (memcmp(&style.Colors[i], &ref->Colors[i], sizeof(ImVec4)) != 0)
{
- // Display all glyphs of the fonts in separate pages of 256 characters
- for (int base = 0; base < 0x10000; base += 256)
+ // Tips: in a real user application, you may want to merge and use an icon font into the main font, so instead of "Save"/"Revert" you'd use icons.
+ // Read the FAQ and docs/FONTS.txt about using icon fonts. It's really easy and super convenient!
+ ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Save")) ref->Colors[i] = style.Colors[i];
+ ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Revert")) style.Colors[i] = ref->Colors[i];
+ }
+ ImGui::SameLine(0.0f, style.ItemInnerSpacing.x);
+ ImGui::TextUnformatted(name);
+ ImGui::PopID();
+ }
+ ImGui::PopItemWidth();
+ ImGui::EndChild();
+
+ ImGui::EndTabItem();
+ }
+
+ if (ImGui::BeginTabItem("Fonts"))
+ {
+ ImGuiIO& io = ImGui::GetIO();
+ ImFontAtlas* atlas = io.Fonts;
+ HelpMarker("Read FAQ and docs/FONTS.txt for details on font loading.");
+ ImGui::PushItemWidth(120);
+ for (int i = 0; i < atlas->Fonts.Size; i++)
+ {
+ ImFont* font = atlas->Fonts[i];
+ ImGui::PushID(font);
+ bool font_details_opened = ImGui::TreeNode(font, "Font %d: \"%s\"\n%.2f px, %d glyphs, %d file(s)", i, font->ConfigData ? font->ConfigData[0].Name : "", font->FontSize, font->Glyphs.Size, font->ConfigDataCount);
+ ImGui::SameLine(); if (ImGui::SmallButton("Set as default")) { io.FontDefault = font; }
+ if (font_details_opened)
+ {
+ ImGui::PushFont(font);
+ ImGui::Text("The quick brown fox jumps over the lazy dog");
+ ImGui::PopFont();
+ ImGui::DragFloat("Font scale", &font->Scale, 0.005f, 0.3f, 2.0f, "%.1f"); // Scale only this font
+ ImGui::SameLine(); HelpMarker("Note than the default embedded font is NOT meant to be scaled.\n\nFont are currently rendered into bitmaps at a given size at the time of building the atlas. You may oversample them to get some flexibility with scaling. You can also render at multiple sizes and select which one to use at runtime.\n\n(Glimmer of hope: the atlas system should hopefully be rewritten in the future to make scaling more natural and automatic.)");
+ ImGui::InputFloat("Font offset", &font->DisplayOffset.y, 1, 1, "%.0f");
+ ImGui::Text("Ascent: %f, Descent: %f, Height: %f", font->Ascent, font->Descent, font->Ascent - font->Descent);
+ ImGui::Text("Fallback character: '%c' (U+%04X)", font->FallbackChar, font->FallbackChar);
+ ImGui::Text("Ellipsis character: '%c' (U+%04X)", font->EllipsisChar, font->EllipsisChar);
+ const float surface_sqrt = sqrtf((float)font->MetricsTotalSurface);
+ ImGui::Text("Texture Area: about %d px ~%dx%d px", font->MetricsTotalSurface, (int)surface_sqrt, (int)surface_sqrt);
+ for (int config_i = 0; config_i < font->ConfigDataCount; config_i++)
+ if (font->ConfigData)
+ if (const ImFontConfig* cfg = &font->ConfigData[config_i])
+ ImGui::BulletText("Input %d: \'%s\', Oversample: (%d,%d), PixelSnapH: %d", config_i, cfg->Name, cfg->OversampleH, cfg->OversampleV, cfg->PixelSnapH);
+ if (ImGui::TreeNode("Glyphs", "Glyphs (%d)", font->Glyphs.Size))
{
- int count = 0;
- for (int n = 0; n < 256; n++)
- count += font->FindGlyphNoFallback((ImWchar)(base + n)) ? 1 : 0;
- if (count > 0 && ImGui::TreeNode((void*)(intptr_t)base, "U+%04X..U+%04X (%d %s)", base, base+255, count, count > 1 ? "glyphs" : "glyph"))
+ // Display all glyphs of the fonts in separate pages of 256 characters
+ for (unsigned int base = 0; base <= IM_UNICODE_CODEPOINT_MAX; base += 256)
{
- float cell_size = font->FontSize * 1;
- float cell_spacing = style.ItemSpacing.y;
- ImVec2 base_pos = ImGui::GetCursorScreenPos();
- ImDrawList* draw_list = ImGui::GetWindowDrawList();
- for (int n = 0; n < 256; n++)
+ int count = 0;
+ for (unsigned int n = 0; n < 256; n++)
+ count += font->FindGlyphNoFallback((ImWchar)(base + n)) ? 1 : 0;
+ if (count > 0 && ImGui::TreeNode((void*)(intptr_t)base, "U+%04X..U+%04X (%d %s)", base, base + 255, count, count > 1 ? "glyphs" : "glyph"))
{
- ImVec2 cell_p1(base_pos.x + (n % 16) * (cell_size + cell_spacing), base_pos.y + (n / 16) * (cell_size + cell_spacing));
- ImVec2 cell_p2(cell_p1.x + cell_size, cell_p1.y + cell_size);
- const ImFontGlyph* glyph = font->FindGlyphNoFallback((ImWchar)(base+n));
- draw_list->AddRect(cell_p1, cell_p2, glyph ? IM_COL32(255,255,255,100) : IM_COL32(255,255,255,50));
- if (glyph)
- font->RenderChar(draw_list, cell_size, cell_p1, ImGui::GetColorU32(ImGuiCol_Text), (ImWchar)(base+n)); // We use ImFont::RenderChar as a shortcut because we don't have UTF-8 conversion functions available to generate a string.
- if (glyph && ImGui::IsMouseHoveringRect(cell_p1, cell_p2))
+ float cell_size = font->FontSize * 1;
+ float cell_spacing = style.ItemSpacing.y;
+ ImVec2 base_pos = ImGui::GetCursorScreenPos();
+ ImDrawList* draw_list = ImGui::GetWindowDrawList();
+ for (unsigned int n = 0; n < 256; n++)
{
- ImGui::BeginTooltip();
- ImGui::Text("Codepoint: U+%04X", base+n);
- ImGui::Separator();
- ImGui::Text("AdvanceX: %.1f", glyph->AdvanceX);
- ImGui::Text("Pos: (%.2f,%.2f)->(%.2f,%.2f)", glyph->X0, glyph->Y0, glyph->X1, glyph->Y1);
- ImGui::Text("UV: (%.3f,%.3f)->(%.3f,%.3f)", glyph->U0, glyph->V0, glyph->U1, glyph->V1);
- ImGui::EndTooltip();
+ ImVec2 cell_p1(base_pos.x + (n % 16) * (cell_size + cell_spacing), base_pos.y + (n / 16) * (cell_size + cell_spacing));
+ ImVec2 cell_p2(cell_p1.x + cell_size, cell_p1.y + cell_size);
+ const ImFontGlyph* glyph = font->FindGlyphNoFallback((ImWchar)(base + n));
+ draw_list->AddRect(cell_p1, cell_p2, glyph ? IM_COL32(255, 255, 255, 100) : IM_COL32(255, 255, 255, 50));
+ if (glyph)
+ font->RenderChar(draw_list, cell_size, cell_p1, ImGui::GetColorU32(ImGuiCol_Text), (ImWchar)(base + n)); // We use ImFont::RenderChar as a shortcut because we don't have UTF-8 conversion functions available to generate a string.
+ if (glyph && ImGui::IsMouseHoveringRect(cell_p1, cell_p2))
+ {
+ ImGui::BeginTooltip();
+ ImGui::Text("Codepoint: U+%04X", base + n);
+ ImGui::Separator();
+ ImGui::Text("AdvanceX: %.1f", glyph->AdvanceX);
+ ImGui::Text("Pos: (%.2f,%.2f)->(%.2f,%.2f)", glyph->X0, glyph->Y0, glyph->X1, glyph->Y1);
+ ImGui::Text("UV: (%.3f,%.3f)->(%.3f,%.3f)", glyph->U0, glyph->V0, glyph->U1, glyph->V1);
+ ImGui::EndTooltip();
+ }
}
+ ImGui::Dummy(ImVec2((cell_size + cell_spacing) * 16, (cell_size + cell_spacing) * 16));
+ ImGui::TreePop();
}
- ImGui::Dummy(ImVec2((cell_size + cell_spacing) * 16, (cell_size + cell_spacing) * 16));
- ImGui::TreePop();
}
+ ImGui::TreePop();
}
ImGui::TreePop();
}
+ ImGui::PopID();
+ }
+ if (ImGui::TreeNode("Atlas texture", "Atlas texture (%dx%d pixels)", atlas->TexWidth, atlas->TexHeight))
+ {
+ ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+ ImVec4 border_col = ImVec4(1.0f, 1.0f, 1.0f, 0.5f);
+ ImGui::Image(atlas->TexID, ImVec2((float)atlas->TexWidth, (float)atlas->TexHeight), ImVec2(0, 0), ImVec2(1, 1), tint_col, border_col);
ImGui::TreePop();
}
- ImGui::PopID();
+
+ HelpMarker("Those are old settings provided for convenience.\nHowever, the _correct_ way of scaling your UI is currently to reload your font at the designed size, rebuild the font atlas, and call style.ScaleAllSizes() on a reference ImGuiStyle structure.");
+ static float window_scale = 1.0f;
+ if (ImGui::DragFloat("window scale", &window_scale, 0.005f, 0.3f, 2.0f, "%.2f")) // scale only this window
+ ImGui::SetWindowFontScale(window_scale);
+ ImGui::DragFloat("global scale", &io.FontGlobalScale, 0.005f, 0.3f, 2.0f, "%.2f"); // scale everything
+ ImGui::PopItemWidth();
+
+ ImGui::EndTabItem();
}
- static float window_scale = 1.0f;
- ImGui::DragFloat("this window scale", &window_scale, 0.005f, 0.3f, 2.0f, "%.1f"); // scale only this window
- ImGui::DragFloat("global scale", &ImGui::GetIO().FontGlobalScale, 0.005f, 0.3f, 2.0f, "%.1f"); // scale everything
- ImGui::PopItemWidth();
- ImGui::SetWindowFontScale(window_scale);
- ImGui::TreePop();
+
+ if (ImGui::BeginTabItem("Rendering"))
+ {
+ ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines); ImGui::SameLine(); HelpMarker("When disabling anti-aliasing lines, you'll probably want to disable borders in your style as well.");
+ ImGui::Checkbox("Anti-aliased fill", &style.AntiAliasedFill);
+ ImGui::PushItemWidth(100);
+ ImGui::DragFloat("Curve Tessellation Tolerance", &style.CurveTessellationTol, 0.02f, 0.10f, 10.0f, "%.2f");
+ if (style.CurveTessellationTol < 0.10f) style.CurveTessellationTol = 0.10f;
+ ImGui::DragFloat("Circle segment Max Error", &style.CircleSegmentMaxError, 0.01f, 0.10f, 10.0f, "%.2f");
+ ImGui::DragFloat("Global Alpha", &style.Alpha, 0.005f, 0.20f, 1.0f, "%.2f"); // Not exposing zero here so user doesn't "lose" the UI (zero alpha clips all widgets). But application code could have a toggle to switch between zero and non-zero.
+ ImGui::PopItemWidth();
+
+ ImGui::EndTabItem();
+ }
+
+ ImGui::EndTabBar();
}
ImGui::PopItemWidth();
@@ -2725,8 +3520,14 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
//-----------------------------------------------------------------------------
// [SECTION] Example App: Main Menu Bar / ShowExampleAppMainMenuBar()
//-----------------------------------------------------------------------------
+// - ShowExampleAppMainMenuBar()
+// - ShowExampleMenuFile()
+//-----------------------------------------------------------------------------
-// Demonstrate creating a fullscreen menu bar and populating it.
+// Demonstrate creating a "main" fullscreen menu bar and populating it.
+// Note the difference between BeginMainMenuBar() and BeginMenuBar():
+// - BeginMenuBar() = menu-bar inside current window we Begin()-ed into (the window needs the ImGuiWindowFlags_MenuBar flag)
+// - BeginMainMenuBar() = helper to create menu-bar-sized window at the top of the main viewport + call BeginMenuBar() into it.
static void ShowExampleAppMainMenuBar()
{
if (ImGui::BeginMainMenuBar())
@@ -2750,6 +3551,7 @@ static void ShowExampleAppMainMenuBar()
}
}
+// Note that shortcuts are currently provided for display only (future version will add flags to BeginMenu to process shortcuts)
static void ShowExampleMenuFile()
{
ImGui::MenuItem("(dummy menu)", NULL, false, false);
@@ -2825,10 +3627,12 @@ struct ExampleAppConsole
{
char InputBuf[256];
ImVector Items;
- bool ScrollToBottom;
+ ImVector Commands;
ImVector History;
int HistoryPos; // -1: new line, 0..History.Size-1 browsing history.
- ImVector Commands;
+ ImGuiTextFilter Filter;
+ bool AutoScroll;
+ bool ScrollToBottom;
ExampleAppConsole()
{
@@ -2839,6 +3643,8 @@ struct ExampleAppConsole
Commands.push_back("HISTORY");
Commands.push_back("CLEAR");
Commands.push_back("CLASSIFY"); // "classify" is only here to provide an example of "C"+[tab] completing to "CL" and displaying matches.
+ AutoScroll = true;
+ ScrollToBottom = false;
AddLog("Welcome to Dear ImGui!");
}
~ExampleAppConsole()
@@ -2851,7 +3657,7 @@ struct ExampleAppConsole
// Portable helpers
static int Stricmp(const char* str1, const char* str2) { int d; while ((d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; } return d; }
static int Strnicmp(const char* str1, const char* str2, int n) { int d = 0; while (n > 0 && (d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; n--; } return d; }
- static char* Strdup(const char *str) { size_t len = strlen(str) + 1; void* buff = malloc(len); return (char*)memcpy(buff, (const void*)str, len); }
+ static char* Strdup(const char *str) { size_t len = strlen(str) + 1; void* buf = malloc(len); IM_ASSERT(buf); return (char*)memcpy(buf, (const void*)str, len); }
static void Strtrim(char* str) { char* str_end = str + strlen(str); while (str_end > str && str_end[-1] == ' ') str_end--; *str_end = 0; }
void ClearLog()
@@ -2859,7 +3665,6 @@ struct ExampleAppConsole
for (int i = 0; i < Items.Size; i++)
free(Items[i]);
Items.clear();
- ScrollToBottom = true;
}
void AddLog(const char* fmt, ...) IM_FMTARGS(2)
@@ -2872,7 +3677,6 @@ struct ExampleAppConsole
buf[IM_ARRAYSIZE(buf)-1] = 0;
va_end(args);
Items.push_back(Strdup(buf));
- ScrollToBottom = true;
}
void Draw(const char* title, bool* p_open)
@@ -2898,19 +3702,26 @@ struct ExampleAppConsole
// TODO: display items starting from the bottom
- if (ImGui::SmallButton("Add Dummy Text")) { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); } ImGui::SameLine();
+ if (ImGui::SmallButton("Add Dummy Text")) { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); } ImGui::SameLine();
if (ImGui::SmallButton("Add Dummy Error")) { AddLog("[error] something went wrong"); } ImGui::SameLine();
if (ImGui::SmallButton("Clear")) { ClearLog(); } ImGui::SameLine();
- bool copy_to_clipboard = ImGui::SmallButton("Copy"); ImGui::SameLine();
- if (ImGui::SmallButton("Scroll to bottom")) ScrollToBottom = true;
+ bool copy_to_clipboard = ImGui::SmallButton("Copy");
//static float t = 0.0f; if (ImGui::GetTime() - t > 0.02f) { t = ImGui::GetTime(); AddLog("Spam %f", t); }
ImGui::Separator();
- ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
- static ImGuiTextFilter filter;
- filter.Draw("Filter (\"incl,-excl\") (\"error\")", 180);
- ImGui::PopStyleVar();
+ // Options menu
+ if (ImGui::BeginPopup("Options"))
+ {
+ ImGui::Checkbox("Auto-scroll", &AutoScroll);
+ ImGui::EndPopup();
+ }
+
+ // Options, Filter
+ if (ImGui::Button("Options"))
+ ImGui::OpenPopup("Options");
+ ImGui::SameLine();
+ Filter.Draw("Filter (\"incl,-excl\") (\"error\")", 180);
ImGui::Separator();
const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); // 1 separator, 1 input text
@@ -2935,24 +3746,27 @@ struct ExampleAppConsole
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4,1)); // Tighten spacing
if (copy_to_clipboard)
ImGui::LogToClipboard();
- ImVec4 col_default_text = ImGui::GetStyleColorVec4(ImGuiCol_Text);
for (int i = 0; i < Items.Size; i++)
{
const char* item = Items[i];
- if (!filter.PassFilter(item))
+ if (!Filter.PassFilter(item))
continue;
- ImVec4 col = col_default_text;
- if (strstr(item, "[error]")) col = ImColor(1.0f,0.4f,0.4f,1.0f);
- else if (strncmp(item, "# ", 2) == 0) col = ImColor(1.0f,0.78f,0.58f,1.0f);
- ImGui::PushStyleColor(ImGuiCol_Text, col);
+
+ // Normally you would store more information in your item (e.g. make Items[] an array of structure, store color/type etc.)
+ bool pop_color = false;
+ if (strstr(item, "[error]")) { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.4f, 0.4f, 1.0f)); pop_color = true; }
+ else if (strncmp(item, "# ", 2) == 0) { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.8f, 0.6f, 1.0f)); pop_color = true; }
ImGui::TextUnformatted(item);
- ImGui::PopStyleColor();
+ if (pop_color)
+ ImGui::PopStyleColor();
}
if (copy_to_clipboard)
ImGui::LogFinish();
- if (ScrollToBottom)
+
+ if (ScrollToBottom || (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY()))
ImGui::SetScrollHereY(1.0f);
ScrollToBottom = false;
+
ImGui::PopStyleVar();
ImGui::EndChild();
ImGui::Separator();
@@ -3013,6 +3827,9 @@ struct ExampleAppConsole
{
AddLog("Unknown command: '%s'\n", command_line);
}
+
+ // On commad input, we scroll to bottom even if AutoScroll==false
+ ScrollToBottom = true;
}
static int TextEditCallbackStub(ImGuiInputTextCallbackData* data) // In C++11 you are better off using lambdas for this sort of forwarding callbacks
@@ -3140,10 +3957,21 @@ struct ExampleAppLog
{
ImGuiTextBuffer Buf;
ImGuiTextFilter Filter;
- ImVector LineOffsets; // Index to lines offset
- bool ScrollToBottom;
+ ImVector LineOffsets; // Index to lines offset. We maintain this with AddLog() calls, allowing us to have a random access on lines
+ bool AutoScroll; // Keep scrolling if already at the bottom
- void Clear() { Buf.clear(); LineOffsets.clear(); }
+ ExampleAppLog()
+ {
+ AutoScroll = true;
+ Clear();
+ }
+
+ void Clear()
+ {
+ Buf.clear();
+ LineOffsets.clear();
+ LineOffsets.push_back(0);
+ }
void AddLog(const char* fmt, ...) IM_FMTARGS(2)
{
@@ -3154,47 +3982,88 @@ struct ExampleAppLog
va_end(args);
for (int new_size = Buf.size(); old_size < new_size; old_size++)
if (Buf[old_size] == '\n')
- LineOffsets.push_back(old_size);
- ScrollToBottom = true;
+ LineOffsets.push_back(old_size + 1);
}
void Draw(const char* title, bool* p_open = NULL)
{
- ImGui::SetNextWindowSize(ImVec2(500,400), ImGuiCond_FirstUseEver);
if (!ImGui::Begin(title, p_open))
{
ImGui::End();
return;
}
- if (ImGui::Button("Clear")) Clear();
+
+ // Options menu
+ if (ImGui::BeginPopup("Options"))
+ {
+ ImGui::Checkbox("Auto-scroll", &AutoScroll);
+ ImGui::EndPopup();
+ }
+
+ // Main window
+ if (ImGui::Button("Options"))
+ ImGui::OpenPopup("Options");
+ ImGui::SameLine();
+ bool clear = ImGui::Button("Clear");
ImGui::SameLine();
bool copy = ImGui::Button("Copy");
ImGui::SameLine();
Filter.Draw("Filter", -100.0f);
+
ImGui::Separator();
ImGui::BeginChild("scrolling", ImVec2(0,0), false, ImGuiWindowFlags_HorizontalScrollbar);
- if (copy) ImGui::LogToClipboard();
+ if (clear)
+ Clear();
+ if (copy)
+ ImGui::LogToClipboard();
+
+ ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
+ const char* buf = Buf.begin();
+ const char* buf_end = Buf.end();
if (Filter.IsActive())
{
- const char* buf_begin = Buf.begin();
- const char* line = buf_begin;
- for (int line_no = 0; line != NULL; line_no++)
+ // In this example we don't use the clipper when Filter is enabled.
+ // This is because we don't have a random access on the result on our filter.
+ // A real application processing logs with ten of thousands of entries may want to store the result of search/filter.
+ // especially if the filtering function is not trivial (e.g. reg-exp).
+ for (int line_no = 0; line_no < LineOffsets.Size; line_no++)
{
- const char* line_end = (line_no < LineOffsets.Size) ? buf_begin + LineOffsets[line_no] : NULL;
- if (Filter.PassFilter(line, line_end))
- ImGui::TextUnformatted(line, line_end);
- line = line_end && line_end[1] ? line_end + 1 : NULL;
+ const char* line_start = buf + LineOffsets[line_no];
+ const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end;
+ if (Filter.PassFilter(line_start, line_end))
+ ImGui::TextUnformatted(line_start, line_end);
}
}
else
{
- ImGui::TextUnformatted(Buf.begin());
+ // The simplest and easy way to display the entire buffer:
+ // ImGui::TextUnformatted(buf_begin, buf_end);
+ // And it'll just work. TextUnformatted() has specialization for large blob of text and will fast-forward to skip non-visible lines.
+ // Here we instead demonstrate using the clipper to only process lines that are within the visible area.
+ // If you have tens of thousands of items and their processing cost is non-negligible, coarse clipping them on your side is recommended.
+ // Using ImGuiListClipper requires A) random access into your data, and B) items all being the same height,
+ // both of which we can handle since we an array pointing to the beginning of each line of text.
+ // When using the filter (in the block of code above) we don't have random access into the data to display anymore, which is why we don't use the clipper.
+ // Storing or skimming through the search result would make it possible (and would be recommended if you want to search through tens of thousands of entries)
+ ImGuiListClipper clipper;
+ clipper.Begin(LineOffsets.Size);
+ while (clipper.Step())
+ {
+ for (int line_no = clipper.DisplayStart; line_no < clipper.DisplayEnd; line_no++)
+ {
+ const char* line_start = buf + LineOffsets[line_no];
+ const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end;
+ ImGui::TextUnformatted(line_start, line_end);
+ }
+ }
+ clipper.End();
}
+ ImGui::PopStyleVar();
- if (ScrollToBottom)
+ if (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
ImGui::SetScrollHereY(1.0f);
- ScrollToBottom = false;
+
ImGui::EndChild();
ImGui::End();
}
@@ -3205,16 +4074,26 @@ static void ShowExampleAppLog(bool* p_open)
{
static ExampleAppLog log;
- // Demo: add random items (unless Ctrl is held)
- static double last_time = -1.0;
- double time = ImGui::GetTime();
- if (time - last_time >= 0.20f && !ImGui::GetIO().KeyCtrl)
+ // For the demo: add a debug button _BEFORE_ the normal log window contents
+ // We take advantage of a rarely used feature: multiple calls to Begin()/End() are appending to the _same_ window.
+ // Most of the contents of the window will be added by the log.Draw() call.
+ ImGui::SetNextWindowSize(ImVec2(500, 400), ImGuiCond_FirstUseEver);
+ ImGui::Begin("Example: Log", p_open);
+ if (ImGui::SmallButton("[Debug] Add 5 entries"))
{
- const char* random_words[] = { "system", "info", "warning", "error", "fatal", "notice", "log" };
- log.AddLog("[%s] Hello, time is %.1f, frame count is %d\n", random_words[rand() % IM_ARRAYSIZE(random_words)], time, ImGui::GetFrameCount());
- last_time = time;
+ static int counter = 0;
+ for (int n = 0; n < 5; n++)
+ {
+ const char* categories[3] = { "info", "warn", "error" };
+ const char* words[] = { "Bumfuzzled", "Cattywampus", "Snickersnee", "Abibliophobia", "Absquatulate", "Nincompoop", "Pauciloquent" };
+ log.AddLog("[%05d] [%s] Hello, current time is %.1f, here's a word: '%s'\n",
+ ImGui::GetFrameCount(), categories[counter % IM_ARRAYSIZE(categories)], ImGui::GetTime(), words[counter % IM_ARRAYSIZE(words)]);
+ counter++;
+ }
}
+ ImGui::End();
+ // Actually call in the regular Log helper (which will Begin() into the same window as we just did)
log.Draw("Example: Log", p_open);
}
@@ -3226,7 +4105,7 @@ static void ShowExampleAppLog(bool* p_open)
static void ShowExampleAppLayout(bool* p_open)
{
ImGui::SetNextWindowSize(ImVec2(500, 440), ImGuiCond_FirstUseEver);
- if (ImGui::Begin("Example: Layout", p_open, ImGuiWindowFlags_MenuBar))
+ if (ImGui::Begin("Example: Simple layout", p_open, ImGuiWindowFlags_MenuBar))
{
if (ImGui::BeginMenuBar())
{
@@ -3256,7 +4135,20 @@ static void ShowExampleAppLayout(bool* p_open)
ImGui::BeginChild("item view", ImVec2(0, -ImGui::GetFrameHeightWithSpacing())); // Leave room for 1 line below us
ImGui::Text("MyObject: %d", selected);
ImGui::Separator();
- ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ");
+ if (ImGui::BeginTabBar("##Tabs", ImGuiTabBarFlags_None))
+ {
+ if (ImGui::BeginTabItem("Description"))
+ {
+ ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ");
+ ImGui::EndTabItem();
+ }
+ if (ImGui::BeginTabItem("Details"))
+ {
+ ImGui::Text("ID: 0123456789");
+ ImGui::EndTabItem();
+ }
+ ImGui::EndTabBar();
+ }
ImGui::EndChild();
if (ImGui::Button("Revert")) {}
ImGui::SameLine();
@@ -3280,7 +4172,7 @@ static void ShowExampleAppPropertyEditor(bool* p_open)
return;
}
- ShowHelpMarker("This example shows how you may implement a property editor using two columns.\nAll objects/fields data are dummies here.\nRemember that in many simple cases, you can use ImGui::SameLine(xxx) to position\nyour cursor horizontally instead of using the Columns() API.");
+ HelpMarker("This example shows how you may implement a property editor using two columns.\nAll objects/fields data are dummies here.\nRemember that in many simple cases, you can use ImGui::SameLine(xxx) to position\nyour cursor horizontally instead of using the Columns() API.");
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2,2));
ImGui::Columns(2);
@@ -3313,12 +4205,11 @@ static void ShowExampleAppPropertyEditor(bool* p_open)
ImGui::AlignTextToFramePadding();
ImGui::TreeNodeEx("Field", ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_Bullet, "Field_%d", i);
ImGui::NextColumn();
- ImGui::PushItemWidth(-1);
+ ImGui::SetNextItemWidth(-1);
if (i >= 5)
ImGui::InputFloat("##value", &dummy_members[i], 1.0f);
else
ImGui::DragFloat("##value", &dummy_members[i], 0.01f);
- ImGui::PopItemWidth();
ImGui::NextColumn();
}
ImGui::PopID();
@@ -3357,7 +4248,7 @@ static void ShowExampleAppLongText(bool* p_open)
static ImGuiTextBuffer log;
static int lines = 0;
ImGui::Text("Printing unusually long amount of text.");
- ImGui::Combo("Test type", &test_type, "Single call to TextUnformatted()\0Multiple calls to Text(), clipped manually\0Multiple calls to Text(), not clipped (slow)\0");
+ ImGui::Combo("Test type", &test_type, "Single call to TextUnformatted()\0Multiple calls to Text(), clipped\0Multiple calls to Text(), not clipped (slow)\0");
ImGui::Text("Buffer contents: %d lines, %d bytes", lines, log.size());
if (ImGui::Button("Clear")) { log.clear(); lines = 0; }
ImGui::SameLine();
@@ -3427,7 +4318,7 @@ static void ShowExampleAppConstrainedResize(bool* p_open)
{
struct CustomConstraints // Helper functions to demonstrate programmatic constraints
{
- static void Square(ImGuiSizeCallbackData* data) { data->DesiredSize = ImVec2(IM_MAX(data->DesiredSize.x, data->DesiredSize.y), IM_MAX(data->DesiredSize.x, data->DesiredSize.y)); }
+ static void Square(ImGuiSizeCallbackData* data) { data->DesiredSize.x = data->DesiredSize.y = (data->DesiredSize.x > data->DesiredSize.y ? data->DesiredSize.x : data->DesiredSize.y); }
static void Step(ImGuiSizeCallbackData* data) { float step = (float)(int)(intptr_t)data->UserData; data->DesiredSize = ImVec2((int)(data->DesiredSize.x / step + 0.5f) * step, (int)(data->DesiredSize.y / step + 0.5f) * step); }
};
@@ -3439,8 +4330,8 @@ static void ShowExampleAppConstrainedResize(bool* p_open)
if (type == 2) ImGui::SetNextWindowSizeConstraints(ImVec2(100, 100), ImVec2(FLT_MAX, FLT_MAX)); // Width > 100, Height > 100
if (type == 3) ImGui::SetNextWindowSizeConstraints(ImVec2(400, -1), ImVec2(500, -1)); // Width 400-500
if (type == 4) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 400), ImVec2(-1, 500)); // Height 400-500
- if (type == 5) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Square); // Always Square
- if (type == 6) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Step, (void*)100);// Fixed Step
+ if (type == 5) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Square); // Always Square
+ if (type == 6) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Step, (void*)(intptr_t)100); // Fixed Step
ImGuiWindowFlags flags = auto_resize ? ImGuiWindowFlags_AlwaysAutoResize : 0;
if (ImGui::Begin("Example: Constrained Resize", p_open, flags))
@@ -3458,10 +4349,10 @@ static void ShowExampleAppConstrainedResize(bool* p_open)
if (ImGui::Button("200x200")) { ImGui::SetWindowSize(ImVec2(200, 200)); } ImGui::SameLine();
if (ImGui::Button("500x500")) { ImGui::SetWindowSize(ImVec2(500, 500)); } ImGui::SameLine();
if (ImGui::Button("800x200")) { ImGui::SetWindowSize(ImVec2(800, 200)); }
- ImGui::PushItemWidth(200);
+ ImGui::SetNextItemWidth(200);
ImGui::Combo("Constraint", &type, desc, IM_ARRAYSIZE(desc));
+ ImGui::SetNextItemWidth(200);
ImGui::DragInt("Lines", &display_lines, 0.2f, 1, 100);
- ImGui::PopItemWidth();
ImGui::Checkbox("Auto-resize", &auto_resize);
for (int i = 0; i < display_lines; i++)
ImGui::Text("%*sHello, sailor! Making this line long enough for the example.", i * 4, "");
@@ -3478,17 +4369,20 @@ static void ShowExampleAppSimpleOverlay(bool* p_open)
{
const float DISTANCE = 10.0f;
static int corner = 0;
- ImVec2 window_pos = ImVec2((corner & 1) ? ImGui::GetIO().DisplaySize.x - DISTANCE : DISTANCE, (corner & 2) ? ImGui::GetIO().DisplaySize.y - DISTANCE : DISTANCE);
- ImVec2 window_pos_pivot = ImVec2((corner & 1) ? 1.0f : 0.0f, (corner & 2) ? 1.0f : 0.0f);
+ ImGuiIO& io = ImGui::GetIO();
if (corner != -1)
+ {
+ ImVec2 window_pos = ImVec2((corner & 1) ? io.DisplaySize.x - DISTANCE : DISTANCE, (corner & 2) ? io.DisplaySize.y - DISTANCE : DISTANCE);
+ ImVec2 window_pos_pivot = ImVec2((corner & 1) ? 1.0f : 0.0f, (corner & 2) ? 1.0f : 0.0f);
ImGui::SetNextWindowPos(window_pos, ImGuiCond_Always, window_pos_pivot);
- ImGui::SetNextWindowBgAlpha(0.3f); // Transparent background
- if (ImGui::Begin("Example: Simple Overlay", p_open, (corner != -1 ? ImGuiWindowFlags_NoMove : 0) | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav))
+ }
+ ImGui::SetNextWindowBgAlpha(0.35f); // Transparent background
+ if (ImGui::Begin("Example: Simple overlay", p_open, (corner != -1 ? ImGuiWindowFlags_NoMove : 0) | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav))
{
ImGui::Text("Simple overlay\n" "in the corner of the screen.\n" "(right-click to change position)");
ImGui::Separator();
if (ImGui::IsMousePosValid())
- ImGui::Text("Mouse Position: (%.1f,%.1f)", ImGui::GetIO().MousePos.x, ImGui::GetIO().MousePos.y);
+ ImGui::Text("Mouse Position: (%.1f,%.1f)", io.MousePos.x, io.MousePos.y);
else
ImGui::Text("Mouse Position: ");
if (ImGui::BeginPopupContextWindow())
@@ -3543,7 +4437,6 @@ static void ShowExampleAppWindowTitles(bool*)
// Demonstrate using the low-level ImDrawList to draw custom shapes.
static void ShowExampleAppCustomRendering(bool* p_open)
{
- ImGui::SetNextWindowSize(ImVec2(350, 560), ImGuiCond_FirstUseEver);
if (!ImGui::Begin("Example: Custom rendering", p_open))
{
ImGui::End();
@@ -3556,102 +4449,424 @@ static void ShowExampleAppCustomRendering(bool* p_open)
// In this example we are not using the maths operators!
ImDrawList* draw_list = ImGui::GetWindowDrawList();
- // Primitives
- ImGui::Text("Primitives");
- static float sz = 36.0f;
- static float thickness = 4.0f;
- static ImVec4 col = ImVec4(1.0f, 1.0f, 0.4f, 1.0f);
- ImGui::DragFloat("Size", &sz, 0.2f, 2.0f, 72.0f, "%.0f");
- ImGui::DragFloat("Thickness", &thickness, 0.05f, 1.0f, 8.0f, "%.02f");
- ImGui::ColorEdit3("Color", &col.x);
+ if (ImGui::BeginTabBar("##TabBar"))
{
- const ImVec2 p = ImGui::GetCursorScreenPos();
- const ImU32 col32 = ImColor(col);
- float x = p.x + 4.0f, y = p.y + 4.0f, spacing = 8.0f;
- for (int n = 0; n < 2; n++)
+ // Primitives
+ if (ImGui::BeginTabItem("Primitives"))
{
- float curr_thickness = (n == 0) ? 1.0f : thickness;
- draw_list->AddCircle(ImVec2(x+sz*0.5f, y+sz*0.5f), sz*0.5f, col32, 20, curr_thickness); x += sz+spacing;
- draw_list->AddRect(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 0.0f, ImDrawCornerFlags_All, curr_thickness); x += sz+spacing;
- draw_list->AddRect(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 10.0f, ImDrawCornerFlags_All, curr_thickness); x += sz+spacing;
- draw_list->AddRect(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 10.0f, ImDrawCornerFlags_TopLeft|ImDrawCornerFlags_BotRight, curr_thickness); x += sz+spacing;
- draw_list->AddTriangle(ImVec2(x+sz*0.5f, y), ImVec2(x+sz,y+sz-0.5f), ImVec2(x,y+sz-0.5f), col32, curr_thickness); x += sz+spacing;
- draw_list->AddLine(ImVec2(x, y), ImVec2(x+sz, y ), col32, curr_thickness); x += sz+spacing; // Horizontal line (note: drawing a filled rectangle will be faster!)
- draw_list->AddLine(ImVec2(x, y), ImVec2(x, y+sz), col32, curr_thickness); x += spacing; // Vertical line (note: drawing a filled rectangle will be faster!)
- draw_list->AddLine(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, curr_thickness); x += sz+spacing; // Diagonal line
- draw_list->AddBezierCurve(ImVec2(x, y), ImVec2(x+sz*1.3f,y+sz*0.3f), ImVec2(x+sz-sz*1.3f,y+sz-sz*0.3f), ImVec2(x+sz, y+sz), col32, curr_thickness);
- x = p.x + 4;
- y += sz+spacing;
- }
- draw_list->AddCircleFilled(ImVec2(x+sz*0.5f, y+sz*0.5f), sz*0.5f, col32, 32); x += sz+spacing;
- draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+sz, y+sz), col32); x += sz+spacing;
- draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 10.0f); x += sz+spacing;
- draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 10.0f, ImDrawCornerFlags_TopLeft|ImDrawCornerFlags_BotRight); x += sz+spacing;
- draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f, y), ImVec2(x+sz,y+sz-0.5f), ImVec2(x,y+sz-0.5f), col32); x += sz+spacing;
- draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+sz, y+thickness), col32); x += sz+spacing; // Horizontal line (faster than AddLine, but only handle integer thickness)
- draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+thickness, y+sz), col32); x += spacing+spacing; // Vertical line (faster than AddLine, but only handle integer thickness)
- draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+1, y+1), col32); x += sz; // Pixel (faster than AddLine)
- draw_list->AddRectFilledMultiColor(ImVec2(x, y), ImVec2(x+sz, y+sz), IM_COL32(0,0,0,255), IM_COL32(255,0,0,255), IM_COL32(255,255,0,255), IM_COL32(0,255,0,255));
- ImGui::Dummy(ImVec2((sz+spacing)*8, (sz+spacing)*3));
- }
- ImGui::Separator();
- {
- static ImVector points;
- static bool adding_line = false;
- ImGui::Text("Canvas example");
- if (ImGui::Button("Clear")) points.clear();
- if (points.Size >= 2) { ImGui::SameLine(); if (ImGui::Button("Undo")) { points.pop_back(); points.pop_back(); } }
- ImGui::Text("Left-click and drag to add lines,\nRight-click to undo");
-
- // Here we are using InvisibleButton() as a convenience to 1) advance the cursor and 2) allows us to use IsItemHovered()
- // But you can also draw directly and poll mouse/keyboard by yourself. You can manipulate the cursor using GetCursorPos() and SetCursorPos().
- // If you only use the ImDrawList API, you can notify the owner window of its extends by using SetCursorPos(max).
- ImVec2 canvas_pos = ImGui::GetCursorScreenPos(); // ImDrawList API uses screen coordinates!
- ImVec2 canvas_size = ImGui::GetContentRegionAvail(); // Resize canvas to what's available
- if (canvas_size.x < 50.0f) canvas_size.x = 50.0f;
- if (canvas_size.y < 50.0f) canvas_size.y = 50.0f;
- draw_list->AddRectFilledMultiColor(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(50, 50, 50, 255), IM_COL32(50, 50, 60, 255), IM_COL32(60, 60, 70, 255), IM_COL32(50, 50, 60, 255));
- draw_list->AddRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(255, 255, 255, 255));
-
- bool adding_preview = false;
- ImGui::InvisibleButton("canvas", canvas_size);
- ImVec2 mouse_pos_in_canvas = ImVec2(ImGui::GetIO().MousePos.x - canvas_pos.x, ImGui::GetIO().MousePos.y - canvas_pos.y);
- if (adding_line)
- {
- adding_preview = true;
- points.push_back(mouse_pos_in_canvas);
- if (!ImGui::IsMouseDown(0))
- adding_line = adding_preview = false;
- }
- if (ImGui::IsItemHovered())
- {
- if (!adding_line && ImGui::IsMouseClicked(0))
+ static float sz = 36.0f;
+ static float thickness = 3.0f;
+ static int ngon_sides = 6;
+ static bool circle_segments_override = false;
+ static int circle_segments_override_v = 12;
+ static ImVec4 colf = ImVec4(1.0f, 1.0f, 0.4f, 1.0f);
+ ImGui::PushItemWidth(-ImGui::GetFontSize() * 10);
+ ImGui::DragFloat("Size", &sz, 0.2f, 2.0f, 72.0f, "%.0f");
+ ImGui::DragFloat("Thickness", &thickness, 0.05f, 1.0f, 8.0f, "%.02f");
+ ImGui::SliderInt("N-gon sides", &ngon_sides, 3, 12);
+ ImGui::Checkbox("##circlesegmentoverride", &circle_segments_override);
+ ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
+ if (ImGui::SliderInt("Circle segments", &circle_segments_override_v, 3, 40))
+ circle_segments_override = true;
+ ImGui::ColorEdit4("Color", &colf.x);
+ ImGui::PopItemWidth();
+ const ImVec2 p = ImGui::GetCursorScreenPos();
+ const ImU32 col = ImColor(colf);
+ const float spacing = 10.0f;
+ const ImDrawCornerFlags corners_none = 0;
+ const ImDrawCornerFlags corners_all = ImDrawCornerFlags_All;
+ const ImDrawCornerFlags corners_tl_br = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotRight;
+ const int circle_segments = circle_segments_override ? circle_segments_override_v : 0;
+ float x = p.x + 4.0f, y = p.y + 4.0f;
+ for (int n = 0; n < 2; n++)
{
+ // First line uses a thickness of 1.0f, second line uses the configurable thickness
+ float th = (n == 0) ? 1.0f : thickness;
+ draw_list->AddNgon(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, ngon_sides, th); x += sz + spacing; // N-gon
+ draw_list->AddCircle(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, circle_segments, th); x += sz + spacing; // Circle
+ draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 0.0f, corners_none, th); x += sz + spacing; // Square
+ draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_all, th); x += sz + spacing; // Square with all rounded corners
+ draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br, th); x += sz + spacing; // Square with two rounded corners
+ draw_list->AddTriangle(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col, th); x += sz + spacing; // Triangle
+ draw_list->AddTriangle(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col, th); x += sz*0.4f + spacing; // Thin triangle
+ draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y), col, th); x += sz + spacing; // Horizontal line (note: drawing a filled rectangle will be faster!)
+ draw_list->AddLine(ImVec2(x, y), ImVec2(x, y + sz), col, th); x += spacing; // Vertical line (note: drawing a filled rectangle will be faster!)
+ draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y + sz), col, th); x += sz + spacing; // Diagonal line
+ draw_list->AddBezierCurve(ImVec2(x, y), ImVec2(x + sz*1.3f, y + sz*0.3f), ImVec2(x + sz - sz*1.3f, y + sz - sz*0.3f), ImVec2(x + sz, y + sz), col, th);
+ x = p.x + 4;
+ y += sz + spacing;
+ }
+ draw_list->AddNgonFilled(ImVec2(x + sz * 0.5f, y + sz * 0.5f), sz*0.5f, col, ngon_sides); x += sz + spacing; // N-gon
+ draw_list->AddCircleFilled(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, circle_segments);x += sz + spacing; // Circle
+ draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col); x += sz + spacing; // Square
+ draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f); x += sz + spacing; // Square with all rounded corners
+ draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br); x += sz + spacing; // Square with two rounded corners
+ draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col); x += sz + spacing; // Triangle
+ draw_list->AddTriangleFilled(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col); x += sz*0.4f + spacing; // Thin triangle
+ draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + thickness), col); x += sz + spacing; // Horizontal line (faster than AddLine, but only handle integer thickness)
+ draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + thickness, y + sz), col); x += spacing*2.0f; // Vertical line (faster than AddLine, but only handle integer thickness)
+ draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + 1, y + 1), col); x += sz; // Pixel (faster than AddLine)
+ draw_list->AddRectFilledMultiColor(ImVec2(x, y), ImVec2(x + sz, y + sz), IM_COL32(0, 0, 0, 255), IM_COL32(255, 0, 0, 255), IM_COL32(255, 255, 0, 255), IM_COL32(0, 255, 0, 255));
+ ImGui::Dummy(ImVec2((sz + spacing) * 9.8f, (sz + spacing) * 3));
+ ImGui::EndTabItem();
+ }
+
+ if (ImGui::BeginTabItem("Canvas"))
+ {
+ static ImVector points;
+ static bool adding_line = false;
+ if (ImGui::Button("Clear")) points.clear();
+ if (points.Size >= 2) { ImGui::SameLine(); if (ImGui::Button("Undo")) { points.pop_back(); points.pop_back(); } }
+ ImGui::Text("Left-click and drag to add lines,\nRight-click to undo");
+
+ // Here we are using InvisibleButton() as a convenience to 1) advance the cursor and 2) allows us to use IsItemHovered()
+ // But you can also draw directly and poll mouse/keyboard by yourself. You can manipulate the cursor using GetCursorPos() and SetCursorPos().
+ // If you only use the ImDrawList API, you can notify the owner window of its extends by using SetCursorPos(max).
+ ImVec2 canvas_pos = ImGui::GetCursorScreenPos(); // ImDrawList API uses screen coordinates!
+ ImVec2 canvas_size = ImGui::GetContentRegionAvail(); // Resize canvas to what's available
+ if (canvas_size.x < 50.0f) canvas_size.x = 50.0f;
+ if (canvas_size.y < 50.0f) canvas_size.y = 50.0f;
+ draw_list->AddRectFilledMultiColor(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(50, 50, 50, 255), IM_COL32(50, 50, 60, 255), IM_COL32(60, 60, 70, 255), IM_COL32(50, 50, 60, 255));
+ draw_list->AddRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(255, 255, 255, 255));
+
+ bool adding_preview = false;
+ ImGui::InvisibleButton("canvas", canvas_size);
+ ImVec2 mouse_pos_in_canvas = ImVec2(ImGui::GetIO().MousePos.x - canvas_pos.x, ImGui::GetIO().MousePos.y - canvas_pos.y);
+ if (adding_line)
+ {
+ adding_preview = true;
points.push_back(mouse_pos_in_canvas);
- adding_line = true;
+ if (!ImGui::IsMouseDown(0))
+ adding_line = adding_preview = false;
}
- if (ImGui::IsMouseClicked(1) && !points.empty())
+ if (ImGui::IsItemHovered())
{
- adding_line = adding_preview = false;
- points.pop_back();
+ if (!adding_line && ImGui::IsMouseClicked(0))
+ {
+ points.push_back(mouse_pos_in_canvas);
+ adding_line = true;
+ }
+ if (ImGui::IsMouseClicked(1) && !points.empty())
+ {
+ adding_line = adding_preview = false;
+ points.pop_back();
+ points.pop_back();
+ }
+ }
+ draw_list->PushClipRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), true); // clip lines within the canvas (if we resize it, etc.)
+ for (int i = 0; i < points.Size - 1; i += 2)
+ draw_list->AddLine(ImVec2(canvas_pos.x + points[i].x, canvas_pos.y + points[i].y), ImVec2(canvas_pos.x + points[i + 1].x, canvas_pos.y + points[i + 1].y), IM_COL32(255, 255, 0, 255), 2.0f);
+ draw_list->PopClipRect();
+ if (adding_preview)
points.pop_back();
+ ImGui::EndTabItem();
+ }
+
+ if (ImGui::BeginTabItem("BG/FG draw lists"))
+ {
+ static bool draw_bg = true;
+ static bool draw_fg = true;
+ ImGui::Checkbox("Draw in Background draw list", &draw_bg);
+ ImGui::SameLine(); HelpMarker("The Background draw list will be rendered below every Dear ImGui windows.");
+ ImGui::Checkbox("Draw in Foreground draw list", &draw_fg);
+ ImGui::SameLine(); HelpMarker("The Foreground draw list will be rendered over every Dear ImGui windows.");
+ ImVec2 window_pos = ImGui::GetWindowPos();
+ ImVec2 window_size = ImGui::GetWindowSize();
+ ImVec2 window_center = ImVec2(window_pos.x + window_size.x * 0.5f, window_pos.y + window_size.y * 0.5f);
+ if (draw_bg)
+ ImGui::GetBackgroundDrawList()->AddCircle(window_center, window_size.x * 0.6f, IM_COL32(255, 0, 0, 200), 48, 10+4);
+ if (draw_fg)
+ ImGui::GetForegroundDrawList()->AddCircle(window_center, window_size.y * 0.6f, IM_COL32(0, 255, 0, 200), 48, 10);
+ ImGui::EndTabItem();
+ }
+
+ ImGui::EndTabBar();
+ }
+
+ ImGui::End();
+}
+
+//-----------------------------------------------------------------------------
+// [SECTION] Example App: Documents Handling / ShowExampleAppDocuments()
+//-----------------------------------------------------------------------------
+
+// Simplified structure to mimic a Document model
+struct MyDocument
+{
+ const char* Name; // Document title
+ bool Open; // Set when the document is open (in this demo, we keep an array of all available documents to simplify the demo)
+ bool OpenPrev; // Copy of Open from last update.
+ bool Dirty; // Set when the document has been modified
+ bool WantClose; // Set when the document
+ ImVec4 Color; // An arbitrary variable associated to the document
+
+ MyDocument(const char* name, bool open = true, const ImVec4& color = ImVec4(1.0f,1.0f,1.0f,1.0f))
+ {
+ Name = name;
+ Open = OpenPrev = open;
+ Dirty = false;
+ WantClose = false;
+ Color = color;
+ }
+ void DoOpen() { Open = true; }
+ void DoQueueClose() { WantClose = true; }
+ void DoForceClose() { Open = false; Dirty = false; }
+ void DoSave() { Dirty = false; }
+
+ // Display dummy contents for the Document
+ static void DisplayContents(MyDocument* doc)
+ {
+ ImGui::PushID(doc);
+ ImGui::Text("Document \"%s\"", doc->Name);
+ ImGui::PushStyleColor(ImGuiCol_Text, doc->Color);
+ ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+ ImGui::PopStyleColor();
+ if (ImGui::Button("Modify", ImVec2(100, 0)))
+ doc->Dirty = true;
+ ImGui::SameLine();
+ if (ImGui::Button("Save", ImVec2(100, 0)))
+ doc->DoSave();
+ ImGui::ColorEdit3("color", &doc->Color.x); // Useful to test drag and drop and hold-dragged-to-open-tab behavior.
+ ImGui::PopID();
+ }
+
+ // Display context menu for the Document
+ static void DisplayContextMenu(MyDocument* doc)
+ {
+ if (!ImGui::BeginPopupContextItem())
+ return;
+
+ char buf[256];
+ sprintf(buf, "Save %s", doc->Name);
+ if (ImGui::MenuItem(buf, "CTRL+S", false, doc->Open))
+ doc->DoSave();
+ if (ImGui::MenuItem("Close", "CTRL+W", false, doc->Open))
+ doc->DoQueueClose();
+ ImGui::EndPopup();
+ }
+};
+
+struct ExampleAppDocuments
+{
+ ImVector Documents;
+
+ ExampleAppDocuments()
+ {
+ Documents.push_back(MyDocument("Lettuce", true, ImVec4(0.4f, 0.8f, 0.4f, 1.0f)));
+ Documents.push_back(MyDocument("Eggplant", true, ImVec4(0.8f, 0.5f, 1.0f, 1.0f)));
+ Documents.push_back(MyDocument("Carrot", true, ImVec4(1.0f, 0.8f, 0.5f, 1.0f)));
+ Documents.push_back(MyDocument("Tomato", false, ImVec4(1.0f, 0.3f, 0.4f, 1.0f)));
+ Documents.push_back(MyDocument("A Rather Long Title", false));
+ Documents.push_back(MyDocument("Some Document", false));
+ }
+};
+
+// [Optional] Notify the system of Tabs/Windows closure that happened outside the regular tab interface.
+// If a tab has been closed programmatically (aka closed from another source such as the Checkbox() in the demo, as opposed
+// to clicking on the regular tab closing button) and stops being submitted, it will take a frame for the tab bar to notice its absence.
+// During this frame there will be a gap in the tab bar, and if the tab that has disappeared was the selected one, the tab bar
+// will report no selected tab during the frame. This will effectively give the impression of a flicker for one frame.
+// We call SetTabItemClosed() to manually notify the Tab Bar or Docking system of removed tabs to avoid this glitch.
+// Note that this completely optional, and only affect tab bars with the ImGuiTabBarFlags_Reorderable flag.
+static void NotifyOfDocumentsClosedElsewhere(ExampleAppDocuments& app)
+{
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ {
+ MyDocument* doc = &app.Documents[doc_n];
+ if (!doc->Open && doc->OpenPrev)
+ ImGui::SetTabItemClosed(doc->Name);
+ doc->OpenPrev = doc->Open;
+ }
+}
+
+void ShowExampleAppDocuments(bool* p_open)
+{
+ static ExampleAppDocuments app;
+
+ // Options
+ static bool opt_reorderable = true;
+ static ImGuiTabBarFlags opt_fitting_flags = ImGuiTabBarFlags_FittingPolicyDefault_;
+
+ bool window_contents_visible = ImGui::Begin("Example: Documents", p_open, ImGuiWindowFlags_MenuBar);
+ if (!window_contents_visible)
+ {
+ ImGui::End();
+ return;
+ }
+
+ // Menu
+ if (ImGui::BeginMenuBar())
+ {
+ if (ImGui::BeginMenu("File"))
+ {
+ int open_count = 0;
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ open_count += app.Documents[doc_n].Open ? 1 : 0;
+
+ if (ImGui::BeginMenu("Open", open_count < app.Documents.Size))
+ {
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ {
+ MyDocument* doc = &app.Documents[doc_n];
+ if (!doc->Open)
+ if (ImGui::MenuItem(doc->Name))
+ doc->DoOpen();
+ }
+ ImGui::EndMenu();
+ }
+ if (ImGui::MenuItem("Close All Documents", NULL, false, open_count > 0))
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ app.Documents[doc_n].DoQueueClose();
+ if (ImGui::MenuItem("Exit", "Alt+F4")) {}
+ ImGui::EndMenu();
+ }
+ ImGui::EndMenuBar();
+ }
+
+ // [Debug] List documents with one checkbox for each
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ {
+ MyDocument* doc = &app.Documents[doc_n];
+ if (doc_n > 0)
+ ImGui::SameLine();
+ ImGui::PushID(doc);
+ if (ImGui::Checkbox(doc->Name, &doc->Open))
+ if (!doc->Open)
+ doc->DoForceClose();
+ ImGui::PopID();
+ }
+
+ ImGui::Separator();
+
+ // Submit Tab Bar and Tabs
+ {
+ ImGuiTabBarFlags tab_bar_flags = (opt_fitting_flags) | (opt_reorderable ? ImGuiTabBarFlags_Reorderable : 0);
+ if (ImGui::BeginTabBar("##tabs", tab_bar_flags))
+ {
+ if (opt_reorderable)
+ NotifyOfDocumentsClosedElsewhere(app);
+
+ // [DEBUG] Stress tests
+ //if ((ImGui::GetFrameCount() % 30) == 0) docs[1].Open ^= 1; // [DEBUG] Automatically show/hide a tab. Test various interactions e.g. dragging with this on.
+ //if (ImGui::GetIO().KeyCtrl) ImGui::SetTabItemSelected(docs[1].Name); // [DEBUG] Test SetTabItemSelected(), probably not very useful as-is anyway..
+
+ // Submit Tabs
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ {
+ MyDocument* doc = &app.Documents[doc_n];
+ if (!doc->Open)
+ continue;
+
+ ImGuiTabItemFlags tab_flags = (doc->Dirty ? ImGuiTabItemFlags_UnsavedDocument : 0);
+ bool visible = ImGui::BeginTabItem(doc->Name, &doc->Open, tab_flags);
+
+ // Cancel attempt to close when unsaved add to save queue so we can display a popup.
+ if (!doc->Open && doc->Dirty)
+ {
+ doc->Open = true;
+ doc->DoQueueClose();
+ }
+
+ MyDocument::DisplayContextMenu(doc);
+ if (visible)
+ {
+ MyDocument::DisplayContents(doc);
+ ImGui::EndTabItem();
+ }
+ }
+
+ ImGui::EndTabBar();
+ }
+ }
+
+ // Update closing queue
+ static ImVector close_queue;
+ if (close_queue.empty())
+ {
+ // Close queue is locked once we started a popup
+ for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++)
+ {
+ MyDocument* doc = &app.Documents[doc_n];
+ if (doc->WantClose)
+ {
+ doc->WantClose = false;
+ close_queue.push_back(doc);
}
}
- draw_list->PushClipRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), true); // clip lines within the canvas (if we resize it, etc.)
- for (int i = 0; i < points.Size - 1; i += 2)
- draw_list->AddLine(ImVec2(canvas_pos.x + points[i].x, canvas_pos.y + points[i].y), ImVec2(canvas_pos.x + points[i + 1].x, canvas_pos.y + points[i + 1].y), IM_COL32(255, 255, 0, 255), 2.0f);
- draw_list->PopClipRect();
- if (adding_preview)
- points.pop_back();
}
+
+ // Display closing confirmation UI
+ if (!close_queue.empty())
+ {
+ int close_queue_unsaved_documents = 0;
+ for (int n = 0; n < close_queue.Size; n++)
+ if (close_queue[n]->Dirty)
+ close_queue_unsaved_documents++;
+
+ if (close_queue_unsaved_documents == 0)
+ {
+ // Close documents when all are unsaved
+ for (int n = 0; n < close_queue.Size; n++)
+ close_queue[n]->DoForceClose();
+ close_queue.clear();
+ }
+ else
+ {
+ if (!ImGui::IsPopupOpen("Save?"))
+ ImGui::OpenPopup("Save?");
+ if (ImGui::BeginPopupModal("Save?"))
+ {
+ ImGui::Text("Save change to the following items?");
+ ImGui::SetNextItemWidth(-1.0f);
+ if (ImGui::ListBoxHeader("##", close_queue_unsaved_documents, 6))
+ {
+ for (int n = 0; n < close_queue.Size; n++)
+ if (close_queue[n]->Dirty)
+ ImGui::Text("%s", close_queue[n]->Name);
+ ImGui::ListBoxFooter();
+ }
+
+ if (ImGui::Button("Yes", ImVec2(80, 0)))
+ {
+ for (int n = 0; n < close_queue.Size; n++)
+ {
+ if (close_queue[n]->Dirty)
+ close_queue[n]->DoSave();
+ close_queue[n]->DoForceClose();
+ }
+ close_queue.clear();
+ ImGui::CloseCurrentPopup();
+ }
+ ImGui::SameLine();
+ if (ImGui::Button("No", ImVec2(80, 0)))
+ {
+ for (int n = 0; n < close_queue.Size; n++)
+ close_queue[n]->DoForceClose();
+ close_queue.clear();
+ ImGui::CloseCurrentPopup();
+ }
+ ImGui::SameLine();
+ if (ImGui::Button("Cancel", ImVec2(80, 0)))
+ {
+ close_queue.clear();
+ ImGui::CloseCurrentPopup();
+ }
+ ImGui::EndPopup();
+ }
+ }
+ }
+
ImGui::End();
}
// End of Demo code
#else
+void ImGui::ShowAboutWindow(bool*) {}
void ImGui::ShowDemoWindow(bool*) {}
void ImGui::ShowUserGuide() {}
void ImGui::ShowStyleEditor(ImGuiStyle*) {}
#endif
+
+#endif // #ifndef IMGUI_DISABLE
diff --git a/src/imgui/imgui_draw.cpp b/src/imgui/imgui_draw.cpp
index 553fb16ee6..4bb91ccfef 100644
--- a/src/imgui/imgui_draw.cpp
+++ b/src/imgui/imgui_draw.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.66 WIP
+// dear imgui, v1.75
// (drawing and font code)
/*
@@ -8,11 +8,13 @@ Index of this file:
// [SECTION] STB libraries implementation
// [SECTION] Style functions
// [SECTION] ImDrawList
+// [SECTION] ImDrawListSplitter
// [SECTION] ImDrawData
// [SECTION] Helpers ShadeVertsXXX functions
// [SECTION] ImFontConfig
// [SECTION] ImFontAtlas
-// [SECTION] ImFontAtlas glyph ranges helpers + GlyphRangesBuilder
+// [SECTION] ImFontAtlas glyph ranges helpers
+// [SECTION] ImFontGlyphRangesBuilder
// [SECTION] ImFont
// [SECTION] Internal Render Helpers
// [SECTION] Decompression code
@@ -25,6 +27,8 @@ Index of this file:
#endif
#include "imgui.h"
+#ifndef IMGUI_DISABLE
+
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
@@ -32,7 +36,7 @@ Index of this file:
#include // vsnprintf, sscanf, printf
#if !defined(alloca)
-#if defined(__GLIBC__) || defined(__sun) || defined(__CYGWIN__)
+#if defined(__GLIBC__) || defined(__sun) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__SWITCH__)
#include // alloca (glibc uses . Note that Cygwin may have _WIN32 defined, so the order matters here)
#elif defined(_WIN32)
#include // alloca
@@ -46,16 +50,20 @@ Index of this file:
// Visual Studio warnings
#ifdef _MSC_VER
+#pragma warning (disable: 4127) // condition expression is constant
#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#endif
// Clang/GCC warnings with -Weverything
-#ifdef __clang__
+#if defined(__clang__)
#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse.
#pragma clang diagnostic ignored "-Wfloat-equal" // warning : comparing floating point with == or != is unsafe // storing and comparing against same constants ok.
-#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference it.
+#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference is.
#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness //
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0
+#endif
#if __has_warning("-Wcomma")
#pragma clang diagnostic ignored "-Wcomma" // warning : possible misuse of comma operator here //
#endif
@@ -63,15 +71,15 @@ Index of this file:
#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning : macro name is a reserved identifier //
#endif
#if __has_warning("-Wdouble-promotion")
-#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function
+#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
#endif
#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used
#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function
#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value
-#if __GNUC__ >= 8
-#pragma GCC diagnostic ignored "-Wclass-memaccess" // warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
-#endif
+#pragma GCC diagnostic ignored "-Wstack-protector" // warning: stack protector not protecting local variables: variable length buffer
+#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
#endif
//-------------------------------------------------------------------------
@@ -79,7 +87,7 @@ Index of this file:
//-------------------------------------------------------------------------
// Compile time options:
-//#define IMGUI_STB_NAMESPACE ImGuiStb
+//#define IMGUI_STB_NAMESPACE ImStb
//#define IMGUI_STB_TRUETYPE_FILENAME "my_folder/stb_truetype.h"
//#define IMGUI_STB_RECT_PACK_FILENAME "my_folder/stb_rect_pack.h"
//#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
@@ -95,7 +103,7 @@ namespace IMGUI_STB_NAMESPACE
#pragma warning (disable: 4456) // declaration of 'xx' hides previous local declaration
#endif
-#ifdef __clang__
+#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-function"
#pragma clang diagnostic ignored "-Wmissing-prototypes"
@@ -103,7 +111,7 @@ namespace IMGUI_STB_NAMESPACE
#pragma clang diagnostic ignored "-Wcast-qual" // warning : cast from 'const xxxx *' to 'xxx *' drops const qualifier //
#endif
-#ifdef __GNUC__
+#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wtype-limits" // warning: comparison is always true due to limited range of data type [-Wtype-limits]
#pragma GCC diagnostic ignored "-Wcast-qual" // warning: cast from type 'const xxxx *' to type 'xxxx *' casts away qualifiers
@@ -125,8 +133,8 @@ namespace IMGUI_STB_NAMESPACE
#ifndef STB_TRUETYPE_IMPLEMENTATION // in case the user already have an implementation in the _same_ compilation unit (e.g. unity builds)
#ifndef IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
-#define STBTT_malloc(x,u) ((void)(u), ImGui::MemAlloc(x))
-#define STBTT_free(x,u) ((void)(u), ImGui::MemFree(x))
+#define STBTT_malloc(x,u) ((void)(u), IM_ALLOC(x))
+#define STBTT_free(x,u) ((void)(u), IM_FREE(x))
#define STBTT_assert(x) IM_ASSERT(x)
#define STBTT_fmod(x,y) ImFmod(x,y)
#define STBTT_sqrt(x) ImSqrt(x)
@@ -146,20 +154,20 @@ namespace IMGUI_STB_NAMESPACE
#endif
#endif
-#ifdef __GNUC__
+#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
-#ifdef __clang__
+#if defined(__clang__)
#pragma clang diagnostic pop
#endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
#pragma warning (pop)
#endif
#ifdef IMGUI_STB_NAMESPACE
-} // namespace ImGuiStb
+} // namespace ImStb
using namespace IMGUI_STB_NAMESPACE;
#endif
@@ -175,7 +183,7 @@ void ImGui::StyleColorsDark(ImGuiStyle* dst)
colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
colors[ImGuiCol_TextDisabled] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f);
colors[ImGuiCol_WindowBg] = ImVec4(0.06f, 0.06f, 0.06f, 0.94f);
- colors[ImGuiCol_ChildBg] = ImVec4(1.00f, 1.00f, 1.00f, 0.00f);
+ colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.08f, 0.08f, 0.94f);
colors[ImGuiCol_Border] = ImVec4(0.43f, 0.43f, 0.50f, 0.50f);
colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
@@ -205,6 +213,11 @@ void ImGui::StyleColorsDark(ImGuiStyle* dst)
colors[ImGuiCol_ResizeGrip] = ImVec4(0.26f, 0.59f, 0.98f, 0.25f);
colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
colors[ImGuiCol_ResizeGripActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
+ colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f);
+ colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered];
+ colors[ImGuiCol_TabActive] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f);
+ colors[ImGuiCol_TabUnfocused] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f);
+ colors[ImGuiCol_TabUnfocusedActive] = ImLerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f);
colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f);
colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
@@ -249,12 +262,17 @@ void ImGui::StyleColorsClassic(ImGuiStyle* dst)
colors[ImGuiCol_Header] = ImVec4(0.40f, 0.40f, 0.90f, 0.45f);
colors[ImGuiCol_HeaderHovered] = ImVec4(0.45f, 0.45f, 0.90f, 0.80f);
colors[ImGuiCol_HeaderActive] = ImVec4(0.53f, 0.53f, 0.87f, 0.80f);
- colors[ImGuiCol_Separator] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f);
+ colors[ImGuiCol_Separator] = ImVec4(0.50f, 0.50f, 0.50f, 0.60f);
colors[ImGuiCol_SeparatorHovered] = ImVec4(0.60f, 0.60f, 0.70f, 1.00f);
colors[ImGuiCol_SeparatorActive] = ImVec4(0.70f, 0.70f, 0.90f, 1.00f);
colors[ImGuiCol_ResizeGrip] = ImVec4(1.00f, 1.00f, 1.00f, 0.16f);
colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.78f, 0.82f, 1.00f, 0.60f);
colors[ImGuiCol_ResizeGripActive] = ImVec4(0.78f, 0.82f, 1.00f, 0.90f);
+ colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f);
+ colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered];
+ colors[ImGuiCol_TabActive] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f);
+ colors[ImGuiCol_TabUnfocused] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f);
+ colors[ImGuiCol_TabUnfocusedActive] = ImLerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f);
colors[ImGuiCol_PlotLines] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
colors[ImGuiCol_PlotLinesHovered] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
@@ -300,12 +318,17 @@ void ImGui::StyleColorsLight(ImGuiStyle* dst)
colors[ImGuiCol_Header] = ImVec4(0.26f, 0.59f, 0.98f, 0.31f);
colors[ImGuiCol_HeaderHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.80f);
colors[ImGuiCol_HeaderActive] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
- colors[ImGuiCol_Separator] = ImVec4(0.39f, 0.39f, 0.39f, 1.00f);
+ colors[ImGuiCol_Separator] = ImVec4(0.39f, 0.39f, 0.39f, 0.62f);
colors[ImGuiCol_SeparatorHovered] = ImVec4(0.14f, 0.44f, 0.80f, 0.78f);
colors[ImGuiCol_SeparatorActive] = ImVec4(0.14f, 0.44f, 0.80f, 1.00f);
colors[ImGuiCol_ResizeGrip] = ImVec4(0.80f, 0.80f, 0.80f, 0.56f);
colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
colors[ImGuiCol_ResizeGripActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
+ colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.90f);
+ colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered];
+ colors[ImGuiCol_TabActive] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f);
+ colors[ImGuiCol_TabUnfocused] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f);
+ colors[ImGuiCol_TabUnfocusedActive] = ImLerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f);
colors[ImGuiCol_PlotLines] = ImVec4(0.39f, 0.39f, 0.39f, 1.00f);
colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
@@ -327,14 +350,30 @@ ImDrawListSharedData::ImDrawListSharedData()
Font = NULL;
FontSize = 0.0f;
CurveTessellationTol = 0.0f;
+ CircleSegmentMaxError = 0.0f;
ClipRectFullscreen = ImVec4(-8192.0f, -8192.0f, +8192.0f, +8192.0f);
+ InitialFlags = ImDrawListFlags_None;
- // Const data
+ // Lookup tables
for (int i = 0; i < IM_ARRAYSIZE(CircleVtx12); i++)
{
const float a = ((float)i * 2 * IM_PI) / (float)IM_ARRAYSIZE(CircleVtx12);
CircleVtx12[i] = ImVec2(ImCos(a), ImSin(a));
}
+ memset(CircleSegmentCounts, 0, sizeof(CircleSegmentCounts)); // This will be set by SetCircleSegmentMaxError()
+}
+
+void ImDrawListSharedData::SetCircleSegmentMaxError(float max_error)
+{
+ if (CircleSegmentMaxError == max_error)
+ return;
+ CircleSegmentMaxError = max_error;
+ for (int i = 0; i < IM_ARRAYSIZE(CircleSegmentCounts); i++)
+ {
+ const float radius = i + 1.0f;
+ const int segment_count = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, CircleSegmentMaxError);
+ CircleSegmentCounts[i] = (ImU8)ImMin(segment_count, 255);
+ }
}
void ImDrawList::Clear()
@@ -342,16 +381,15 @@ void ImDrawList::Clear()
CmdBuffer.resize(0);
IdxBuffer.resize(0);
VtxBuffer.resize(0);
- Flags = ImDrawListFlags_AntiAliasedLines | ImDrawListFlags_AntiAliasedFill;
+ Flags = _Data ? _Data->InitialFlags : ImDrawListFlags_None;
+ _VtxCurrentOffset = 0;
_VtxCurrentIdx = 0;
_VtxWritePtr = NULL;
_IdxWritePtr = NULL;
_ClipRectStack.resize(0);
_TextureIdStack.resize(0);
_Path.resize(0);
- _ChannelsCurrent = 0;
- _ChannelsCount = 1;
- // NB: Do not clear channels so our allocations are re-used after the first frame.
+ _Splitter.Clear();
}
void ImDrawList::ClearFreeMemory()
@@ -365,20 +403,12 @@ void ImDrawList::ClearFreeMemory()
_ClipRectStack.clear();
_TextureIdStack.clear();
_Path.clear();
- _ChannelsCurrent = 0;
- _ChannelsCount = 1;
- for (int i = 0; i < _Channels.Size; i++)
- {
- if (i == 0) memset(&_Channels[0], 0, sizeof(_Channels[0])); // channel 0 is a copy of CmdBuffer/IdxBuffer, don't destruct again
- _Channels[i].CmdBuffer.clear();
- _Channels[i].IdxBuffer.clear();
- }
- _Channels.clear();
+ _Splitter.ClearFreeMemory();
}
ImDrawList* ImDrawList::CloneOutput() const
{
- ImDrawList* dst = IM_NEW(ImDrawList(NULL));
+ ImDrawList* dst = IM_NEW(ImDrawList(_Data));
dst->CmdBuffer = CmdBuffer;
dst->IdxBuffer = IdxBuffer;
dst->VtxBuffer = VtxBuffer;
@@ -388,13 +418,15 @@ ImDrawList* ImDrawList::CloneOutput() const
// Using macros because C++ is a terrible language, we want guaranteed inline, no code in header, and no overhead in Debug builds
#define GetCurrentClipRect() (_ClipRectStack.Size ? _ClipRectStack.Data[_ClipRectStack.Size-1] : _Data->ClipRectFullscreen)
-#define GetCurrentTextureId() (_TextureIdStack.Size ? _TextureIdStack.Data[_TextureIdStack.Size-1] : NULL)
+#define GetCurrentTextureId() (_TextureIdStack.Size ? _TextureIdStack.Data[_TextureIdStack.Size-1] : (ImTextureID)NULL)
void ImDrawList::AddDrawCmd()
{
ImDrawCmd draw_cmd;
draw_cmd.ClipRect = GetCurrentClipRect();
draw_cmd.TextureId = GetCurrentTextureId();
+ draw_cmd.VtxOffset = _VtxCurrentOffset;
+ draw_cmd.IdxOffset = IdxBuffer.Size;
IM_ASSERT(draw_cmd.ClipRect.x <= draw_cmd.ClipRect.z && draw_cmd.ClipRect.y <= draw_cmd.ClipRect.w);
CmdBuffer.push_back(draw_cmd);
@@ -501,89 +533,21 @@ void ImDrawList::PopTextureID()
UpdateTextureID();
}
-void ImDrawList::ChannelsSplit(int channels_count)
-{
- IM_ASSERT(_ChannelsCurrent == 0 && _ChannelsCount == 1);
- int old_channels_count = _Channels.Size;
- if (old_channels_count < channels_count)
- _Channels.resize(channels_count);
- _ChannelsCount = channels_count;
-
- // _Channels[] (24/32 bytes each) hold storage that we'll swap with this->_CmdBuffer/_IdxBuffer
- // The content of _Channels[0] at this point doesn't matter. We clear it to make state tidy in a debugger but we don't strictly need to.
- // When we switch to the next channel, we'll copy _CmdBuffer/_IdxBuffer into _Channels[0] and then _Channels[1] into _CmdBuffer/_IdxBuffer
- memset(&_Channels[0], 0, sizeof(ImDrawChannel));
- for (int i = 1; i < channels_count; i++)
- {
- if (i >= old_channels_count)
- {
- IM_PLACEMENT_NEW(&_Channels[i]) ImDrawChannel();
- }
- else
- {
- _Channels[i].CmdBuffer.resize(0);
- _Channels[i].IdxBuffer.resize(0);
- }
- if (_Channels[i].CmdBuffer.Size == 0)
- {
- ImDrawCmd draw_cmd;
- draw_cmd.ClipRect = _ClipRectStack.back();
- draw_cmd.TextureId = _TextureIdStack.back();
- _Channels[i].CmdBuffer.push_back(draw_cmd);
- }
- }
-}
-
-void ImDrawList::ChannelsMerge()
-{
- // Note that we never use or rely on channels.Size because it is merely a buffer that we never shrink back to 0 to keep all sub-buffers ready for use.
- if (_ChannelsCount <= 1)
- return;
-
- ChannelsSetCurrent(0);
- if (CmdBuffer.Size && CmdBuffer.back().ElemCount == 0)
- CmdBuffer.pop_back();
-
- int new_cmd_buffer_count = 0, new_idx_buffer_count = 0;
- for (int i = 1; i < _ChannelsCount; i++)
- {
- ImDrawChannel& ch = _Channels[i];
- if (ch.CmdBuffer.Size && ch.CmdBuffer.back().ElemCount == 0)
- ch.CmdBuffer.pop_back();
- new_cmd_buffer_count += ch.CmdBuffer.Size;
- new_idx_buffer_count += ch.IdxBuffer.Size;
- }
- CmdBuffer.resize(CmdBuffer.Size + new_cmd_buffer_count);
- IdxBuffer.resize(IdxBuffer.Size + new_idx_buffer_count);
-
- ImDrawCmd* cmd_write = CmdBuffer.Data + CmdBuffer.Size - new_cmd_buffer_count;
- _IdxWritePtr = IdxBuffer.Data + IdxBuffer.Size - new_idx_buffer_count;
- for (int i = 1; i < _ChannelsCount; i++)
- {
- ImDrawChannel& ch = _Channels[i];
- if (int sz = ch.CmdBuffer.Size) { memcpy(cmd_write, ch.CmdBuffer.Data, sz * sizeof(ImDrawCmd)); cmd_write += sz; }
- if (int sz = ch.IdxBuffer.Size) { memcpy(_IdxWritePtr, ch.IdxBuffer.Data, sz * sizeof(ImDrawIdx)); _IdxWritePtr += sz; }
- }
- UpdateClipRect(); // We call this instead of AddDrawCmd(), so that empty channels won't produce an extra draw call.
- _ChannelsCount = 1;
-}
-
-void ImDrawList::ChannelsSetCurrent(int idx)
-{
- IM_ASSERT(idx < _ChannelsCount);
- if (_ChannelsCurrent == idx) return;
- memcpy(&_Channels.Data[_ChannelsCurrent].CmdBuffer, &CmdBuffer, sizeof(CmdBuffer)); // copy 12 bytes, four times
- memcpy(&_Channels.Data[_ChannelsCurrent].IdxBuffer, &IdxBuffer, sizeof(IdxBuffer));
- _ChannelsCurrent = idx;
- memcpy(&CmdBuffer, &_Channels.Data[_ChannelsCurrent].CmdBuffer, sizeof(CmdBuffer));
- memcpy(&IdxBuffer, &_Channels.Data[_ChannelsCurrent].IdxBuffer, sizeof(IdxBuffer));
- _IdxWritePtr = IdxBuffer.Data + IdxBuffer.Size;
-}
-
-// NB: this can be called with negative count for removing primitives (as long as the result does not underflow)
+// Reserve space for a number of vertices and indices.
+// You must finish filling your reserved data before calling PrimReserve() again, as it may reallocate or
+// submit the intermediate results. PrimUnreserve() can be used to release unused allocations.
void ImDrawList::PrimReserve(int idx_count, int vtx_count)
{
- ImDrawCmd& draw_cmd = CmdBuffer.Data[CmdBuffer.Size-1];
+ // Large mesh support (when enabled)
+ IM_ASSERT_PARANOID(idx_count >= 0 && vtx_count >= 0);
+ if (sizeof(ImDrawIdx) == 2 && (_VtxCurrentIdx + vtx_count >= (1 << 16)) && (Flags & ImDrawListFlags_AllowVtxOffset))
+ {
+ _VtxCurrentOffset = VtxBuffer.Size;
+ _VtxCurrentIdx = 0;
+ AddDrawCmd();
+ }
+
+ ImDrawCmd& draw_cmd = CmdBuffer.Data[CmdBuffer.Size - 1];
draw_cmd.ElemCount += idx_count;
int vtx_buffer_old_size = VtxBuffer.Size;
@@ -595,6 +559,17 @@ void ImDrawList::PrimReserve(int idx_count, int vtx_count)
_IdxWritePtr = IdxBuffer.Data + idx_buffer_old_size;
}
+// Release the a number of reserved vertices/indices from the end of the last reservation made with PrimReserve().
+void ImDrawList::PrimUnreserve(int idx_count, int vtx_count)
+{
+ IM_ASSERT_PARANOID(idx_count >= 0 && vtx_count >= 0);
+
+ ImDrawCmd& draw_cmd = CmdBuffer.Data[CmdBuffer.Size - 1];
+ draw_cmd.ElemCount -= idx_count;
+ VtxBuffer.shrink(VtxBuffer.Size - vtx_count);
+ IdxBuffer.shrink(IdxBuffer.Size - idx_count);
+}
+
// Fully unrolled with inline call to keep our debug builds decently fast.
void ImDrawList::PrimRect(const ImVec2& a, const ImVec2& c, ImU32 col)
{
@@ -640,7 +615,13 @@ void ImDrawList::PrimQuadUV(const ImVec2& a, const ImVec2& b, const ImVec2& c, c
_IdxWritePtr += 6;
}
+// On AddPolyline() and AddConvexPolyFilled() we intentionally avoid using ImVec2 and superflous function calls to optimize debug/non-inlined builds.
+// Those macros expects l-values.
+#define IM_NORMALIZE2F_OVER_ZERO(VX,VY) { float d2 = VX*VX + VY*VY; if (d2 > 0.0f) { float inv_len = 1.0f / ImSqrt(d2); VX *= inv_len; VY *= inv_len; } }
+#define IM_FIXNORMAL2F(VX,VY) { float d2 = VX*VX + VY*VY; if (d2 < 0.5f) d2 = 0.5f; float inv_lensq = 1.0f / d2; VX *= inv_lensq; VY *= inv_lensq; }
+
// TODO: Thickness anti-aliased lines cap are missing their AA fringe.
+// We avoid using the ImVec2 math operators here to reduce cost to a minimum for debug/non-inlined builds.
void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 col, bool closed, float thickness)
{
if (points_count < 2)
@@ -664,16 +645,17 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32
PrimReserve(idx_count, vtx_count);
// Temporary buffer
- ImVec2* temp_normals = (ImVec2*)alloca(points_count * (thick_line ? 5 : 3) * sizeof(ImVec2));
+ ImVec2* temp_normals = (ImVec2*)alloca(points_count * (thick_line ? 5 : 3) * sizeof(ImVec2)); //-V630
ImVec2* temp_points = temp_normals + points_count;
for (int i1 = 0; i1 < count; i1++)
{
const int i2 = (i1+1) == points_count ? 0 : i1+1;
- ImVec2 diff = points[i2] - points[i1];
- diff *= ImInvLength(diff, 1.0f);
- temp_normals[i1].x = diff.y;
- temp_normals[i1].y = -diff.x;
+ float dx = points[i2].x - points[i1].x;
+ float dy = points[i2].y - points[i1].y;
+ IM_NORMALIZE2F_OVER_ZERO(dx, dy);
+ temp_normals[i1].x = dy;
+ temp_normals[i1].y = -dx;
}
if (!closed)
temp_normals[points_count-1] = temp_normals[points_count-2];
@@ -696,17 +678,18 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32
unsigned int idx2 = (i1+1) == points_count ? _VtxCurrentIdx : idx1+3;
// Average normals
- ImVec2 dm = (temp_normals[i1] + temp_normals[i2]) * 0.5f;
- float dmr2 = dm.x*dm.x + dm.y*dm.y;
- if (dmr2 > 0.000001f)
- {
- float scale = 1.0f / dmr2;
- if (scale > 100.0f) scale = 100.0f;
- dm *= scale;
- }
- dm *= AA_SIZE;
- temp_points[i2*2+0] = points[i2] + dm;
- temp_points[i2*2+1] = points[i2] - dm;
+ float dm_x = (temp_normals[i1].x + temp_normals[i2].x) * 0.5f;
+ float dm_y = (temp_normals[i1].y + temp_normals[i2].y) * 0.5f;
+ IM_FIXNORMAL2F(dm_x, dm_y)
+ dm_x *= AA_SIZE;
+ dm_y *= AA_SIZE;
+
+ // Add temporary vertexes
+ ImVec2* out_vtx = &temp_points[i2*2];
+ out_vtx[0].x = points[i2].x + dm_x;
+ out_vtx[0].y = points[i2].y + dm_y;
+ out_vtx[1].x = points[i2].x - dm_x;
+ out_vtx[1].y = points[i2].y - dm_y;
// Add indexes
_IdxWritePtr[0] = (ImDrawIdx)(idx2+0); _IdxWritePtr[1] = (ImDrawIdx)(idx1+0); _IdxWritePtr[2] = (ImDrawIdx)(idx1+2);
@@ -750,20 +733,24 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32
unsigned int idx2 = (i1+1) == points_count ? _VtxCurrentIdx : idx1+4;
// Average normals
- ImVec2 dm = (temp_normals[i1] + temp_normals[i2]) * 0.5f;
- float dmr2 = dm.x*dm.x + dm.y*dm.y;
- if (dmr2 > 0.000001f)
- {
- float scale = 1.0f / dmr2;
- if (scale > 100.0f) scale = 100.0f;
- dm *= scale;
- }
- ImVec2 dm_out = dm * (half_inner_thickness + AA_SIZE);
- ImVec2 dm_in = dm * half_inner_thickness;
- temp_points[i2*4+0] = points[i2] + dm_out;
- temp_points[i2*4+1] = points[i2] + dm_in;
- temp_points[i2*4+2] = points[i2] - dm_in;
- temp_points[i2*4+3] = points[i2] - dm_out;
+ float dm_x = (temp_normals[i1].x + temp_normals[i2].x) * 0.5f;
+ float dm_y = (temp_normals[i1].y + temp_normals[i2].y) * 0.5f;
+ IM_FIXNORMAL2F(dm_x, dm_y);
+ float dm_out_x = dm_x * (half_inner_thickness + AA_SIZE);
+ float dm_out_y = dm_y * (half_inner_thickness + AA_SIZE);
+ float dm_in_x = dm_x * half_inner_thickness;
+ float dm_in_y = dm_y * half_inner_thickness;
+
+ // Add temporary vertexes
+ ImVec2* out_vtx = &temp_points[i2*4];
+ out_vtx[0].x = points[i2].x + dm_out_x;
+ out_vtx[0].y = points[i2].y + dm_out_y;
+ out_vtx[1].x = points[i2].x + dm_in_x;
+ out_vtx[1].y = points[i2].y + dm_in_y;
+ out_vtx[2].x = points[i2].x - dm_in_x;
+ out_vtx[2].y = points[i2].y - dm_in_y;
+ out_vtx[3].x = points[i2].x - dm_out_x;
+ out_vtx[3].y = points[i2].y - dm_out_y;
// Add indexes
_IdxWritePtr[0] = (ImDrawIdx)(idx2+1); _IdxWritePtr[1] = (ImDrawIdx)(idx1+1); _IdxWritePtr[2] = (ImDrawIdx)(idx1+2);
@@ -801,11 +788,13 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32
const int i2 = (i1+1) == points_count ? 0 : i1+1;
const ImVec2& p1 = points[i1];
const ImVec2& p2 = points[i2];
- ImVec2 diff = p2 - p1;
- diff *= ImInvLength(diff, 1.0f);
- const float dx = diff.x * (thickness * 0.5f);
- const float dy = diff.y * (thickness * 0.5f);
+ float dx = p2.x - p1.x;
+ float dy = p2.y - p1.y;
+ IM_NORMALIZE2F_OVER_ZERO(dx, dy);
+ dx *= (thickness * 0.5f);
+ dy *= (thickness * 0.5f);
+
_VtxWritePtr[0].pos.x = p1.x + dy; _VtxWritePtr[0].pos.y = p1.y - dx; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col;
_VtxWritePtr[1].pos.x = p2.x + dy; _VtxWritePtr[1].pos.y = p2.y - dx; _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col;
_VtxWritePtr[2].pos.x = p2.x - dy; _VtxWritePtr[2].pos.y = p2.y + dx; _VtxWritePtr[2].uv = uv; _VtxWritePtr[2].col = col;
@@ -820,6 +809,7 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32
}
}
+// We intentionally avoid using ImVec2 and its math operators here to reduce cost to a minimum for debug/non-inlined builds.
void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_count, ImU32 col)
{
if (points_count < 3)
@@ -846,15 +836,16 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun
}
// Compute normals
- ImVec2* temp_normals = (ImVec2*)alloca(points_count * sizeof(ImVec2));
+ ImVec2* temp_normals = (ImVec2*)alloca(points_count * sizeof(ImVec2)); //-V630
for (int i0 = points_count-1, i1 = 0; i1 < points_count; i0 = i1++)
{
const ImVec2& p0 = points[i0];
const ImVec2& p1 = points[i1];
- ImVec2 diff = p1 - p0;
- diff *= ImInvLength(diff, 1.0f);
- temp_normals[i0].x = diff.y;
- temp_normals[i0].y = -diff.x;
+ float dx = p1.x - p0.x;
+ float dy = p1.y - p0.y;
+ IM_NORMALIZE2F_OVER_ZERO(dx, dy);
+ temp_normals[i0].x = dy;
+ temp_normals[i0].y = -dx;
}
for (int i0 = points_count-1, i1 = 0; i1 < points_count; i0 = i1++)
@@ -862,19 +853,15 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun
// Average normals
const ImVec2& n0 = temp_normals[i0];
const ImVec2& n1 = temp_normals[i1];
- ImVec2 dm = (n0 + n1) * 0.5f;
- float dmr2 = dm.x*dm.x + dm.y*dm.y;
- if (dmr2 > 0.000001f)
- {
- float scale = 1.0f / dmr2;
- if (scale > 100.0f) scale = 100.0f;
- dm *= scale;
- }
- dm *= AA_SIZE * 0.5f;
+ float dm_x = (n0.x + n1.x) * 0.5f;
+ float dm_y = (n0.y + n1.y) * 0.5f;
+ IM_FIXNORMAL2F(dm_x, dm_y);
+ dm_x *= AA_SIZE * 0.5f;
+ dm_y *= AA_SIZE * 0.5f;
// Add vertices
- _VtxWritePtr[0].pos = (points[i1] - dm); _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col; // Inner
- _VtxWritePtr[1].pos = (points[i1] + dm); _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col_trans; // Outer
+ _VtxWritePtr[0].pos.x = (points[i1].x - dm_x); _VtxWritePtr[0].pos.y = (points[i1].y - dm_y); _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col; // Inner
+ _VtxWritePtr[1].pos.x = (points[i1].x + dm_x); _VtxWritePtr[1].pos.y = (points[i1].y + dm_y); _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col_trans; // Outer
_VtxWritePtr += 2;
// Add indexes for fringes
@@ -904,36 +891,50 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun
}
}
-void ImDrawList::PathArcToFast(const ImVec2& centre, float radius, int a_min_of_12, int a_max_of_12)
+void ImDrawList::PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12)
{
if (radius == 0.0f || a_min_of_12 > a_max_of_12)
{
- _Path.push_back(centre);
+ _Path.push_back(center);
return;
}
_Path.reserve(_Path.Size + (a_max_of_12 - a_min_of_12 + 1));
for (int a = a_min_of_12; a <= a_max_of_12; a++)
{
const ImVec2& c = _Data->CircleVtx12[a % IM_ARRAYSIZE(_Data->CircleVtx12)];
- _Path.push_back(ImVec2(centre.x + c.x * radius, centre.y + c.y * radius));
+ _Path.push_back(ImVec2(center.x + c.x * radius, center.y + c.y * radius));
}
}
-void ImDrawList::PathArcTo(const ImVec2& centre, float radius, float a_min, float a_max, int num_segments)
+void ImDrawList::PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments)
{
if (radius == 0.0f)
{
- _Path.push_back(centre);
+ _Path.push_back(center);
return;
}
+
+ // Note that we are adding a point at both a_min and a_max.
+ // If you are trying to draw a full closed circle you don't want the overlapping points!
_Path.reserve(_Path.Size + (num_segments + 1));
for (int i = 0; i <= num_segments; i++)
{
const float a = a_min + ((float)i / (float)num_segments) * (a_max - a_min);
- _Path.push_back(ImVec2(centre.x + ImCos(a) * radius, centre.y + ImSin(a) * radius));
+ _Path.push_back(ImVec2(center.x + ImCos(a) * radius, center.y + ImSin(a) * radius));
}
}
+ImVec2 ImBezierCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, float t)
+{
+ float u = 1.0f - t;
+ float w1 = u*u*u;
+ float w2 = 3*u*u*t;
+ float w3 = 3*u*t*t;
+ float w4 = t*t*t;
+ return ImVec2(w1*p1.x + w2*p2.x + w3*p3.x + w4*p4.x, w1*p1.y + w2*p2.y + w3*p3.y + w4*p4.y);
+}
+
+// Closely mimics BezierClosestPointCasteljauStep() in imgui.cpp
static void PathBezierToCasteljau(ImVector* path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level)
{
float dx = x4 - x1;
@@ -954,7 +955,6 @@ static void PathBezierToCasteljau(ImVector* path, float x1, float y1, fl
float x123 = (x12+x23)*0.5f, y123 = (y12+y23)*0.5f;
float x234 = (x23+x34)*0.5f, y234 = (y23+y34)*0.5f;
float x1234 = (x123+x234)*0.5f, y1234 = (y123+y234)*0.5f;
-
PathBezierToCasteljau(path, x1,y1, x12,y12, x123,y123, x1234,y1234, tess_tol, level+1);
PathBezierToCasteljau(path, x1234,y1234, x234,y234, x34,y34, x4,y4, tess_tol, level+1);
}
@@ -965,26 +965,17 @@ void ImDrawList::PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImV
ImVec2 p1 = _Path.back();
if (num_segments == 0)
{
- // Auto-tessellated
- PathBezierToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, _Data->CurveTessellationTol, 0);
+ PathBezierToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, _Data->CurveTessellationTol, 0); // Auto-tessellated
}
else
{
float t_step = 1.0f / (float)num_segments;
for (int i_step = 1; i_step <= num_segments; i_step++)
- {
- float t = t_step * i_step;
- float u = 1.0f - t;
- float w1 = u*u*u;
- float w2 = 3*u*u*t;
- float w3 = 3*u*t*t;
- float w4 = t*t*t;
- _Path.push_back(ImVec2(w1*p1.x + w2*p2.x + w3*p3.x + w4*p4.x, w1*p1.y + w2*p2.y + w3*p3.y + w4*p4.y));
- }
+ _Path.push_back(ImBezierCalc(p1, p2, p3, p4, t_step * i_step));
}
}
-void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, int rounding_corners)
+void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, ImDrawCornerFlags rounding_corners)
{
rounding = ImMin(rounding, ImFabs(b.x - a.x) * ( ((rounding_corners & ImDrawCornerFlags_Top) == ImDrawCornerFlags_Top) || ((rounding_corners & ImDrawCornerFlags_Bot) == ImDrawCornerFlags_Bot) ? 0.5f : 1.0f ) - 1.0f);
rounding = ImMin(rounding, ImFabs(b.y - a.y) * ( ((rounding_corners & ImDrawCornerFlags_Left) == ImDrawCornerFlags_Left) || ((rounding_corners & ImDrawCornerFlags_Right) == ImDrawCornerFlags_Right) ? 0.5f : 1.0f ) - 1.0f);
@@ -1009,44 +1000,46 @@ void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, int
}
}
-void ImDrawList::AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness)
+void ImDrawList::AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float thickness)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
- PathLineTo(a + ImVec2(0.5f,0.5f));
- PathLineTo(b + ImVec2(0.5f,0.5f));
+ PathLineTo(p1 + ImVec2(0.5f, 0.5f));
+ PathLineTo(p2 + ImVec2(0.5f, 0.5f));
PathStroke(col, false, thickness);
}
-// a: upper-left, b: lower-right. we don't render 1 px sized rectangles properly.
-void ImDrawList::AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding, int rounding_corners_flags, float thickness)
+// p_min = upper-left, p_max = lower-right
+// Note we don't render 1 pixels sized rectangles properly.
+void ImDrawList::AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners, float thickness)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
if (Flags & ImDrawListFlags_AntiAliasedLines)
- PathRect(a + ImVec2(0.5f,0.5f), b - ImVec2(0.50f,0.50f), rounding, rounding_corners_flags);
+ PathRect(p_min + ImVec2(0.50f,0.50f), p_max - ImVec2(0.50f,0.50f), rounding, rounding_corners);
else
- PathRect(a + ImVec2(0.5f,0.5f), b - ImVec2(0.49f,0.49f), rounding, rounding_corners_flags); // Better looking lower-right corner and rounded non-AA shapes.
+ PathRect(p_min + ImVec2(0.50f,0.50f), p_max - ImVec2(0.49f,0.49f), rounding, rounding_corners); // Better looking lower-right corner and rounded non-AA shapes.
PathStroke(col, true, thickness);
}
-void ImDrawList::AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding, int rounding_corners_flags)
+void ImDrawList::AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
if (rounding > 0.0f)
{
- PathRect(a, b, rounding, rounding_corners_flags);
+ PathRect(p_min, p_max, rounding, rounding_corners);
PathFillConvex(col);
}
else
{
PrimReserve(6, 4);
- PrimRect(a, b, col);
+ PrimRect(p_min, p_max, col);
}
}
-void ImDrawList::AddRectFilledMultiColor(const ImVec2& a, const ImVec2& c, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left)
+// p_min = upper-left, p_max = lower-right
+void ImDrawList::AddRectFilledMultiColor(const ImVec2& p_min, const ImVec2& p_max, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left)
{
if (((col_upr_left | col_upr_right | col_bot_right | col_bot_left) & IM_COL32_A_MASK) == 0)
return;
@@ -1055,85 +1048,150 @@ void ImDrawList::AddRectFilledMultiColor(const ImVec2& a, const ImVec2& c, ImU32
PrimReserve(6, 4);
PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+1)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+2));
PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+2)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+3));
- PrimWriteVtx(a, uv, col_upr_left);
- PrimWriteVtx(ImVec2(c.x, a.y), uv, col_upr_right);
- PrimWriteVtx(c, uv, col_bot_right);
- PrimWriteVtx(ImVec2(a.x, c.y), uv, col_bot_left);
+ PrimWriteVtx(p_min, uv, col_upr_left);
+ PrimWriteVtx(ImVec2(p_max.x, p_min.y), uv, col_upr_right);
+ PrimWriteVtx(p_max, uv, col_bot_right);
+ PrimWriteVtx(ImVec2(p_min.x, p_max.y), uv, col_bot_left);
}
-void ImDrawList::AddQuad(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, ImU32 col, float thickness)
+void ImDrawList::AddQuad(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
- PathLineTo(a);
- PathLineTo(b);
- PathLineTo(c);
- PathLineTo(d);
+ PathLineTo(p1);
+ PathLineTo(p2);
+ PathLineTo(p3);
+ PathLineTo(p4);
PathStroke(col, true, thickness);
}
-void ImDrawList::AddQuadFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, ImU32 col)
+void ImDrawList::AddQuadFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
- PathLineTo(a);
- PathLineTo(b);
- PathLineTo(c);
- PathLineTo(d);
+ PathLineTo(p1);
+ PathLineTo(p2);
+ PathLineTo(p3);
+ PathLineTo(p4);
PathFillConvex(col);
}
-void ImDrawList::AddTriangle(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col, float thickness)
+void ImDrawList::AddTriangle(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
- PathLineTo(a);
- PathLineTo(b);
- PathLineTo(c);
+ PathLineTo(p1);
+ PathLineTo(p2);
+ PathLineTo(p3);
PathStroke(col, true, thickness);
}
-void ImDrawList::AddTriangleFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col)
+void ImDrawList::AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
- PathLineTo(a);
- PathLineTo(b);
- PathLineTo(c);
+ PathLineTo(p1);
+ PathLineTo(p2);
+ PathLineTo(p3);
PathFillConvex(col);
}
-void ImDrawList::AddCircle(const ImVec2& centre, float radius, ImU32 col, int num_segments, float thickness)
+void ImDrawList::AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness)
{
- if ((col & IM_COL32_A_MASK) == 0)
+ if ((col & IM_COL32_A_MASK) == 0 || radius <= 0.0f)
return;
- const float a_max = IM_PI*2.0f * ((float)num_segments - 1.0f) / (float)num_segments;
- PathArcTo(centre, radius-0.5f, 0.0f, a_max, num_segments);
+ // Obtain segment count
+ if (num_segments <= 0)
+ {
+ // Automatic segment count
+ const int radius_idx = (int)radius - 1;
+ if (radius_idx < IM_ARRAYSIZE(_Data->CircleSegmentCounts))
+ num_segments = _Data->CircleSegmentCounts[radius_idx]; // Use cached value
+ else
+ num_segments = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, _Data->CircleSegmentMaxError);
+ }
+ else
+ {
+ // Explicit segment count (still clamp to avoid drawing insanely tessellated shapes)
+ num_segments = ImClamp(num_segments, 3, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX);
+ }
+
+ // Because we are filling a closed shape we remove 1 from the count of segments/points
+ const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
+ if (num_segments == 12)
+ PathArcToFast(center, radius - 0.5f, 0, 12);
+ else
+ PathArcTo(center, radius - 0.5f, 0.0f, a_max, num_segments - 1);
PathStroke(col, true, thickness);
}
-void ImDrawList::AddCircleFilled(const ImVec2& centre, float radius, ImU32 col, int num_segments)
+void ImDrawList::AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments)
{
- if ((col & IM_COL32_A_MASK) == 0)
+ if ((col & IM_COL32_A_MASK) == 0 || radius <= 0.0f)
return;
- const float a_max = IM_PI*2.0f * ((float)num_segments - 1.0f) / (float)num_segments;
- PathArcTo(centre, radius, 0.0f, a_max, num_segments);
+ // Obtain segment count
+ if (num_segments <= 0)
+ {
+ // Automatic segment count
+ const int radius_idx = (int)radius - 1;
+ if (radius_idx < IM_ARRAYSIZE(_Data->CircleSegmentCounts))
+ num_segments = _Data->CircleSegmentCounts[radius_idx]; // Use cached value
+ else
+ num_segments = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, _Data->CircleSegmentMaxError);
+ }
+ else
+ {
+ // Explicit segment count (still clamp to avoid drawing insanely tessellated shapes)
+ num_segments = ImClamp(num_segments, 3, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX);
+ }
+
+ // Because we are filling a closed shape we remove 1 from the count of segments/points
+ const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
+ if (num_segments == 12)
+ PathArcToFast(center, radius, 0, 12);
+ else
+ PathArcTo(center, radius, 0.0f, a_max, num_segments - 1);
PathFillConvex(col);
}
-void ImDrawList::AddBezierCurve(const ImVec2& pos0, const ImVec2& cp0, const ImVec2& cp1, const ImVec2& pos1, ImU32 col, float thickness, int num_segments)
+// Guaranteed to honor 'num_segments'
+void ImDrawList::AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness)
+{
+ if ((col & IM_COL32_A_MASK) == 0 || num_segments <= 2)
+ return;
+
+ // Because we are filling a closed shape we remove 1 from the count of segments/points
+ const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
+ PathArcTo(center, radius - 0.5f, 0.0f, a_max, num_segments - 1);
+ PathStroke(col, true, thickness);
+}
+
+// Guaranteed to honor 'num_segments'
+void ImDrawList::AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments)
+{
+ if ((col & IM_COL32_A_MASK) == 0 || num_segments <= 2)
+ return;
+
+ // Because we are filling a closed shape we remove 1 from the count of segments/points
+ const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments;
+ PathArcTo(center, radius, 0.0f, a_max, num_segments - 1);
+ PathFillConvex(col);
+}
+
+// Cubic Bezier takes 4 controls points
+void ImDrawList::AddBezierCurve(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
- PathLineTo(pos0);
- PathBezierCurveTo(cp0, cp1, pos1, num_segments);
+ PathLineTo(p1);
+ PathBezierCurveTo(p2, p3, p4, num_segments);
PathStroke(col, false, thickness);
}
@@ -1171,7 +1229,7 @@ void ImDrawList::AddText(const ImVec2& pos, ImU32 col, const char* text_begin, c
AddText(NULL, 0.0f, pos, col, text_begin, text_end);
}
-void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col)
+void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
@@ -1181,13 +1239,13 @@ void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& a, const Im
PushTextureID(user_texture_id);
PrimReserve(6, 4);
- PrimRectUV(a, b, uv_a, uv_b, col);
+ PrimRectUV(p_min, p_max, uv_min, uv_max, col);
if (push_texture_id)
PopTextureID();
}
-void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a, const ImVec2& uv_b, const ImVec2& uv_c, const ImVec2& uv_d, ImU32 col)
+void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& uv1, const ImVec2& uv2, const ImVec2& uv3, const ImVec2& uv4, ImU32 col)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
@@ -1197,20 +1255,20 @@ void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& a, cons
PushTextureID(user_texture_id);
PrimReserve(6, 4);
- PrimQuadUV(a, b, c, d, uv_a, uv_b, uv_c, uv_d, col);
+ PrimQuadUV(p1, p2, p3, p4, uv1, uv2, uv3, uv4, col);
if (push_texture_id)
PopTextureID();
}
-void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col, float rounding, int rounding_corners)
+void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners)
{
if ((col & IM_COL32_A_MASK) == 0)
return;
if (rounding <= 0.0f || (rounding_corners & ImDrawCornerFlags_All) == 0)
{
- AddImage(user_texture_id, a, b, uv_a, uv_b, col);
+ AddImage(user_texture_id, p_min, p_max, uv_min, uv_max, col);
return;
}
@@ -1219,15 +1277,143 @@ void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, c
PushTextureID(user_texture_id);
int vert_start_idx = VtxBuffer.Size;
- PathRect(a, b, rounding, rounding_corners);
+ PathRect(p_min, p_max, rounding, rounding_corners);
PathFillConvex(col);
int vert_end_idx = VtxBuffer.Size;
- ImGui::ShadeVertsLinearUV(this, vert_start_idx, vert_end_idx, a, b, uv_a, uv_b, true);
+ ImGui::ShadeVertsLinearUV(this, vert_start_idx, vert_end_idx, p_min, p_max, uv_min, uv_max, true);
if (push_texture_id)
PopTextureID();
}
+
+//-----------------------------------------------------------------------------
+// ImDrawListSplitter
+//-----------------------------------------------------------------------------
+// FIXME: This may be a little confusing, trying to be a little too low-level/optimal instead of just doing vector swap..
+//-----------------------------------------------------------------------------
+
+void ImDrawListSplitter::ClearFreeMemory()
+{
+ for (int i = 0; i < _Channels.Size; i++)
+ {
+ if (i == _Current)
+ memset(&_Channels[i], 0, sizeof(_Channels[i])); // Current channel is a copy of CmdBuffer/IdxBuffer, don't destruct again
+ _Channels[i]._CmdBuffer.clear();
+ _Channels[i]._IdxBuffer.clear();
+ }
+ _Current = 0;
+ _Count = 1;
+ _Channels.clear();
+}
+
+void ImDrawListSplitter::Split(ImDrawList* draw_list, int channels_count)
+{
+ IM_ASSERT(_Current == 0 && _Count <= 1 && "Nested channel splitting is not supported. Please use separate instances of ImDrawListSplitter.");
+ int old_channels_count = _Channels.Size;
+ if (old_channels_count < channels_count)
+ _Channels.resize(channels_count);
+ _Count = channels_count;
+
+ // Channels[] (24/32 bytes each) hold storage that we'll swap with draw_list->_CmdBuffer/_IdxBuffer
+ // The content of Channels[0] at this point doesn't matter. We clear it to make state tidy in a debugger but we don't strictly need to.
+ // When we switch to the next channel, we'll copy draw_list->_CmdBuffer/_IdxBuffer into Channels[0] and then Channels[1] into draw_list->CmdBuffer/_IdxBuffer
+ memset(&_Channels[0], 0, sizeof(ImDrawChannel));
+ for (int i = 1; i < channels_count; i++)
+ {
+ if (i >= old_channels_count)
+ {
+ IM_PLACEMENT_NEW(&_Channels[i]) ImDrawChannel();
+ }
+ else
+ {
+ _Channels[i]._CmdBuffer.resize(0);
+ _Channels[i]._IdxBuffer.resize(0);
+ }
+ if (_Channels[i]._CmdBuffer.Size == 0)
+ {
+ ImDrawCmd draw_cmd;
+ draw_cmd.ClipRect = draw_list->_ClipRectStack.back();
+ draw_cmd.TextureId = draw_list->_TextureIdStack.back();
+ _Channels[i]._CmdBuffer.push_back(draw_cmd);
+ }
+ }
+}
+
+static inline bool CanMergeDrawCommands(ImDrawCmd* a, ImDrawCmd* b)
+{
+ return memcmp(&a->ClipRect, &b->ClipRect, sizeof(a->ClipRect)) == 0 && a->TextureId == b->TextureId && a->VtxOffset == b->VtxOffset && !a->UserCallback && !b->UserCallback;
+}
+
+void ImDrawListSplitter::Merge(ImDrawList* draw_list)
+{
+ // Note that we never use or rely on channels.Size because it is merely a buffer that we never shrink back to 0 to keep all sub-buffers ready for use.
+ if (_Count <= 1)
+ return;
+
+ SetCurrentChannel(draw_list, 0);
+ if (draw_list->CmdBuffer.Size != 0 && draw_list->CmdBuffer.back().ElemCount == 0)
+ draw_list->CmdBuffer.pop_back();
+
+ // Calculate our final buffer sizes. Also fix the incorrect IdxOffset values in each command.
+ int new_cmd_buffer_count = 0;
+ int new_idx_buffer_count = 0;
+ ImDrawCmd* last_cmd = (_Count > 0 && draw_list->CmdBuffer.Size > 0) ? &draw_list->CmdBuffer.back() : NULL;
+ int idx_offset = last_cmd ? last_cmd->IdxOffset + last_cmd->ElemCount : 0;
+ for (int i = 1; i < _Count; i++)
+ {
+ ImDrawChannel& ch = _Channels[i];
+ if (ch._CmdBuffer.Size > 0 && ch._CmdBuffer.back().ElemCount == 0)
+ ch._CmdBuffer.pop_back();
+ if (ch._CmdBuffer.Size > 0 && last_cmd != NULL && CanMergeDrawCommands(last_cmd, &ch._CmdBuffer[0]))
+ {
+ // Merge previous channel last draw command with current channel first draw command if matching.
+ last_cmd->ElemCount += ch._CmdBuffer[0].ElemCount;
+ idx_offset += ch._CmdBuffer[0].ElemCount;
+ ch._CmdBuffer.erase(ch._CmdBuffer.Data); // FIXME-OPT: Improve for multiple merges.
+ }
+ if (ch._CmdBuffer.Size > 0)
+ last_cmd = &ch._CmdBuffer.back();
+ new_cmd_buffer_count += ch._CmdBuffer.Size;
+ new_idx_buffer_count += ch._IdxBuffer.Size;
+ for (int cmd_n = 0; cmd_n < ch._CmdBuffer.Size; cmd_n++)
+ {
+ ch._CmdBuffer.Data[cmd_n].IdxOffset = idx_offset;
+ idx_offset += ch._CmdBuffer.Data[cmd_n].ElemCount;
+ }
+ }
+ draw_list->CmdBuffer.resize(draw_list->CmdBuffer.Size + new_cmd_buffer_count);
+ draw_list->IdxBuffer.resize(draw_list->IdxBuffer.Size + new_idx_buffer_count);
+
+ // Write commands and indices in order (they are fairly small structures, we don't copy vertices only indices)
+ ImDrawCmd* cmd_write = draw_list->CmdBuffer.Data + draw_list->CmdBuffer.Size - new_cmd_buffer_count;
+ ImDrawIdx* idx_write = draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size - new_idx_buffer_count;
+ for (int i = 1; i < _Count; i++)
+ {
+ ImDrawChannel& ch = _Channels[i];
+ if (int sz = ch._CmdBuffer.Size) { memcpy(cmd_write, ch._CmdBuffer.Data, sz * sizeof(ImDrawCmd)); cmd_write += sz; }
+ if (int sz = ch._IdxBuffer.Size) { memcpy(idx_write, ch._IdxBuffer.Data, sz * sizeof(ImDrawIdx)); idx_write += sz; }
+ }
+ draw_list->_IdxWritePtr = idx_write;
+ draw_list->UpdateClipRect(); // We call this instead of AddDrawCmd(), so that empty channels won't produce an extra draw call.
+ draw_list->UpdateTextureID();
+ _Count = 1;
+}
+
+void ImDrawListSplitter::SetCurrentChannel(ImDrawList* draw_list, int idx)
+{
+ IM_ASSERT(idx >= 0 && idx < _Count);
+ if (_Current == idx)
+ return;
+ // Overwrite ImVector (12/16 bytes), four times. This is merely a silly optimization instead of doing .swap()
+ memcpy(&_Channels.Data[_Current]._CmdBuffer, &draw_list->CmdBuffer, sizeof(draw_list->CmdBuffer));
+ memcpy(&_Channels.Data[_Current]._IdxBuffer, &draw_list->IdxBuffer, sizeof(draw_list->IdxBuffer));
+ _Current = idx;
+ memcpy(&draw_list->CmdBuffer, &_Channels.Data[idx]._CmdBuffer, sizeof(draw_list->CmdBuffer));
+ memcpy(&draw_list->IdxBuffer, &_Channels.Data[idx]._IdxBuffer, sizeof(draw_list->IdxBuffer));
+ draw_list->_IdxWritePtr = draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size;
+}
+
//-----------------------------------------------------------------------------
// [SECTION] ImDrawData
//-----------------------------------------------------------------------------
@@ -1251,8 +1437,10 @@ void ImDrawData::DeIndexAllBuffers()
}
}
-// Helper to scale the ClipRect field of each ImDrawCmd. Use if your final output buffer is at a different scale than ImGui expects, or if there is a difference between your window resolution and framebuffer resolution.
-void ImDrawData::ScaleClipRects(const ImVec2& scale)
+// Helper to scale the ClipRect field of each ImDrawCmd.
+// Use if your final output buffer is at a different scale than draw_data->DisplaySize,
+// or if there is a difference between your window resolution and framebuffer resolution.
+void ImDrawData::ScaleClipRects(const ImVec2& fb_scale)
{
for (int i = 0; i < CmdListsCount; i++)
{
@@ -1260,7 +1448,7 @@ void ImDrawData::ScaleClipRects(const ImVec2& scale)
for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
{
ImDrawCmd* cmd = &cmd_list->CmdBuffer[cmd_i];
- cmd->ClipRect = ImVec4(cmd->ClipRect.x * scale.x, cmd->ClipRect.y * scale.y, cmd->ClipRect.z * scale.x, cmd->ClipRect.w * scale.y);
+ cmd->ClipRect = ImVec4(cmd->ClipRect.x * fb_scale.x, cmd->ClipRect.y * fb_scale.y, cmd->ClipRect.z * fb_scale.x, cmd->ClipRect.w * fb_scale.y);
}
}
}
@@ -1323,7 +1511,7 @@ ImFontConfig::ImFontConfig()
FontDataOwnedByAtlas = true;
FontNo = 0;
SizePixels = 0.0f;
- OversampleH = 3;
+ OversampleH = 3; // FIXME: 2 may be a better default?
OversampleV = 1;
PixelSnapH = false;
GlyphExtraSpacing = ImVec2(0.0f, 0.0f);
@@ -1334,6 +1522,7 @@ ImFontConfig::ImFontConfig()
MergeMode = false;
RasterizerFlags = 0x00;
RasterizerMultiply = 1.0f;
+ EllipsisChar = (ImWchar)-1;
memset(Name, 0, sizeof(Name));
DstFont = NULL;
}
@@ -1343,7 +1532,7 @@ ImFontConfig::ImFontConfig()
//-----------------------------------------------------------------------------
// A work of art lies ahead! (. = white layer, X = black layer, others are blank)
-// The white texels on the top left are the ones we'll use everywhere in ImGui to render filled shapes.
+// The white texels on the top left are the ones we'll use everywhere in Dear ImGui to render filled shapes.
const int FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF = 108;
const int FONT_ATLAS_DEFAULT_TEX_DATA_H = 27;
const unsigned int FONT_ATLAS_DEFAULT_TEX_DATA_ID = 0x80000000;
@@ -1420,7 +1609,7 @@ void ImFontAtlas::ClearInputData()
for (int i = 0; i < ConfigData.Size; i++)
if (ConfigData[i].FontData && ConfigData[i].FontDataOwnedByAtlas)
{
- ImGui::MemFree(ConfigData[i].FontData);
+ IM_FREE(ConfigData[i].FontData);
ConfigData[i].FontData = NULL;
}
@@ -1441,9 +1630,9 @@ void ImFontAtlas::ClearTexData()
{
IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
if (TexPixelsAlpha8)
- ImGui::MemFree(TexPixelsAlpha8);
+ IM_FREE(TexPixelsAlpha8);
if (TexPixelsRGBA32)
- ImGui::MemFree(TexPixelsRGBA32);
+ IM_FREE(TexPixelsRGBA32);
TexPixelsAlpha8 = NULL;
TexPixelsRGBA32 = NULL;
}
@@ -1489,7 +1678,7 @@ void ImFontAtlas::GetTexDataAsRGBA32(unsigned char** out_pixels, int* out_wid
GetTexDataAsAlpha8(&pixels, NULL, NULL);
if (pixels)
{
- TexPixelsRGBA32 = (unsigned int*)ImGui::MemAlloc((size_t)(TexWidth * TexHeight * 4));
+ TexPixelsRGBA32 = (unsigned int*)IM_ALLOC((size_t)TexWidth * (size_t)TexHeight * 4);
const unsigned char* src = pixels;
unsigned int* dst = TexPixelsRGBA32;
for (int n = TexWidth * TexHeight; n > 0; n--)
@@ -1513,19 +1702,22 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)
if (!font_cfg->MergeMode)
Fonts.push_back(IM_NEW(ImFont));
else
- IM_ASSERT(!Fonts.empty()); // When using MergeMode make sure that a font has already been added before. You can use ImGui::GetIO().Fonts->AddFontDefault() to add the default imgui font.
+ IM_ASSERT(!Fonts.empty() && "Cannot use MergeMode for the first font"); // When using MergeMode make sure that a font has already been added before. You can use ImGui::GetIO().Fonts->AddFontDefault() to add the default imgui font.
ConfigData.push_back(*font_cfg);
ImFontConfig& new_font_cfg = ConfigData.back();
- if (!new_font_cfg.DstFont)
+ if (new_font_cfg.DstFont == NULL)
new_font_cfg.DstFont = Fonts.back();
if (!new_font_cfg.FontDataOwnedByAtlas)
{
- new_font_cfg.FontData = ImGui::MemAlloc(new_font_cfg.FontDataSize);
+ new_font_cfg.FontData = IM_ALLOC(new_font_cfg.FontDataSize);
new_font_cfg.FontDataOwnedByAtlas = true;
memcpy(new_font_cfg.FontData, font_cfg->FontData, (size_t)new_font_cfg.FontDataSize);
}
+ if (new_font_cfg.DstFont->EllipsisChar == (ImWchar)-1)
+ new_font_cfg.DstFont->EllipsisChar = font_cfg->EllipsisChar;
+
// Invalidate texture
ClearTexData();
return new_font_cfg.DstFont;
@@ -1556,8 +1748,11 @@ ImFont* ImFontAtlas::AddFontDefault(const ImFontConfig* font_cfg_template)
font_cfg.OversampleH = font_cfg.OversampleV = 1;
font_cfg.PixelSnapH = true;
}
- if (font_cfg.Name[0] == '\0') strcpy(font_cfg.Name, "ProggyClean.ttf, 13px");
- if (font_cfg.SizePixels <= 0.0f) font_cfg.SizePixels = 13.0f;
+ if (font_cfg.SizePixels <= 0.0f)
+ font_cfg.SizePixels = 13.0f * 1.0f;
+ if (font_cfg.Name[0] == '\0')
+ ImFormatString(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "ProggyClean.ttf, %dpx", (int)font_cfg.SizePixels);
+ font_cfg.EllipsisChar = (ImWchar)0x0085;
const char* ttf_compressed_base85 = GetDefaultCompressedFontDataTTFBase85();
const ImWchar* glyph_ranges = font_cfg.GlyphRanges != NULL ? font_cfg.GlyphRanges : GetGlyphRangesDefault();
@@ -1573,7 +1768,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels,
void* data = ImFileLoadToMemory(filename, "rb", &data_size, 0);
if (!data)
{
- IM_ASSERT(0); // Could not load file.
+ IM_ASSERT_USER_ERROR(0, "Could not load font file!");
return NULL;
}
ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();
@@ -1604,7 +1799,7 @@ ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* ttf_data, int ttf_size, float si
ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges)
{
const unsigned int buf_decompressed_size = stb_decompress_length((const unsigned char*)compressed_ttf_data);
- unsigned char* buf_decompressed_data = (unsigned char *)ImGui::MemAlloc(buf_decompressed_size);
+ unsigned char* buf_decompressed_data = (unsigned char *)IM_ALLOC(buf_decompressed_size);
stb_decompress(buf_decompressed_data, (const unsigned char*)compressed_ttf_data, (unsigned int)compressed_ttf_size);
ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();
@@ -1616,19 +1811,20 @@ ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* compressed_ttf_d
ImFont* ImFontAtlas::AddFontFromMemoryCompressedBase85TTF(const char* compressed_ttf_data_base85, float size_pixels, const ImFontConfig* font_cfg, const ImWchar* glyph_ranges)
{
int compressed_ttf_size = (((int)strlen(compressed_ttf_data_base85) + 4) / 5) * 4;
- void* compressed_ttf = ImGui::MemAlloc((size_t)compressed_ttf_size);
+ void* compressed_ttf = IM_ALLOC((size_t)compressed_ttf_size);
Decode85((const unsigned char*)compressed_ttf_data_base85, (unsigned char*)compressed_ttf);
ImFont* font = AddFontFromMemoryCompressedTTF(compressed_ttf, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges);
- ImGui::MemFree(compressed_ttf);
+ IM_FREE(compressed_ttf);
return font;
}
int ImFontAtlas::AddCustomRectRegular(unsigned int id, int width, int height)
{
- IM_ASSERT(id >= 0x10000);
+ // Breaking change on 2019/11/21 (1.74): ImFontAtlas::AddCustomRectRegular() now requires an ID >= 0x110000 (instead of >= 0x10000)
+ IM_ASSERT(id >= 0x110000);
IM_ASSERT(width > 0 && width <= 0xFFFF);
IM_ASSERT(height > 0 && height <= 0xFFFF);
- CustomRect r;
+ ImFontAtlasCustomRect r;
r.ID = id;
r.Width = (unsigned short)width;
r.Height = (unsigned short)height;
@@ -1641,7 +1837,7 @@ int ImFontAtlas::AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int
IM_ASSERT(font != NULL);
IM_ASSERT(width > 0 && width <= 0xFFFF);
IM_ASSERT(height > 0 && height <= 0xFFFF);
- CustomRect r;
+ ImFontAtlasCustomRect r;
r.ID = id;
r.Width = (unsigned short)width;
r.Height = (unsigned short)height;
@@ -1652,7 +1848,7 @@ int ImFontAtlas::AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int
return CustomRects.Size - 1; // Return index
}
-void ImFontAtlas::CalcCustomRectUV(const CustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max)
+void ImFontAtlas::CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const
{
IM_ASSERT(TexWidth > 0 && TexHeight > 0); // Font atlas needs to be built before we can calculate UV coordinates
IM_ASSERT(rect->IsPacked()); // Make sure the rectangle has been packed
@@ -1668,7 +1864,7 @@ bool ImFontAtlas::GetMouseCursorTexData(ImGuiMouseCursor cursor_type, ImVec2* ou
return false;
IM_ASSERT(CustomRectIds[0] != -1);
- ImFontAtlas::CustomRect& r = CustomRects[CustomRectIds[0]];
+ ImFontAtlasCustomRect& r = CustomRects[CustomRectIds[0]];
IM_ASSERT(r.ID == FONT_ATLAS_DEFAULT_TEX_DATA_ID);
ImVec2 pos = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][0] + ImVec2((float)r.X, (float)r.Y);
ImVec2 size = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][1];
@@ -1705,222 +1901,296 @@ void ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsig
data[i] = table[data[i]];
}
+// Temporary data for one source font (multiple source fonts can be merged into one destination ImFont)
+// (C++03 doesn't allow instancing ImVector<> with function-local types so we declare the type here.)
+struct ImFontBuildSrcData
+{
+ stbtt_fontinfo FontInfo;
+ stbtt_pack_range PackRange; // Hold the list of codepoints to pack (essentially points to Codepoints.Data)
+ stbrp_rect* Rects; // Rectangle to pack. We first fill in their size and the packer will give us their position.
+ stbtt_packedchar* PackedChars; // Output glyphs
+ const ImWchar* SrcRanges; // Ranges as requested by user (user is allowed to request too much, e.g. 0x0020..0xFFFF)
+ int DstIndex; // Index into atlas->Fonts[] and dst_tmp_array[]
+ int GlyphsHighest; // Highest requested codepoint
+ int GlyphsCount; // Glyph count (excluding missing glyphs and glyphs already set by an earlier source font)
+ ImBoolVector GlyphsSet; // Glyph bit map (random access, 1-bit per codepoint. This will be a maximum of 8KB)
+ ImVector GlyphsList; // Glyph codepoints list (flattened version of GlyphsMap)
+};
+
+// Temporary data for one destination ImFont* (multiple source fonts can be merged into one destination ImFont)
+struct ImFontBuildDstData
+{
+ int SrcCount; // Number of source fonts targeting this destination font.
+ int GlyphsHighest;
+ int GlyphsCount;
+ ImBoolVector GlyphsSet; // This is used to resolve collision when multiple sources are merged into a same destination font.
+};
+
+static void UnpackBoolVectorToFlatIndexList(const ImBoolVector* in, ImVector* out)
+{
+ IM_ASSERT(sizeof(in->Storage.Data[0]) == sizeof(int));
+ const int* it_begin = in->Storage.begin();
+ const int* it_end = in->Storage.end();
+ for (const int* it = it_begin; it < it_end; it++)
+ if (int entries_32 = *it)
+ for (int bit_n = 0; bit_n < 32; bit_n++)
+ if (entries_32 & (1u << bit_n))
+ out->push_back((int)((it - it_begin) << 5) + bit_n);
+}
+
bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
{
IM_ASSERT(atlas->ConfigData.Size > 0);
ImFontAtlasBuildRegisterDefaultCustomRects(atlas);
+ // Clear atlas
atlas->TexID = (ImTextureID)NULL;
atlas->TexWidth = atlas->TexHeight = 0;
atlas->TexUvScale = ImVec2(0.0f, 0.0f);
atlas->TexUvWhitePixel = ImVec2(0.0f, 0.0f);
atlas->ClearTexData();
- // Count glyphs/ranges
- int total_glyphs_count = 0;
- int total_ranges_count = 0;
- for (int input_i = 0; input_i < atlas->ConfigData.Size; input_i++)
+ // Temporary storage for building
+ ImVector src_tmp_array;
+ ImVector dst_tmp_array;
+ src_tmp_array.resize(atlas->ConfigData.Size);
+ dst_tmp_array.resize(atlas->Fonts.Size);
+ memset(src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes());
+ memset(dst_tmp_array.Data, 0, (size_t)dst_tmp_array.size_in_bytes());
+
+ // 1. Initialize font loading structure, check font data validity
+ for (int src_i = 0; src_i < atlas->ConfigData.Size; src_i++)
{
- ImFontConfig& cfg = atlas->ConfigData[input_i];
- if (!cfg.GlyphRanges)
- cfg.GlyphRanges = atlas->GetGlyphRangesDefault();
- for (const ImWchar* in_range = cfg.GlyphRanges; in_range[0] && in_range[1]; in_range += 2, total_ranges_count++)
- total_glyphs_count += (in_range[1] - in_range[0]) + 1;
- }
-
- // We need a width for the skyline algorithm. Using a dumb heuristic here to decide of width. User can override TexDesiredWidth and TexGlyphPadding if they wish.
- // Width doesn't really matter much, but some API/GPU have texture size limitations and increasing width can decrease height.
- atlas->TexWidth = (atlas->TexDesiredWidth > 0) ? atlas->TexDesiredWidth : (total_glyphs_count > 4000) ? 4096 : (total_glyphs_count > 2000) ? 2048 : (total_glyphs_count > 1000) ? 1024 : 512;
- atlas->TexHeight = 0;
-
- // Start packing
- const int max_tex_height = 1024*32;
- stbtt_pack_context spc = {};
- if (!stbtt_PackBegin(&spc, NULL, atlas->TexWidth, max_tex_height, 0, atlas->TexGlyphPadding, NULL))
- return false;
- stbtt_PackSetOversampling(&spc, 1, 1);
-
- // Pack our extra data rectangles first, so it will be on the upper-left corner of our texture (UV will have small values).
- ImFontAtlasBuildPackCustomRects(atlas, spc.pack_info);
-
- // Initialize font information (so we can error without any cleanup)
- struct ImFontTempBuildData
- {
- stbtt_fontinfo FontInfo;
- stbrp_rect* Rects;
- int RectsCount;
- stbtt_pack_range* Ranges;
- int RangesCount;
- };
- ImFontTempBuildData* tmp_array = (ImFontTempBuildData*)ImGui::MemAlloc((size_t)atlas->ConfigData.Size * sizeof(ImFontTempBuildData));
- for (int input_i = 0; input_i < atlas->ConfigData.Size; input_i++)
- {
- ImFontConfig& cfg = atlas->ConfigData[input_i];
- ImFontTempBuildData& tmp = tmp_array[input_i];
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ ImFontConfig& cfg = atlas->ConfigData[src_i];
IM_ASSERT(cfg.DstFont && (!cfg.DstFont->IsLoaded() || cfg.DstFont->ContainerAtlas == atlas));
+ // Find index from cfg.DstFont (we allow the user to set cfg.DstFont. Also it makes casual debugging nicer than when storing indices)
+ src_tmp.DstIndex = -1;
+ for (int output_i = 0; output_i < atlas->Fonts.Size && src_tmp.DstIndex == -1; output_i++)
+ if (cfg.DstFont == atlas->Fonts[output_i])
+ src_tmp.DstIndex = output_i;
+ IM_ASSERT(src_tmp.DstIndex != -1); // cfg.DstFont not pointing within atlas->Fonts[] array?
+ if (src_tmp.DstIndex == -1)
+ return false;
+
+ // Initialize helper structure for font loading and verify that the TTF/OTF data is correct
const int font_offset = stbtt_GetFontOffsetForIndex((unsigned char*)cfg.FontData, cfg.FontNo);
IM_ASSERT(font_offset >= 0 && "FontData is incorrect, or FontNo cannot be found.");
- if (!stbtt_InitFont(&tmp.FontInfo, (unsigned char*)cfg.FontData, font_offset))
- {
- atlas->TexWidth = atlas->TexHeight = 0; // Reset output on failure
- ImGui::MemFree(tmp_array);
+ if (!stbtt_InitFont(&src_tmp.FontInfo, (unsigned char*)cfg.FontData, font_offset))
return false;
- }
+
+ // Measure highest codepoints
+ ImFontBuildDstData& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
+ src_tmp.SrcRanges = cfg.GlyphRanges ? cfg.GlyphRanges : atlas->GetGlyphRangesDefault();
+ for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
+ src_tmp.GlyphsHighest = ImMax(src_tmp.GlyphsHighest, (int)src_range[1]);
+ dst_tmp.SrcCount++;
+ dst_tmp.GlyphsHighest = ImMax(dst_tmp.GlyphsHighest, src_tmp.GlyphsHighest);
}
+ // 2. For every requested codepoint, check for their presence in the font data, and handle redundancy or overlaps between source fonts to avoid unused glyphs.
+ int total_glyphs_count = 0;
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+ {
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ ImFontBuildDstData& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
+ src_tmp.GlyphsSet.Resize(src_tmp.GlyphsHighest + 1);
+ if (dst_tmp.GlyphsSet.Storage.empty())
+ dst_tmp.GlyphsSet.Resize(dst_tmp.GlyphsHighest + 1);
+
+ for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
+ for (unsigned int codepoint = src_range[0]; codepoint <= src_range[1]; codepoint++)
+ {
+ if (dst_tmp.GlyphsSet.GetBit(codepoint)) // Don't overwrite existing glyphs. We could make this an option for MergeMode (e.g. MergeOverwrite==true)
+ continue;
+ if (!stbtt_FindGlyphIndex(&src_tmp.FontInfo, codepoint)) // It is actually in the font?
+ continue;
+
+ // Add to avail set/counters
+ src_tmp.GlyphsCount++;
+ dst_tmp.GlyphsCount++;
+ src_tmp.GlyphsSet.SetBit(codepoint, true);
+ dst_tmp.GlyphsSet.SetBit(codepoint, true);
+ total_glyphs_count++;
+ }
+ }
+
+ // 3. Unpack our bit map into a flat list (we now have all the Unicode points that we know are requested _and_ available _and_ not overlapping another)
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+ {
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ src_tmp.GlyphsList.reserve(src_tmp.GlyphsCount);
+ UnpackBoolVectorToFlatIndexList(&src_tmp.GlyphsSet, &src_tmp.GlyphsList);
+ src_tmp.GlyphsSet.Clear();
+ IM_ASSERT(src_tmp.GlyphsList.Size == src_tmp.GlyphsCount);
+ }
+ for (int dst_i = 0; dst_i < dst_tmp_array.Size; dst_i++)
+ dst_tmp_array[dst_i].GlyphsSet.Clear();
+ dst_tmp_array.clear();
+
// Allocate packing character data and flag packed characters buffer as non-packed (x0=y0=x1=y1=0)
- int buf_packedchars_n = 0, buf_rects_n = 0, buf_ranges_n = 0;
- stbtt_packedchar* buf_packedchars = (stbtt_packedchar*)ImGui::MemAlloc(total_glyphs_count * sizeof(stbtt_packedchar));
- stbrp_rect* buf_rects = (stbrp_rect*)ImGui::MemAlloc(total_glyphs_count * sizeof(stbrp_rect));
- stbtt_pack_range* buf_ranges = (stbtt_pack_range*)ImGui::MemAlloc(total_ranges_count * sizeof(stbtt_pack_range));
- memset(buf_packedchars, 0, total_glyphs_count * sizeof(stbtt_packedchar));
- memset(buf_rects, 0, total_glyphs_count * sizeof(stbrp_rect)); // Unnecessary but let's clear this for the sake of sanity.
- memset(buf_ranges, 0, total_ranges_count * sizeof(stbtt_pack_range));
+ // (We technically don't need to zero-clear buf_rects, but let's do it for the sake of sanity)
+ ImVector buf_rects;
+ ImVector buf_packedchars;
+ buf_rects.resize(total_glyphs_count);
+ buf_packedchars.resize(total_glyphs_count);
+ memset(buf_rects.Data, 0, (size_t)buf_rects.size_in_bytes());
+ memset(buf_packedchars.Data, 0, (size_t)buf_packedchars.size_in_bytes());
- // First font pass: pack all glyphs (no rendering at this point, we are working with rectangles in an infinitely tall texture at this point)
- for (int input_i = 0; input_i < atlas->ConfigData.Size; input_i++)
+ // 4. Gather glyphs sizes so we can pack them in our virtual canvas.
+ int total_surface = 0;
+ int buf_rects_out_n = 0;
+ int buf_packedchars_out_n = 0;
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
{
- ImFontConfig& cfg = atlas->ConfigData[input_i];
- ImFontTempBuildData& tmp = tmp_array[input_i];
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ if (src_tmp.GlyphsCount == 0)
+ continue;
- // Setup ranges
- int font_glyphs_count = 0;
- int font_ranges_count = 0;
- for (const ImWchar* in_range = cfg.GlyphRanges; in_range[0] && in_range[1]; in_range += 2, font_ranges_count++)
- font_glyphs_count += (in_range[1] - in_range[0]) + 1;
- tmp.Ranges = buf_ranges + buf_ranges_n;
- tmp.RangesCount = font_ranges_count;
- buf_ranges_n += font_ranges_count;
- for (int i = 0; i < font_ranges_count; i++)
+ src_tmp.Rects = &buf_rects[buf_rects_out_n];
+ src_tmp.PackedChars = &buf_packedchars[buf_packedchars_out_n];
+ buf_rects_out_n += src_tmp.GlyphsCount;
+ buf_packedchars_out_n += src_tmp.GlyphsCount;
+
+ // Convert our ranges in the format stb_truetype wants
+ ImFontConfig& cfg = atlas->ConfigData[src_i];
+ src_tmp.PackRange.font_size = cfg.SizePixels;
+ src_tmp.PackRange.first_unicode_codepoint_in_range = 0;
+ src_tmp.PackRange.array_of_unicode_codepoints = src_tmp.GlyphsList.Data;
+ src_tmp.PackRange.num_chars = src_tmp.GlyphsList.Size;
+ src_tmp.PackRange.chardata_for_range = src_tmp.PackedChars;
+ src_tmp.PackRange.h_oversample = (unsigned char)cfg.OversampleH;
+ src_tmp.PackRange.v_oversample = (unsigned char)cfg.OversampleV;
+
+ // Gather the sizes of all rectangles we will need to pack (this loop is based on stbtt_PackFontRangesGatherRects)
+ const float scale = (cfg.SizePixels > 0) ? stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, cfg.SizePixels) : stbtt_ScaleForMappingEmToPixels(&src_tmp.FontInfo, -cfg.SizePixels);
+ const int padding = atlas->TexGlyphPadding;
+ for (int glyph_i = 0; glyph_i < src_tmp.GlyphsList.Size; glyph_i++)
{
- const ImWchar* in_range = &cfg.GlyphRanges[i * 2];
- stbtt_pack_range& range = tmp.Ranges[i];
- range.font_size = cfg.SizePixels;
- range.first_unicode_codepoint_in_range = in_range[0];
- range.num_chars = (in_range[1] - in_range[0]) + 1;
- range.chardata_for_range = buf_packedchars + buf_packedchars_n;
- buf_packedchars_n += range.num_chars;
- }
-
- // Gather the sizes of all rectangle we need
- tmp.Rects = buf_rects + buf_rects_n;
- tmp.RectsCount = font_glyphs_count;
- buf_rects_n += font_glyphs_count;
- stbtt_PackSetOversampling(&spc, cfg.OversampleH, cfg.OversampleV);
- int n = stbtt_PackFontRangesGatherRects(&spc, &tmp.FontInfo, tmp.Ranges, tmp.RangesCount, tmp.Rects);
- IM_ASSERT(n == font_glyphs_count);
-
- // Detect missing glyphs and replace them with a zero-sized box instead of relying on the default glyphs
- // This allows us merging overlapping icon fonts more easily.
- int rect_i = 0;
- for (int range_i = 0; range_i < tmp.RangesCount; range_i++)
- for (int char_i = 0; char_i < tmp.Ranges[range_i].num_chars; char_i++, rect_i++)
- if (stbtt_FindGlyphIndex(&tmp.FontInfo, tmp.Ranges[range_i].first_unicode_codepoint_in_range + char_i) == 0)
- tmp.Rects[rect_i].w = tmp.Rects[rect_i].h = 0;
-
- // Pack
- stbrp_pack_rects((stbrp_context*)spc.pack_info, tmp.Rects, n);
-
- // Extend texture height
- // Also mark missing glyphs as non-packed so we don't attempt to render into them
- for (int i = 0; i < n; i++)
- {
- if (tmp.Rects[i].w == 0 && tmp.Rects[i].h == 0)
- tmp.Rects[i].was_packed = 0;
- if (tmp.Rects[i].was_packed)
- atlas->TexHeight = ImMax(atlas->TexHeight, tmp.Rects[i].y + tmp.Rects[i].h);
+ int x0, y0, x1, y1;
+ const int glyph_index_in_font = stbtt_FindGlyphIndex(&src_tmp.FontInfo, src_tmp.GlyphsList[glyph_i]);
+ IM_ASSERT(glyph_index_in_font != 0);
+ stbtt_GetGlyphBitmapBoxSubpixel(&src_tmp.FontInfo, glyph_index_in_font, scale * cfg.OversampleH, scale * cfg.OversampleV, 0, 0, &x0, &y0, &x1, &y1);
+ src_tmp.Rects[glyph_i].w = (stbrp_coord)(x1 - x0 + padding + cfg.OversampleH - 1);
+ src_tmp.Rects[glyph_i].h = (stbrp_coord)(y1 - y0 + padding + cfg.OversampleV - 1);
+ total_surface += src_tmp.Rects[glyph_i].w * src_tmp.Rects[glyph_i].h;
}
}
- IM_ASSERT(buf_rects_n == total_glyphs_count);
- IM_ASSERT(buf_packedchars_n == total_glyphs_count);
- IM_ASSERT(buf_ranges_n == total_ranges_count);
- // Create texture
+ // We need a width for the skyline algorithm, any width!
+ // The exact width doesn't really matter much, but some API/GPU have texture size limitations and increasing width can decrease height.
+ // User can override TexDesiredWidth and TexGlyphPadding if they wish, otherwise we use a simple heuristic to select the width based on expected surface.
+ const int surface_sqrt = (int)ImSqrt((float)total_surface) + 1;
+ atlas->TexHeight = 0;
+ if (atlas->TexDesiredWidth > 0)
+ atlas->TexWidth = atlas->TexDesiredWidth;
+ else
+ atlas->TexWidth = (surface_sqrt >= 4096*0.7f) ? 4096 : (surface_sqrt >= 2048*0.7f) ? 2048 : (surface_sqrt >= 1024*0.7f) ? 1024 : 512;
+
+ // 5. Start packing
+ // Pack our extra data rectangles first, so it will be on the upper-left corner of our texture (UV will have small values).
+ const int TEX_HEIGHT_MAX = 1024 * 32;
+ stbtt_pack_context spc = {};
+ stbtt_PackBegin(&spc, NULL, atlas->TexWidth, TEX_HEIGHT_MAX, 0, atlas->TexGlyphPadding, NULL);
+ ImFontAtlasBuildPackCustomRects(atlas, spc.pack_info);
+
+ // 6. Pack each source font. No rendering yet, we are working with rectangles in an infinitely tall texture at this point.
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+ {
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ if (src_tmp.GlyphsCount == 0)
+ continue;
+
+ stbrp_pack_rects((stbrp_context*)spc.pack_info, src_tmp.Rects, src_tmp.GlyphsCount);
+
+ // Extend texture height and mark missing glyphs as non-packed so we won't render them.
+ // FIXME: We are not handling packing failure here (would happen if we got off TEX_HEIGHT_MAX or if a single if larger than TexWidth?)
+ for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
+ if (src_tmp.Rects[glyph_i].was_packed)
+ atlas->TexHeight = ImMax(atlas->TexHeight, src_tmp.Rects[glyph_i].y + src_tmp.Rects[glyph_i].h);
+ }
+
+ // 7. Allocate texture
atlas->TexHeight = (atlas->Flags & ImFontAtlasFlags_NoPowerOfTwoHeight) ? (atlas->TexHeight + 1) : ImUpperPowerOfTwo(atlas->TexHeight);
atlas->TexUvScale = ImVec2(1.0f / atlas->TexWidth, 1.0f / atlas->TexHeight);
- atlas->TexPixelsAlpha8 = (unsigned char*)ImGui::MemAlloc(atlas->TexWidth * atlas->TexHeight);
+ atlas->TexPixelsAlpha8 = (unsigned char*)IM_ALLOC(atlas->TexWidth * atlas->TexHeight);
memset(atlas->TexPixelsAlpha8, 0, atlas->TexWidth * atlas->TexHeight);
spc.pixels = atlas->TexPixelsAlpha8;
spc.height = atlas->TexHeight;
- // Second pass: render font characters
- for (int input_i = 0; input_i < atlas->ConfigData.Size; input_i++)
+ // 8. Render/rasterize font characters into the texture
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
{
- ImFontConfig& cfg = atlas->ConfigData[input_i];
- ImFontTempBuildData& tmp = tmp_array[input_i];
- stbtt_PackSetOversampling(&spc, cfg.OversampleH, cfg.OversampleV);
- stbtt_PackFontRangesRenderIntoRects(&spc, &tmp.FontInfo, tmp.Ranges, tmp.RangesCount, tmp.Rects);
+ ImFontConfig& cfg = atlas->ConfigData[src_i];
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ if (src_tmp.GlyphsCount == 0)
+ continue;
+
+ stbtt_PackFontRangesRenderIntoRects(&spc, &src_tmp.FontInfo, &src_tmp.PackRange, 1, src_tmp.Rects);
+
+ // Apply multiply operator
if (cfg.RasterizerMultiply != 1.0f)
{
unsigned char multiply_table[256];
ImFontAtlasBuildMultiplyCalcLookupTable(multiply_table, cfg.RasterizerMultiply);
- for (const stbrp_rect* r = tmp.Rects; r != tmp.Rects + tmp.RectsCount; r++)
+ stbrp_rect* r = &src_tmp.Rects[0];
+ for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++, r++)
if (r->was_packed)
- ImFontAtlasBuildMultiplyRectAlpha8(multiply_table, spc.pixels, r->x, r->y, r->w, r->h, spc.stride_in_bytes);
+ ImFontAtlasBuildMultiplyRectAlpha8(multiply_table, atlas->TexPixelsAlpha8, r->x, r->y, r->w, r->h, atlas->TexWidth * 1);
}
- tmp.Rects = NULL;
+ src_tmp.Rects = NULL;
}
// End packing
stbtt_PackEnd(&spc);
- ImGui::MemFree(buf_rects);
- buf_rects = NULL;
+ buf_rects.clear();
- // Third pass: setup ImFont and glyphs for runtime
- for (int input_i = 0; input_i < atlas->ConfigData.Size; input_i++)
+ // 9. Setup ImFont and glyphs for runtime
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
{
- ImFontConfig& cfg = atlas->ConfigData[input_i];
- ImFontTempBuildData& tmp = tmp_array[input_i];
- ImFont* dst_font = cfg.DstFont; // We can have multiple input fonts writing into a same destination font (when using MergeMode=true)
- if (cfg.MergeMode)
- dst_font->BuildLookupTable();
+ ImFontBuildSrcData& src_tmp = src_tmp_array[src_i];
+ if (src_tmp.GlyphsCount == 0)
+ continue;
- const float font_scale = stbtt_ScaleForPixelHeight(&tmp.FontInfo, cfg.SizePixels);
+ ImFontConfig& cfg = atlas->ConfigData[src_i];
+ ImFont* dst_font = cfg.DstFont; // We can have multiple input fonts writing into a same destination font (when using MergeMode=true)
+
+ const float font_scale = stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, cfg.SizePixels);
int unscaled_ascent, unscaled_descent, unscaled_line_gap;
- stbtt_GetFontVMetrics(&tmp.FontInfo, &unscaled_ascent, &unscaled_descent, &unscaled_line_gap);
+ stbtt_GetFontVMetrics(&src_tmp.FontInfo, &unscaled_ascent, &unscaled_descent, &unscaled_line_gap);
const float ascent = ImFloor(unscaled_ascent * font_scale + ((unscaled_ascent > 0.0f) ? +1 : -1));
const float descent = ImFloor(unscaled_descent * font_scale + ((unscaled_descent > 0.0f) ? +1 : -1));
ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent);
const float font_off_x = cfg.GlyphOffset.x;
- const float font_off_y = cfg.GlyphOffset.y + (float)(int)(dst_font->Ascent + 0.5f);
+ const float font_off_y = cfg.GlyphOffset.y + IM_ROUND(dst_font->Ascent);
- for (int i = 0; i < tmp.RangesCount; i++)
+ for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
{
- stbtt_pack_range& range = tmp.Ranges[i];
- for (int char_idx = 0; char_idx < range.num_chars; char_idx += 1)
- {
- const stbtt_packedchar& pc = range.chardata_for_range[char_idx];
- if (!pc.x0 && !pc.x1 && !pc.y0 && !pc.y1)
- continue;
+ const int codepoint = src_tmp.GlyphsList[glyph_i];
+ const stbtt_packedchar& pc = src_tmp.PackedChars[glyph_i];
- const int codepoint = range.first_unicode_codepoint_in_range + char_idx;
- if (cfg.MergeMode && dst_font->FindGlyphNoFallback((ImWchar)codepoint))
- continue;
+ const float char_advance_x_org = pc.xadvance;
+ const float char_advance_x_mod = ImClamp(char_advance_x_org, cfg.GlyphMinAdvanceX, cfg.GlyphMaxAdvanceX);
+ float char_off_x = font_off_x;
+ if (char_advance_x_org != char_advance_x_mod)
+ char_off_x += cfg.PixelSnapH ? ImFloor((char_advance_x_mod - char_advance_x_org) * 0.5f) : (char_advance_x_mod - char_advance_x_org) * 0.5f;
- float char_advance_x_org = pc.xadvance;
- float char_advance_x_mod = ImClamp(char_advance_x_org, cfg.GlyphMinAdvanceX, cfg.GlyphMaxAdvanceX);
- float char_off_x = font_off_x;
- if (char_advance_x_org != char_advance_x_mod)
- char_off_x += cfg.PixelSnapH ? (float)(int)((char_advance_x_mod - char_advance_x_org) * 0.5f) : (char_advance_x_mod - char_advance_x_org) * 0.5f;
-
- stbtt_aligned_quad q;
- float dummy_x = 0.0f, dummy_y = 0.0f;
- stbtt_GetPackedQuad(range.chardata_for_range, atlas->TexWidth, atlas->TexHeight, char_idx, &dummy_x, &dummy_y, &q, 0);
- dst_font->AddGlyph((ImWchar)codepoint, q.x0 + char_off_x, q.y0 + font_off_y, q.x1 + char_off_x, q.y1 + font_off_y, q.s0, q.t0, q.s1, q.t1, char_advance_x_mod);
- }
+ // Register glyph
+ stbtt_aligned_quad q;
+ float dummy_x = 0.0f, dummy_y = 0.0f;
+ stbtt_GetPackedQuad(src_tmp.PackedChars, atlas->TexWidth, atlas->TexHeight, glyph_i, &dummy_x, &dummy_y, &q, 0);
+ dst_font->AddGlyph((ImWchar)codepoint, q.x0 + char_off_x, q.y0 + font_off_y, q.x1 + char_off_x, q.y1 + font_off_y, q.s0, q.t0, q.s1, q.t1, char_advance_x_mod);
}
}
- // Cleanup temporaries
- ImGui::MemFree(buf_packedchars);
- ImGui::MemFree(buf_ranges);
- ImGui::MemFree(tmp_array);
+ // Cleanup temporary (ImVector doesn't honor destructor)
+ for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
+ src_tmp_array[src_i].~ImFontBuildSrcData();
ImFontAtlasBuildFinish(atlas);
-
return true;
}
@@ -1948,16 +2218,17 @@ void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* f
font->ConfigDataCount++;
}
-void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* pack_context_opaque)
+void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque)
{
- stbrp_context* pack_context = (stbrp_context*)pack_context_opaque;
+ stbrp_context* pack_context = (stbrp_context*)stbrp_context_opaque;
+ IM_ASSERT(pack_context != NULL);
- ImVector& user_rects = atlas->CustomRects;
+ ImVector& user_rects = atlas->CustomRects;
IM_ASSERT(user_rects.Size >= 1); // We expect at least the default custom rects to be registered, else something went wrong.
ImVector pack_rects;
pack_rects.resize(user_rects.Size);
- memset(pack_rects.Data, 0, sizeof(stbrp_rect) * user_rects.Size);
+ memset(pack_rects.Data, 0, (size_t)pack_rects.size_in_bytes());
for (int i = 0; i < user_rects.Size; i++)
{
pack_rects[i].w = user_rects[i].Width;
@@ -1978,7 +2249,7 @@ static void ImFontAtlasBuildRenderDefaultTexData(ImFontAtlas* atlas)
{
IM_ASSERT(atlas->CustomRectIds[0] >= 0);
IM_ASSERT(atlas->TexPixelsAlpha8 != NULL);
- ImFontAtlas::CustomRect& r = atlas->CustomRects[atlas->CustomRectIds[0]];
+ ImFontAtlasCustomRect& r = atlas->CustomRects[atlas->CustomRectIds[0]];
IM_ASSERT(r.ID == FONT_ATLAS_DEFAULT_TEX_DATA_ID);
IM_ASSERT(r.IsPacked());
@@ -2013,8 +2284,8 @@ void ImFontAtlasBuildFinish(ImFontAtlas* atlas)
// Register custom rectangle glyphs
for (int i = 0; i < atlas->CustomRects.Size; i++)
{
- const ImFontAtlas::CustomRect& r = atlas->CustomRects[i];
- if (r.Font == NULL || r.ID > 0x10000)
+ const ImFontAtlasCustomRect& r = atlas->CustomRects[i];
+ if (r.Font == NULL || r.ID >= 0x110000)
continue;
IM_ASSERT(r.Font->ContainerAtlas == atlas);
@@ -2027,6 +2298,23 @@ void ImFontAtlasBuildFinish(ImFontAtlas* atlas)
for (int i = 0; i < atlas->Fonts.Size; i++)
if (atlas->Fonts[i]->DirtyLookupTables)
atlas->Fonts[i]->BuildLookupTable();
+
+ // Ellipsis character is required for rendering elided text. We prefer using U+2026 (horizontal ellipsis).
+ // However some old fonts may contain ellipsis at U+0085. Here we auto-detect most suitable ellipsis character.
+ // FIXME: Also note that 0x2026 is currently seldomly included in our font ranges. Because of this we are more likely to use three individual dots.
+ for (int i = 0; i < atlas->Fonts.size(); i++)
+ {
+ ImFont* font = atlas->Fonts[i];
+ if (font->EllipsisChar != (ImWchar)-1)
+ continue;
+ const ImWchar ellipsis_variants[] = { (ImWchar)0x2026, (ImWchar)0x0085 };
+ for (int j = 0; j < IM_ARRAYSIZE(ellipsis_variants); j++)
+ if (font->FindGlyphNoFallback(ellipsis_variants[j]) != NULL) // Verify glyph exists
+ {
+ font->EllipsisChar = ellipsis_variants[j];
+ break;
+ }
+ }
}
// Retrieve list of range (2 int per range, values are inclusive)
@@ -2057,7 +2345,8 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseFull()
static const ImWchar ranges[] =
{
0x0020, 0x00FF, // Basic Latin + Latin Supplement
- 0x3000, 0x30FF, // Punctuations, Hiragana, Katakana
+ 0x2000, 0x206F, // General Punctuation
+ 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
0x31F0, 0x31FF, // Katakana Phonetic Extensions
0xFF00, 0xFFEF, // Half-width characters
0x4e00, 0x9FAF, // CJK Ideograms
@@ -2077,7 +2366,7 @@ static void UnpackAccumulativeOffsetsIntoRanges(int base_codepoint, const short*
}
//-------------------------------------------------------------------------
-// [SECTION] ImFontAtlas glyph ranges helpers + GlyphRangesBuilder
+// [SECTION] ImFontAtlas glyph ranges helpers
//-------------------------------------------------------------------------
const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon()
@@ -2085,7 +2374,7 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon()
// Store 2500 regularly used characters for Simplified Chinese.
// Sourced from https://zh.wiktionary.org/wiki/%E9%99%84%E5%BD%95:%E7%8E%B0%E4%BB%A3%E6%B1%89%E8%AF%AD%E5%B8%B8%E7%94%A8%E5%AD%97%E8%A1%A8
// This table covers 97.97% of all characters used during the month in July, 1987.
- // You can use ImFontAtlas::GlyphRangesBuilder to create your own ranges derived from this, by merging existing ranges or adding new characters.
+ // You can use ImFontGlyphRangesBuilder to create your own ranges derived from this, by merging existing ranges or adding new characters.
// (Stored as accumulative offsets from the initial unicode codepoint 0x4E00. This encoding is designed to helps us compact the source code size.)
static const short accumulative_offsets_from_0x4E00[] =
{
@@ -2133,9 +2422,10 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon()
static ImWchar base_ranges[] = // not zero-terminated
{
0x0020, 0x00FF, // Basic Latin + Latin Supplement
- 0x3000, 0x30FF, // Punctuations, Hiragana, Katakana
+ 0x2000, 0x206F, // General Punctuation
+ 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
0x31F0, 0x31FF, // Katakana Phonetic Extensions
- 0xFF00, 0xFFEF, // Half-width characters
+ 0xFF00, 0xFFEF // Half-width characters
};
static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00) * 2 + 1] = { 0 };
if (!full_ranges[0])
@@ -2151,7 +2441,7 @@ const ImWchar* ImFontAtlas::GetGlyphRangesJapanese()
// 1946 common ideograms code points for Japanese
// Sourced from http://theinstructionlimit.com/common-kanji-character-ranges-for-xna-spritefont-rendering
// FIXME: Source a list of the revised 2136 Joyo Kanji list from 2010 and rebuild this.
- // You can use ImFontAtlas::GlyphRangesBuilder to create your own ranges derived from this, by merging existing ranges or adding new characters.
+ // You can use ImFontGlyphRangesBuilder to create your own ranges derived from this, by merging existing ranges or adding new characters.
// (Stored as accumulative offsets from the initial unicode codepoint 0x4E00. This encoding is designed to helps us compact the source code size.)
static const short accumulative_offsets_from_0x4E00[] =
{
@@ -2186,14 +2476,14 @@ const ImWchar* ImFontAtlas::GetGlyphRangesJapanese()
3,7,6,3,1,2,3,9,1,3,1,6,3,2,1,3,11,3,1,6,10,3,2,3,1,2,1,5,1,1,11,3,6,4,1,7,2,1,2,5,5,34,4,14,18,4,19,7,5,8,2,6,79,1,5,2,14,8,2,9,2,1,36,28,16,
4,1,1,1,2,12,6,42,39,16,23,7,15,15,3,2,12,7,21,64,6,9,28,8,12,3,3,41,59,24,51,55,57,294,9,9,2,6,2,15,1,2,13,38,90,9,9,9,3,11,7,1,1,1,5,6,3,2,
1,2,2,3,8,1,4,4,1,5,7,1,4,3,20,4,9,1,1,1,5,5,17,1,5,2,6,2,4,1,4,5,7,3,18,11,11,32,7,5,4,7,11,127,8,4,3,3,1,10,1,1,6,21,14,1,16,1,7,1,3,6,9,65,
- 51,4,3,13,3,10,1,1,12,9,21,110,3,19,24,1,1,10,62,4,1,29,42,78,28,20,18,82,6,3,15,6,84,58,253,15,155,264,15,21,9,14,7,58,40,39,
+ 51,4,3,13,3,10,1,1,12,9,21,110,3,19,24,1,1,10,62,4,1,29,42,78,28,20,18,82,6,3,15,6,84,58,253,15,155,264,15,21,9,14,7,58,40,39,
};
static ImWchar base_ranges[] = // not zero-terminated
{
0x0020, 0x00FF, // Basic Latin + Latin Supplement
- 0x3000, 0x30FF, // Punctuations, Hiragana, Katakana
+ 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
0x31F0, 0x31FF, // Katakana Phonetic Extensions
- 0xFF00, 0xFFEF, // Half-width characters
+ 0xFF00, 0xFFEF // Half-width characters
};
static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00)*2 + 1] = { 0 };
if (!full_ranges[0])
@@ -2229,7 +2519,28 @@ const ImWchar* ImFontAtlas::GetGlyphRangesThai()
return &ranges[0];
}
-void ImFontAtlas::GlyphRangesBuilder::AddText(const char* text, const char* text_end)
+const ImWchar* ImFontAtlas::GetGlyphRangesVietnamese()
+{
+ static const ImWchar ranges[] =
+ {
+ 0x0020, 0x00FF, // Basic Latin
+ 0x0102, 0x0103,
+ 0x0110, 0x0111,
+ 0x0128, 0x0129,
+ 0x0168, 0x0169,
+ 0x01A0, 0x01A1,
+ 0x01AF, 0x01B0,
+ 0x1EA0, 0x1EF9,
+ 0,
+ };
+ return &ranges[0];
+}
+
+//-----------------------------------------------------------------------------
+// [SECTION] ImFontGlyphRangesBuilder
+//-----------------------------------------------------------------------------
+
+void ImFontGlyphRangesBuilder::AddText(const char* text, const char* text_end)
{
while (text_end ? (text < text_end) : *text)
{
@@ -2238,25 +2549,26 @@ void ImFontAtlas::GlyphRangesBuilder::AddText(const char* text, const char* text
text += c_len;
if (c_len == 0)
break;
- if (c < 0x10000)
+ if (c <= IM_UNICODE_CODEPOINT_MAX)
AddChar((ImWchar)c);
}
}
-void ImFontAtlas::GlyphRangesBuilder::AddRanges(const ImWchar* ranges)
+void ImFontGlyphRangesBuilder::AddRanges(const ImWchar* ranges)
{
for (; ranges[0]; ranges += 2)
for (ImWchar c = ranges[0]; c <= ranges[1]; c++)
AddChar(c);
}
-void ImFontAtlas::GlyphRangesBuilder::BuildRanges(ImVector* out_ranges)
+void ImFontGlyphRangesBuilder::BuildRanges(ImVector* out_ranges)
{
- for (int n = 0; n < 0x10000; n++)
+ const int max_codepoint = IM_UNICODE_CODEPOINT_MAX;
+ for (int n = 0; n <= max_codepoint; n++)
if (GetBit(n))
{
out_ranges->push_back((ImWchar)n);
- while (n < 0x10000 && GetBit(n + 1))
+ while (n < max_codepoint && GetBit(n + 1))
n++;
out_ranges->push_back((ImWchar)n);
}
@@ -2269,38 +2581,37 @@ void ImFontAtlas::GlyphRangesBuilder::BuildRanges(ImVector* out_ranges)
ImFont::ImFont()
{
- Scale = 1.0f;
+ FontSize = 0.0f;
+ FallbackAdvanceX = 0.0f;
FallbackChar = (ImWchar)'?';
+ EllipsisChar = (ImWchar)-1;
DisplayOffset = ImVec2(0.0f, 0.0f);
- ClearOutputData();
+ FallbackGlyph = NULL;
+ ContainerAtlas = NULL;
+ ConfigData = NULL;
+ ConfigDataCount = 0;
+ DirtyLookupTables = false;
+ Scale = 1.0f;
+ Ascent = Descent = 0.0f;
+ MetricsTotalSurface = 0;
}
ImFont::~ImFont()
{
- // Invalidate active font so that the user gets a clear crash instead of a dangling pointer.
- // If you want to delete fonts you need to do it between Render() and NewFrame().
- // FIXME-CLEANUP
- /*
- ImGuiContext& g = *GImGui;
- if (g.Font == this)
- g.Font = NULL;
- */
ClearOutputData();
}
void ImFont::ClearOutputData()
{
FontSize = 0.0f;
+ FallbackAdvanceX = 0.0f;
Glyphs.clear();
IndexAdvanceX.clear();
IndexLookup.clear();
FallbackGlyph = NULL;
- FallbackAdvanceX = 0.0f;
- ConfigDataCount = 0;
- ConfigData = NULL;
ContainerAtlas = NULL;
- Ascent = Descent = 0.0f;
DirtyLookupTables = true;
+ Ascent = Descent = 0.0f;
MetricsTotalSurface = 0;
}
@@ -2331,7 +2642,7 @@ void ImFont::BuildLookupTable()
ImFontGlyph& tab_glyph = Glyphs.back();
tab_glyph = *FindGlyph((ImWchar)' ');
tab_glyph.Codepoint = '\t';
- tab_glyph.AdvanceX *= 4;
+ tab_glyph.AdvanceX *= IM_TABSIZE;
IndexAdvanceX[(int)tab_glyph.Codepoint] = (float)tab_glyph.AdvanceX;
IndexLookup[(int)tab_glyph.Codepoint] = (ImWchar)(Glyphs.Size-1);
}
@@ -2376,7 +2687,7 @@ void ImFont::AddGlyph(ImWchar codepoint, float x0, float y0, float x1, float y1,
glyph.AdvanceX = advance_x + ConfigData->GlyphExtraSpacing.x; // Bake spacing into AdvanceX
if (ConfigData->PixelSnapH)
- glyph.AdvanceX = (float)(int)(glyph.AdvanceX + 0.5f);
+ glyph.AdvanceX = IM_ROUND(glyph.AdvanceX);
// Compute rough surface usage metrics (+1 to account for average padding, +0.99 to round)
DirtyLookupTables = true;
@@ -2386,7 +2697,7 @@ void ImFont::AddGlyph(ImWchar codepoint, float x0, float y0, float x1, float y1,
void ImFont::AddRemapChar(ImWchar dst, ImWchar src, bool overwrite_dst)
{
IM_ASSERT(IndexLookup.Size > 0); // Currently this can only be called AFTER the font has been built, aka after calling ImFontAtlas::GetTexDataAs*() function.
- int index_size = IndexLookup.Size;
+ unsigned int index_size = (unsigned int)IndexLookup.Size;
if (dst < index_size && IndexLookup.Data[dst] == (ImWchar)-1 && !overwrite_dst) // 'dst' already exists
return;
@@ -2402,7 +2713,7 @@ const ImFontGlyph* ImFont::FindGlyph(ImWchar c) const
{
if (c >= IndexLookup.Size)
return FallbackGlyph;
- const ImWchar i = IndexLookup[c];
+ const ImWchar i = IndexLookup.Data[c];
if (i == (ImWchar)-1)
return FallbackGlyph;
return &Glyphs.Data[i];
@@ -2412,7 +2723,7 @@ const ImFontGlyph* ImFont::FindGlyphNoFallback(ImWchar c) const
{
if (c >= IndexLookup.Size)
return NULL;
- const ImWchar i = IndexLookup[c];
+ const ImWchar i = IndexLookup.Data[c];
if (i == (ImWchar)-1)
return NULL;
return &Glyphs.Data[i];
@@ -2472,7 +2783,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c
}
}
- const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX[(int)c] : FallbackAdvanceX);
+ const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX.Data[c] : FallbackAdvanceX);
if (ImCharIsBlankW(c))
{
if (inside_word)
@@ -2503,7 +2814,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c
}
// We ignore blank width at the end of the line (they can be skipped)
- if (line_width + word_width >= wrap_width)
+ if (line_width + word_width > wrap_width)
{
// Words that cannot possibly fit within an entire line will be cut anywhere.
if (word_width < wrap_width)
@@ -2589,7 +2900,7 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons
continue;
}
- const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX[(int)c] : FallbackAdvanceX) * scale;
+ const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX.Data[c] : FallbackAdvanceX) * scale;
if (line_width + char_width >= max_width)
{
s = prev_s;
@@ -2618,8 +2929,8 @@ void ImFont::RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
if (const ImFontGlyph* glyph = FindGlyph(c))
{
float scale = (size >= 0.0f) ? (size / FontSize) : 1.0f;
- pos.x = (float)(int)pos.x + DisplayOffset.x;
- pos.y = (float)(int)pos.y + DisplayOffset.y;
+ pos.x = IM_FLOOR(pos.x + DisplayOffset.x);
+ pos.y = IM_FLOOR(pos.y + DisplayOffset.y);
draw_list->PrimReserve(6, 4);
draw_list->PrimRectUV(ImVec2(pos.x + glyph->X0 * scale, pos.y + glyph->Y0 * scale), ImVec2(pos.x + glyph->X1 * scale, pos.y + glyph->Y1 * scale), ImVec2(glyph->U0, glyph->V0), ImVec2(glyph->U1, glyph->V1), col);
}
@@ -2628,11 +2939,11 @@ void ImFont::RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip) const
{
if (!text_end)
- text_end = text_begin + strlen(text_begin); // ImGui functions generally already provides a valid text_end, so this is merely to handle direct calls.
+ text_end = text_begin + strlen(text_begin); // ImGui:: functions generally already provides a valid text_end, so this is merely to handle direct calls.
// Align to be pixel perfect
- pos.x = (float)(int)pos.x + DisplayOffset.x;
- pos.y = (float)(int)pos.y + DisplayOffset.y;
+ pos.x = IM_FLOOR(pos.x + DisplayOffset.x);
+ pos.y = IM_FLOOR(pos.y + DisplayOffset.y);
float x = pos.x;
float y = pos.y;
if (y > clip_rect.w)
@@ -2662,7 +2973,7 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
while (y_end < clip_rect.w && s_end < text_end)
{
s_end = (const char*)memchr(s_end, '\n', text_end - s_end);
- s = s ? s + 1 : text_end;
+ s_end = s_end ? s_end + 1 : text_end;
y_end += line_height;
}
text_end = s_end;
@@ -2805,13 +3116,13 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
x += char_width;
}
- // Give back unused vertices
- draw_list->VtxBuffer.resize((int)(vtx_write - draw_list->VtxBuffer.Data));
- draw_list->IdxBuffer.resize((int)(idx_write - draw_list->IdxBuffer.Data));
+ // Give back unused vertices (clipped ones, blanks) ~ this is essentially a PrimUnreserve() action.
+ draw_list->VtxBuffer.Size = (int)(vtx_write - draw_list->VtxBuffer.Data); // Same as calling shrink()
+ draw_list->IdxBuffer.Size = (int)(idx_write - draw_list->IdxBuffer.Data);
draw_list->CmdBuffer[draw_list->CmdBuffer.Size-1].ElemCount -= (idx_expected_size - draw_list->IdxBuffer.Size);
draw_list->_VtxWritePtr = vtx_write;
draw_list->_IdxWritePtr = idx_write;
- draw_list->_VtxCurrentIdx = (unsigned int)draw_list->VtxBuffer.Size;
+ draw_list->_VtxCurrentIdx = vtx_current_idx;
}
//-----------------------------------------------------------------------------
@@ -2823,16 +3134,12 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
// - RenderRectFilledRangeH()
//-----------------------------------------------------------------------------
-void ImGui::RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor)
+void ImGui::RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow)
{
if (mouse_cursor == ImGuiMouseCursor_None)
return;
IM_ASSERT(mouse_cursor > ImGuiMouseCursor_None && mouse_cursor < ImGuiMouseCursor_COUNT);
- const ImU32 col_shadow = IM_COL32(0, 0, 0, 48);
- const ImU32 col_border = IM_COL32(0, 0, 0, 255); // Black
- const ImU32 col_fill = IM_COL32(255, 255, 255, 255); // White
-
ImFontAtlas* font_atlas = draw_list->_Data->Font->ContainerAtlas;
ImVec2 offset, size, uv[4];
if (font_atlas->GetMouseCursorTexData(mouse_cursor, &offset, &size, &uv[0], &uv[2]))
@@ -2889,13 +3196,14 @@ void ImGui::RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, Im
const float inv_rounding = 1.0f / rounding;
const float arc0_b = ImAcos01(1.0f - (p0.x - rect.Min.x) * inv_rounding);
const float arc0_e = ImAcos01(1.0f - (p1.x - rect.Min.x) * inv_rounding);
+ const float half_pi = IM_PI * 0.5f; // We will == compare to this because we know this is the exact value ImAcos01 can return.
const float x0 = ImMax(p0.x, rect.Min.x + rounding);
if (arc0_b == arc0_e)
{
draw_list->PathLineTo(ImVec2(x0, p1.y));
draw_list->PathLineTo(ImVec2(x0, p0.y));
}
- else if (arc0_b == 0.0f && arc0_e == IM_PI*0.5f)
+ else if (arc0_b == 0.0f && arc0_e == half_pi)
{
draw_list->PathArcToFast(ImVec2(x0, p1.y - rounding), rounding, 3, 6); // BL
draw_list->PathArcToFast(ImVec2(x0, p0.y + rounding), rounding, 6, 9); // TR
@@ -2915,7 +3223,7 @@ void ImGui::RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, Im
draw_list->PathLineTo(ImVec2(x1, p0.y));
draw_list->PathLineTo(ImVec2(x1, p1.y));
}
- else if (arc1_b == 0.0f && arc1_e == IM_PI*0.5f)
+ else if (arc1_b == 0.0f && arc1_e == half_pi)
{
draw_list->PathArcToFast(ImVec2(x1, p0.y + rounding), rounding, 9, 12); // TR
draw_list->PathArcToFast(ImVec2(x1, p1.y - rounding), rounding, 0, 3); // BR
@@ -2929,7 +3237,6 @@ void ImGui::RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, Im
draw_list->PathFillConvex(col);
}
-
//-----------------------------------------------------------------------------
// [SECTION] Decompression code
//-----------------------------------------------------------------------------
@@ -2990,9 +3297,9 @@ static unsigned int stb_adler32(unsigned int adler32, unsigned char *buffer, uns
{
const unsigned long ADLER_MOD = 65521;
unsigned long s1 = adler32 & 0xffff, s2 = adler32 >> 16;
- unsigned long blocklen, i;
+ unsigned long blocklen = buflen % 5552;
- blocklen = buflen % 5552;
+ unsigned long i;
while (buflen) {
for (i=0; i + 7 < blocklen; i += 8) {
s1 += buffer[0], s2 += s1;
@@ -3019,10 +3326,9 @@ static unsigned int stb_adler32(unsigned int adler32, unsigned char *buffer, uns
static unsigned int stb_decompress(unsigned char *output, const unsigned char *i, unsigned int /*length*/)
{
- unsigned int olen;
if (stb__in4(0) != 0x57bC0000) return 0;
if (stb__in4(4) != 0) return 0; // error! stream is > 4GB
- olen = stb_decompress_length(i);
+ const unsigned int olen = stb_decompress_length(i);
stb__barrier_in_b = i;
stb__barrier_out_e = output + olen;
stb__barrier_out_b = output;
@@ -3154,3 +3460,5 @@ static const char* GetDefaultCompressedFontDataTTFBase85()
{
return proggy_clean_ttf_compressed_data_base85;
}
+
+#endif // #ifndef IMGUI_DISABLE
diff --git a/src/imgui/imgui_internal.h b/src/imgui/imgui_internal.h
index bac04ae6af..5de13c3658 100644
--- a/src/imgui/imgui_internal.h
+++ b/src/imgui/imgui_internal.h
@@ -1,4 +1,4 @@
-// dear imgui, v1.66 WIP
+// dear imgui, v1.75
// (internal structures/api)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!
@@ -6,69 +6,120 @@
// #define IMGUI_DEFINE_MATH_OPERATORS
// To implement maths operators for ImVec2 (disabled by default to not collide with using IM_VEC2_CLASS_EXTRA along with your own math types+operators)
+/*
+
+Index of this file:
+// Header mess
+// Forward declarations
+// STB libraries includes
+// Context pointer
+// Generic helpers
+// Misc data structures
+// Main imgui context
+// Tab bar, tab item
+// Internal API
+
+*/
+
#pragma once
+#ifndef IMGUI_DISABLE
+
+//-----------------------------------------------------------------------------
+// Header mess
+//-----------------------------------------------------------------------------
#ifndef IMGUI_VERSION
#error Must include imgui.h before imgui_internal.h
#endif
-#include // FILE*
+#include // FILE*, sscanf
#include // NULL, malloc, free, qsort, atoi, atof
#include // sqrtf, fabsf, fmodf, powf, floorf, ceilf, cosf, sinf
#include // INT_MIN, INT_MAX
+// Visual Studio warnings
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable: 4251) // class 'xxx' needs to have dll-interface to be used by clients of struct 'xxx' // when IMGUI_API is set to__declspec(dllexport)
#endif
-#ifdef __clang__
+// Clang/GCC warnings with -Weverything
+#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-function" // for stb_textedit.h
#pragma clang diagnostic ignored "-Wmissing-prototypes" // for stb_textedit.h
#pragma clang diagnostic ignored "-Wold-style-cast"
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#if __has_warning("-Wdouble-promotion")
+#pragma clang diagnostic ignored "-Wdouble-promotion"
+#endif
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
+#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
+#endif
+
+// Legacy defines
+#ifdef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS // Renamed in 1.74
+#error Use IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS
+#endif
+#ifdef IMGUI_DISABLE_MATH_FUNCTIONS // Renamed in 1.74
+#error Use IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS
#endif
//-----------------------------------------------------------------------------
-// Forward Declarations
+// Forward declarations
//-----------------------------------------------------------------------------
+struct ImBoolVector; // Store 1-bit per value
struct ImRect; // An axis-aligned rectangle (2 points)
struct ImDrawDataBuilder; // Helper to build a ImDrawData instance
struct ImDrawListSharedData; // Data shared between all ImDrawList instances
struct ImGuiColorMod; // Stacked color modifier, backup of modified data so we can restore it
struct ImGuiColumnData; // Storage data for a single column
-struct ImGuiColumnsSet; // Storage data for a columns set
-struct ImGuiContext; // Main imgui context
+struct ImGuiColumns; // Storage data for a columns set
+struct ImGuiContext; // Main Dear ImGui context
+struct ImGuiDataTypeInfo; // Type information associated to a ImGuiDataType enum
struct ImGuiGroupData; // Stacked storage data for BeginGroup()/EndGroup()
struct ImGuiInputTextState; // Internal state of the currently focused/edited text input box
struct ImGuiItemHoveredDataBackup; // Backup and restore IsItemHovered() internal data
struct ImGuiMenuColumns; // Simple column measurement, currently used for MenuItem() only
struct ImGuiNavMoveResult; // Result of a directional navigation move query result
-struct ImGuiNextWindowData; // Storage for SetNexWindow** functions
-struct ImGuiPopupRef; // Storage for current popup stack
+struct ImGuiNextWindowData; // Storage for SetNextWindow** functions
+struct ImGuiNextItemData; // Storage for SetNextItem** functions
+struct ImGuiPopupData; // Storage for current popup stack
struct ImGuiSettingsHandler; // Storage for one type registered in the .ini file
struct ImGuiStyleMod; // Stacked style modifier, backup of modified data so we can restore it
+struct ImGuiTabBar; // Storage for a tab bar
+struct ImGuiTabItem; // Storage for a tab item (within a tab bar)
struct ImGuiWindow; // Storage for one window
struct ImGuiWindowTempData; // Temporary storage for one window (that's the data which in theory we could ditch at the end of the frame)
-struct ImGuiWindowSettings; // Storage for window settings stored in .ini file (we keep one of those even if the actual window wasn't instanced during this session)
+struct ImGuiWindowSettings; // Storage for a window .ini settings (we keep one of those even if the actual window wasn't instanced during this session)
// Use your programming IDE "Go to definition" facility on the names of the center columns to find the actual flags/enum lists.
-typedef int ImGuiLayoutType; // -> enum ImGuiLayoutType_ // Enum: Horizontal or vertical
-typedef int ImGuiButtonFlags; // -> enum ImGuiButtonFlags_ // Flags: for ButtonEx(), ButtonBehavior()
-typedef int ImGuiItemFlags; // -> enum ImGuiItemFlags_ // Flags: for PushItemFlag()
-typedef int ImGuiItemStatusFlags; // -> enum ImGuiItemStatusFlags_ // Flags: for DC.LastItemStatusFlags
-typedef int ImGuiNavHighlightFlags; // -> enum ImGuiNavHighlightFlags_ // Flags: for RenderNavHighlight()
-typedef int ImGuiNavDirSourceFlags; // -> enum ImGuiNavDirSourceFlags_ // Flags: for GetNavInputAmount2d()
-typedef int ImGuiNavMoveFlags; // -> enum ImGuiNavMoveFlags_ // Flags: for navigation requests
-typedef int ImGuiSeparatorFlags; // -> enum ImGuiSeparatorFlags_ // Flags: for Separator() - internal
-typedef int ImGuiSliderFlags; // -> enum ImGuiSliderFlags_ // Flags: for SliderBehavior()
+typedef int ImGuiLayoutType; // -> enum ImGuiLayoutType_ // Enum: Horizontal or vertical
+typedef int ImGuiButtonFlags; // -> enum ImGuiButtonFlags_ // Flags: for ButtonEx(), ButtonBehavior()
+typedef int ImGuiColumnsFlags; // -> enum ImGuiColumnsFlags_ // Flags: BeginColumns()
+typedef int ImGuiDragFlags; // -> enum ImGuiDragFlags_ // Flags: for DragBehavior()
+typedef int ImGuiItemFlags; // -> enum ImGuiItemFlags_ // Flags: for PushItemFlag()
+typedef int ImGuiItemStatusFlags; // -> enum ImGuiItemStatusFlags_ // Flags: for DC.LastItemStatusFlags
+typedef int ImGuiNavHighlightFlags; // -> enum ImGuiNavHighlightFlags_ // Flags: for RenderNavHighlight()
+typedef int ImGuiNavDirSourceFlags; // -> enum ImGuiNavDirSourceFlags_ // Flags: for GetNavInputAmount2d()
+typedef int ImGuiNavMoveFlags; // -> enum ImGuiNavMoveFlags_ // Flags: for navigation requests
+typedef int ImGuiNextItemDataFlags; // -> enum ImGuiNextItemDataFlags_ // Flags: for SetNextItemXXX() functions
+typedef int ImGuiNextWindowDataFlags; // -> enum ImGuiNextWindowDataFlags_// Flags: for SetNextWindowXXX() functions
+typedef int ImGuiSeparatorFlags; // -> enum ImGuiSeparatorFlags_ // Flags: for SeparatorEx()
+typedef int ImGuiSliderFlags; // -> enum ImGuiSliderFlags_ // Flags: for SliderBehavior()
+typedef int ImGuiTextFlags; // -> enum ImGuiTextFlags_ // Flags: for TextEx()
+typedef int ImGuiTooltipFlags; // -> enum ImGuiTooltipFlags_ // Flags: for BeginTooltipEx()
//-------------------------------------------------------------------------
-// STB libraries
+// STB libraries includes
//-------------------------------------------------------------------------
-namespace ImGuiStb
+namespace ImStb
{
#undef STB_TEXTEDIT_STRING
@@ -76,31 +127,63 @@ namespace ImGuiStb
#define STB_TEXTEDIT_STRING ImGuiInputTextState
#define STB_TEXTEDIT_CHARTYPE ImWchar
#define STB_TEXTEDIT_GETWIDTH_NEWLINE -1.0f
+#define STB_TEXTEDIT_UNDOSTATECOUNT 99
+#define STB_TEXTEDIT_UNDOCHARCOUNT 999
#include "imstb_textedit.h"
-} // namespace ImGuiStb
+} // namespace ImStb
//-----------------------------------------------------------------------------
-// Context
+// Context pointer
//-----------------------------------------------------------------------------
#ifndef GImGui
-extern IMGUI_API ImGuiContext* GImGui; // Current implicit ImGui context pointer
+extern IMGUI_API ImGuiContext* GImGui; // Current implicit context pointer
#endif
//-----------------------------------------------------------------------------
-// Helpers
+// Macros
//-----------------------------------------------------------------------------
-#define IM_PI 3.14159265358979323846f
-#ifdef _WIN32
-#define IM_NEWLINE "\r\n" // Play it nice with Windows users (2018/05 news: Microsoft announced that Notepad will finally display Unix-style carriage returns!)
+// Debug Logging
+#ifndef IMGUI_DEBUG_LOG
+#define IMGUI_DEBUG_LOG(_FMT,...) printf("[%05d] " _FMT, GImGui->FrameCount, __VA_ARGS__)
+#endif
+
+// Static Asserts
+#if (__cplusplus >= 201100)
+#define IM_STATIC_ASSERT(_COND) static_assert(_COND, "")
#else
-#define IM_NEWLINE "\n"
-#endif
#define IM_STATIC_ASSERT(_COND) typedef char static_assertion_##__line__[(_COND)?1:-1]
+#endif
+
+// "Paranoid" Debug Asserts are meant to only be enabled during specific debugging/work, otherwise would slow down the code too much.
+// We currently don't have many of those so the effect is currently negligible, but onward intent to add more aggressive ones in the code.
+//#define IMGUI_DEBUG_PARANOID
+#ifdef IMGUI_DEBUG_PARANOID
+#define IM_ASSERT_PARANOID(_EXPR) IM_ASSERT(_EXPR)
+#else
+#define IM_ASSERT_PARANOID(_EXPR)
+#endif
+
+// Error handling
+// Down the line in some frameworks/languages we would like to have a way to redirect those to the programmer and recover from more faults.
+#ifndef IM_ASSERT_USER_ERROR
+#define IM_ASSERT_USER_ERROR(_EXP,_MSG) IM_ASSERT((_EXP) && _MSG) // Recoverable User Error
+#endif
+
+// Misc Macros
+#define IM_PI 3.14159265358979323846f
+#ifdef _WIN32
+#define IM_NEWLINE "\r\n" // Play it nice with Windows users (Update: since 2018-05, Notepad finally appears to support Unix-style carriage returns!)
+#else
+#define IM_NEWLINE "\n"
+#endif
+#define IM_TABSIZE (4)
#define IM_F32_TO_INT8_UNBOUND(_VAL) ((int)((_VAL) * 255.0f + ((_VAL)>=0 ? 0.5f : -0.5f))) // Unsaturated, for display purpose
#define IM_F32_TO_INT8_SAT(_VAL) ((int)(ImSaturate(_VAL) * 255.0f + 0.5f)) // Saturated, always output 0..255
+#define IM_FLOOR(_VAL) ((float)(int)(_VAL)) // ImFloor() is not inlined in MSVC debug builds
+#define IM_ROUND(_VAL) ((float)(int)((_VAL) + 0.5f)) //
// Enforce cdecl calling convention for functions called by the standard library, in case compilation settings changed the default to e.g. __vectorcall
#ifdef _MSC_VER
@@ -109,48 +192,64 @@ extern IMGUI_API ImGuiContext* GImGui; // Current implicit ImGui context pointe
#define IMGUI_CDECL
#endif
-// Helpers: UTF-8 <> wchar
-IMGUI_API int ImTextStrToUtf8(char* buf, int buf_size, const ImWchar* in_text, const ImWchar* in_text_end); // return output UTF-8 bytes count
-IMGUI_API int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end); // read one character. return input UTF-8 bytes count
-IMGUI_API int ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const char* in_text_end, const char** in_remaining = NULL); // return input UTF-8 bytes count
-IMGUI_API int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end); // return number of UTF-8 code-points (NOT bytes count)
-IMGUI_API int ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end); // return number of bytes to express one char in UTF-8
-IMGUI_API int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end); // return number of bytes to express string in UTF-8
+//-----------------------------------------------------------------------------
+// Generic helpers
+// Note that the ImXXX helpers functions are lower-level than ImGui functions.
+// ImGui functions or the ImGui context are never called/used from other ImXXX functions.
+//-----------------------------------------------------------------------------
+// - Helpers: Misc
+// - Helpers: Bit manipulation
+// - Helpers: String, Formatting
+// - Helpers: UTF-8 <> wchar conversions
+// - Helpers: ImVec2/ImVec4 operators
+// - Helpers: Maths
+// - Helpers: Geometry
+// - Helper: ImBoolVector
+// - Helper: ImPool<>
+// - Helper: ImChunkStream<>
+//-----------------------------------------------------------------------------
// Helpers: Misc
-IMGUI_API ImU32 ImHash(const void* data, int data_size, ImU32 seed = 0); // Pass data_size==0 for zero-terminated strings
-IMGUI_API void* ImFileLoadToMemory(const char* filename, const char* file_open_mode, size_t* out_file_size = NULL, int padding_bytes = 0);
-IMGUI_API FILE* ImFileOpen(const char* filename, const char* file_open_mode);
-static inline bool ImCharIsBlankA(char c) { return c == ' ' || c == '\t'; }
-static inline bool ImCharIsBlankW(unsigned int c) { return c == ' ' || c == '\t' || c == 0x3000; }
+#define ImQsort qsort
+IMGUI_API ImU32 ImHashData(const void* data, size_t data_size, ImU32 seed = 0);
+IMGUI_API ImU32 ImHashStr(const char* data, size_t data_size = 0, ImU32 seed = 0);
+#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+static inline ImU32 ImHash(const void* data, int size, ImU32 seed = 0) { return size ? ImHashData(data, (size_t)size, seed) : ImHashStr((const char*)data, 0, seed); } // [moved to ImHashStr/ImHashData in 1.68]
+#endif
+
+// Helpers: Bit manipulation
static inline bool ImIsPowerOfTwo(int v) { return v != 0 && (v & (v - 1)) == 0; }
static inline int ImUpperPowerOfTwo(int v) { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; }
-#define ImQsort qsort
-// Helpers: Geometry
-IMGUI_API ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p);
-IMGUI_API bool ImTriangleContainsPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p);
-IMGUI_API ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p);
-IMGUI_API void ImTriangleBarycentricCoords(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p, float& out_u, float& out_v, float& out_w);
-IMGUI_API ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy);
-
-// Helpers: String
+// Helpers: String, Formatting
IMGUI_API int ImStricmp(const char* str1, const char* str2);
IMGUI_API int ImStrnicmp(const char* str1, const char* str2, size_t count);
IMGUI_API void ImStrncpy(char* dst, const char* src, size_t count);
IMGUI_API char* ImStrdup(const char* str);
+IMGUI_API char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* str);
IMGUI_API const char* ImStrchrRange(const char* str_begin, const char* str_end, char c);
IMGUI_API int ImStrlenW(const ImWchar* str);
IMGUI_API const char* ImStreolRange(const char* str, const char* str_end); // End end-of-line
IMGUI_API const ImWchar*ImStrbolW(const ImWchar* buf_mid_line, const ImWchar* buf_begin); // Find beginning-of-line
IMGUI_API const char* ImStristr(const char* haystack, const char* haystack_end, const char* needle, const char* needle_end);
IMGUI_API void ImStrTrimBlanks(char* str);
+IMGUI_API const char* ImStrSkipBlank(const char* str);
IMGUI_API int ImFormatString(char* buf, size_t buf_size, const char* fmt, ...) IM_FMTARGS(3);
IMGUI_API int ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args) IM_FMTLIST(3);
IMGUI_API const char* ImParseFormatFindStart(const char* format);
IMGUI_API const char* ImParseFormatFindEnd(const char* format);
-IMGUI_API const char* ImParseFormatTrimDecorations(const char* format, char* buf, int buf_size);
+IMGUI_API const char* ImParseFormatTrimDecorations(const char* format, char* buf, size_t buf_size);
IMGUI_API int ImParseFormatPrecision(const char* format, int default_value);
+static inline bool ImCharIsBlankA(char c) { return c == ' ' || c == '\t'; }
+static inline bool ImCharIsBlankW(unsigned int c) { return c == ' ' || c == '\t' || c == 0x3000; }
+
+// Helpers: UTF-8 <> wchar conversions
+IMGUI_API int ImTextStrToUtf8(char* buf, int buf_size, const ImWchar* in_text, const ImWchar* in_text_end); // return output UTF-8 bytes count
+IMGUI_API int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end); // read one character. return input UTF-8 bytes count
+IMGUI_API int ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const char* in_text_end, const char** in_remaining = NULL); // return input UTF-8 bytes count
+IMGUI_API int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end); // return number of UTF-8 code-points (NOT bytes count)
+IMGUI_API int ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end); // return number of bytes to express one char in UTF-8
+IMGUI_API int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end); // return number of bytes to express string in UTF-8
// Helpers: ImVec2/ImVec4 operators
// We are keeping those disabled by default so they don't leak in user space, to allow user enabling implicit cast operators between ImVec2 and their own types (using IM_VEC2_CLASS_EXTRA etc.)
@@ -171,29 +270,54 @@ static inline ImVec4 operator-(const ImVec4& lhs, const ImVec4& rhs)
static inline ImVec4 operator*(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x*rhs.x, lhs.y*rhs.y, lhs.z*rhs.z, lhs.w*rhs.w); }
#endif
+// Helpers: File System
+#ifdef IMGUI_DISABLE_FILE_FUNCTIONS
+#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
+typedef void* ImFileHandle;
+static inline ImFileHandle ImFileOpen(const char*, const char*) { return NULL; }
+static inline bool ImFileClose(ImFileHandle) { return false; }
+static inline ImU64 ImFileGetSize(ImFileHandle) { return (ImU64)-1; }
+static inline ImU64 ImFileRead(void*, ImU64, ImU64, ImFileHandle) { return 0; }
+static inline ImU64 ImFileWrite(const void*, ImU64, ImU64, ImFileHandle) { return 0; }
+#endif
+
+#ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS
+typedef FILE* ImFileHandle;
+IMGUI_API ImFileHandle ImFileOpen(const char* filename, const char* mode);
+IMGUI_API bool ImFileClose(ImFileHandle file);
+IMGUI_API ImU64 ImFileGetSize(ImFileHandle file);
+IMGUI_API ImU64 ImFileRead(void* data, ImU64 size, ImU64 count, ImFileHandle file);
+IMGUI_API ImU64 ImFileWrite(const void* data, ImU64 size, ImU64 count, ImFileHandle file);
+#else
+#define IMGUI_DISABLE_TTY_FUNCTIONS // Can't use stdout, fflush if we are not using default file functions
+#endif
+IMGUI_API void* ImFileLoadToMemory(const char* filename, const char* mode, size_t* out_file_size = NULL, int padding_bytes = 0);
+
// Helpers: Maths
// - Wrapper for standard libs functions. (Note that imgui_demo.cpp does _not_ use them to keep the code easy to copy)
-#ifndef IMGUI_DISABLE_MATH_FUNCTIONS
-static inline float ImFabs(float x) { return fabsf(x); }
-static inline float ImSqrt(float x) { return sqrtf(x); }
-static inline float ImPow(float x, float y) { return powf(x, y); }
-static inline double ImPow(double x, double y) { return pow(x, y); }
-static inline float ImFmod(float x, float y) { return fmodf(x, y); }
-static inline double ImFmod(double x, double y) { return fmod(x, y); }
-static inline float ImCos(float x) { return cosf(x); }
-static inline float ImSin(float x) { return sinf(x); }
-static inline float ImAcos(float x) { return acosf(x); }
-static inline float ImAtan2(float y, float x) { return atan2f(y, x); }
-static inline double ImAtof(const char* s) { return atof(s); }
-static inline float ImFloorStd(float x) { return floorf(x); } // we already uses our own ImFloor() { return (float)(int)v } internally so the standard one wrapper is named differently (it's used by stb_truetype)
-static inline float ImCeil(float x) { return ceilf(x); }
+#ifndef IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS
+#define ImFabs(X) fabsf(X)
+#define ImSqrt(X) sqrtf(X)
+#define ImFmod(X, Y) fmodf((X), (Y))
+#define ImCos(X) cosf(X)
+#define ImSin(X) sinf(X)
+#define ImAcos(X) acosf(X)
+#define ImAtan2(Y, X) atan2f((Y), (X))
+#define ImAtof(STR) atof(STR)
+#define ImFloorStd(X) floorf(X) // We already uses our own ImFloor() { return (float)(int)v } internally so the standard one wrapper is named differently (it's used by e.g. stb_truetype)
+#define ImCeil(X) ceilf(X)
+static inline float ImPow(float x, float y) { return powf(x, y); } // DragBehaviorT/SliderBehaviorT uses ImPow with either float/double and need the precision
+static inline double ImPow(double x, double y) { return pow(x, y); }
#endif
-// - ImMin/ImMax/ImClamp/ImLerp/ImSwap are used by widgets which support for variety of types: signed/unsigned int/long long float/double, using templates here but we could also redefine them 6 times
+// - ImMin/ImMax/ImClamp/ImLerp/ImSwap are used by widgets which support variety of types: signed/unsigned int/long long float/double
+// (Exceptionally using templates here but we could also redefine them for those types)
template static inline T ImMin(T lhs, T rhs) { return lhs < rhs ? lhs : rhs; }
template static inline T ImMax(T lhs, T rhs) { return lhs >= rhs ? lhs : rhs; }
template static inline T ImClamp(T v, T mn, T mx) { return (v < mn) ? mn : (v > mx) ? mx : v; }
template static inline T ImLerp(T a, T b, float t) { return (T)(a + (b - a) * t); }
template static inline void ImSwap(T& a, T& b) { T tmp = a; a = b; b = tmp; }
+template static inline T ImAddClampOverflow(T a, T b, T mn, T mx) { if (b < 0 && (a < mn - b)) return mn; if (b > 0 && (a > mx - b)) return mx; return a + b; }
+template static inline T ImSubClampOverflow(T a, T b, T mn, T mx) { if (b > 0 && (a < mn + b)) return mn; if (b < 0 && (a > mx + b)) return mx; return a - b; }
// - Misc maths helpers
static inline ImVec2 ImMin(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x < rhs.x ? lhs.x : rhs.x, lhs.y < rhs.y ? lhs.y : rhs.y); }
static inline ImVec2 ImMax(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x >= rhs.x ? lhs.x : rhs.x, lhs.y >= rhs.y ? lhs.y : rhs.y); }
@@ -205,42 +329,117 @@ static inline float ImSaturate(float f)
static inline float ImLengthSqr(const ImVec2& lhs) { return lhs.x*lhs.x + lhs.y*lhs.y; }
static inline float ImLengthSqr(const ImVec4& lhs) { return lhs.x*lhs.x + lhs.y*lhs.y + lhs.z*lhs.z + lhs.w*lhs.w; }
static inline float ImInvLength(const ImVec2& lhs, float fail_value) { float d = lhs.x*lhs.x + lhs.y*lhs.y; if (d > 0.0f) return 1.0f / ImSqrt(d); return fail_value; }
-static inline float ImFloor(float f) { return (float)(int)f; }
-static inline ImVec2 ImFloor(const ImVec2& v) { return ImVec2((float)(int)v.x, (float)(int)v.y); }
+static inline float ImFloor(float f) { return (float)(int)(f); }
+static inline ImVec2 ImFloor(const ImVec2& v) { return ImVec2((float)(int)(v.x), (float)(int)(v.y)); }
+static inline int ImModPositive(int a, int b) { return (a + b) % b; }
static inline float ImDot(const ImVec2& a, const ImVec2& b) { return a.x * b.x + a.y * b.y; }
static inline ImVec2 ImRotate(const ImVec2& v, float cos_a, float sin_a) { return ImVec2(v.x * cos_a - v.y * sin_a, v.x * sin_a + v.y * cos_a); }
static inline float ImLinearSweep(float current, float target, float speed) { if (current < target) return ImMin(current + speed, target); if (current > target) return ImMax(current - speed, target); return current; }
static inline ImVec2 ImMul(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); }
-//-----------------------------------------------------------------------------
-// Types
-//-----------------------------------------------------------------------------
+// Helpers: Geometry
+IMGUI_API ImVec2 ImBezierCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, float t); // Cubic Bezier
+IMGUI_API ImVec2 ImBezierClosestPoint(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, int num_segments); // For curves with explicit number of segments
+IMGUI_API ImVec2 ImBezierClosestPointCasteljau(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, float tess_tol);// For auto-tessellated curves you can use tess_tol = style.CurveTessellationTol
+IMGUI_API ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p);
+IMGUI_API bool ImTriangleContainsPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p);
+IMGUI_API ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p);
+IMGUI_API void ImTriangleBarycentricCoords(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p, float& out_u, float& out_v, float& out_w);
+inline float ImTriangleArea(const ImVec2& a, const ImVec2& b, const ImVec2& c) { return ImFabs((a.x * (b.y - c.y)) + (b.x * (c.y - a.y)) + (c.x * (a.y - b.y))) * 0.5f; }
+IMGUI_API ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy);
-// 1D vector (this odd construct is used to facilitate the transition between 1D and 2D and maintenance of some patches)
-struct ImVec1
+// Helper: ImBoolVector
+// Store 1-bit per value. Note that Resize() currently clears the whole vector.
+struct IMGUI_API ImBoolVector
{
- float x;
- ImVec1() { x = 0.0f; }
- ImVec1(float _x) { x = _x; }
+ ImVector Storage;
+ ImBoolVector() { }
+ void Resize(int sz) { Storage.resize((sz + 31) >> 5); memset(Storage.Data, 0, (size_t)Storage.Size * sizeof(Storage.Data[0])); }
+ void Clear() { Storage.clear(); }
+ bool GetBit(int n) const { int off = (n >> 5); int mask = 1 << (n & 31); return (Storage[off] & mask) != 0; }
+ void SetBit(int n, bool v) { int off = (n >> 5); int mask = 1 << (n & 31); if (v) Storage[off] |= mask; else Storage[off] &= ~mask; }
};
+// Helper: ImPool<>
+// Basic keyed storage for contiguous instances, slow/amortized insertion, O(1) indexable, O(Log N) queries by ID over a dense/hot buffer,
+// Honor constructor/destructor. Add/remove invalidate all pointers. Indexes have the same lifetime as the associated object.
+typedef int ImPoolIdx;
+template
+struct IMGUI_API ImPool
+{
+ ImVector Buf; // Contiguous data
+ ImGuiStorage Map; // ID->Index
+ ImPoolIdx FreeIdx; // Next free idx to use
+
+ ImPool() { FreeIdx = 0; }
+ ~ImPool() { Clear(); }
+ T* GetByKey(ImGuiID key) { int idx = Map.GetInt(key, -1); return (idx != -1) ? &Buf[idx] : NULL; }
+ T* GetByIndex(ImPoolIdx n) { return &Buf[n]; }
+ ImPoolIdx GetIndex(const T* p) const { IM_ASSERT(p >= Buf.Data && p < Buf.Data + Buf.Size); return (ImPoolIdx)(p - Buf.Data); }
+ T* GetOrAddByKey(ImGuiID key) { int* p_idx = Map.GetIntRef(key, -1); if (*p_idx != -1) return &Buf[*p_idx]; *p_idx = FreeIdx; return Add(); }
+ bool Contains(const T* p) const { return (p >= Buf.Data && p < Buf.Data + Buf.Size); }
+ void Clear() { for (int n = 0; n < Map.Data.Size; n++) { int idx = Map.Data[n].val_i; if (idx != -1) Buf[idx].~T(); } Map.Clear(); Buf.clear(); FreeIdx = 0; }
+ T* Add() { int idx = FreeIdx; if (idx == Buf.Size) { Buf.resize(Buf.Size + 1); FreeIdx++; } else { FreeIdx = *(int*)&Buf[idx]; } IM_PLACEMENT_NEW(&Buf[idx]) T(); return &Buf[idx]; }
+ void Remove(ImGuiID key, const T* p) { Remove(key, GetIndex(p)); }
+ void Remove(ImGuiID key, ImPoolIdx idx) { Buf[idx].~T(); *(int*)&Buf[idx] = FreeIdx; FreeIdx = idx; Map.SetInt(key, -1); }
+ void Reserve(int capacity) { Buf.reserve(capacity); Map.Data.reserve(capacity); }
+ int GetSize() const { return Buf.Size; }
+};
+
+// Helper: ImChunkStream<>
+// Build and iterate a contiguous stream of variable-sized structures.
+// This is used by Settings to store persistent data while reducing allocation count.
+// We store the chunk size first, and align the final size on 4 bytes boundaries (this what the '(X + 3) & ~3' statement is for)
+// The tedious/zealous amount of casting is to avoid -Wcast-align warnings.
+template
+struct IMGUI_API ImChunkStream
+{
+ ImVector Buf;
+
+ void clear() { Buf.clear(); }
+ bool empty() const { return Buf.Size == 0; }
+ int size() const { return Buf.Size; }
+ T* alloc_chunk(size_t sz) { size_t HDR_SZ = 4; sz = ((HDR_SZ + sz) + 3u) & ~3u; int off = Buf.Size; Buf.resize(off + (int)sz); ((int*)(void*)(Buf.Data + off))[0] = (int)sz; return (T*)(void*)(Buf.Data + off + (int)HDR_SZ); }
+ T* begin() { size_t HDR_SZ = 4; if (!Buf.Data) return NULL; return (T*)(void*)(Buf.Data + HDR_SZ); }
+ T* next_chunk(T* p) { size_t HDR_SZ = 4; IM_ASSERT(p >= begin() && p < end()); p = (T*)(void*)((char*)(void*)p + chunk_size(p)); if (p == (T*)(void*)((char*)end() + HDR_SZ)) return (T*)0; IM_ASSERT(p < end()); return p; }
+ int chunk_size(const T* p) { return ((const int*)p)[-1]; }
+ T* end() { return (T*)(void*)(Buf.Data + Buf.Size); }
+ int offset_from_ptr(const T* p) { IM_ASSERT(p >= begin() && p < end()); const ptrdiff_t off = (const char*)p - Buf.Data; return (int)off; }
+ T* ptr_from_offset(int off) { IM_ASSERT(off >= 4 && off < Buf.Size); return (T*)(void*)(Buf.Data + off); }
+};
+
+//-----------------------------------------------------------------------------
+// Misc data structures
+//-----------------------------------------------------------------------------
+
enum ImGuiButtonFlags_
{
ImGuiButtonFlags_None = 0,
ImGuiButtonFlags_Repeat = 1 << 0, // hold to repeat
- ImGuiButtonFlags_PressedOnClickRelease = 1 << 1, // return true on click + release on same item [DEFAULT if no PressedOn* flag is set]
- ImGuiButtonFlags_PressedOnClick = 1 << 2, // return true on click (default requires click+release)
- ImGuiButtonFlags_PressedOnRelease = 1 << 3, // return true on release (default requires click+release)
- ImGuiButtonFlags_PressedOnDoubleClick = 1 << 4, // return true on double-click (default requires click+release)
- ImGuiButtonFlags_FlattenChildren = 1 << 5, // allow interactions even if a child window is overlapping
- ImGuiButtonFlags_AllowItemOverlap = 1 << 6, // require previous frame HoveredId to either match id or be null before being usable, use along with SetItemAllowOverlap()
- ImGuiButtonFlags_DontClosePopups = 1 << 7, // disable automatically closing parent popup on press // [UNUSED]
- ImGuiButtonFlags_Disabled = 1 << 8, // disable interactions
- ImGuiButtonFlags_AlignTextBaseLine = 1 << 9, // vertically align button to match text baseline - ButtonEx() only // FIXME: Should be removed and handled by SmallButton(), not possible currently because of DC.CursorPosPrevLine
- ImGuiButtonFlags_NoKeyModifiers = 1 << 10, // disable interaction if a key modifier is held
- ImGuiButtonFlags_NoHoldingActiveID = 1 << 11, // don't set ActiveId while holding the mouse (ImGuiButtonFlags_PressedOnClick only)
- ImGuiButtonFlags_PressedOnDragDropHold = 1 << 12, // press when held into while we are drag and dropping another item (used by e.g. tree nodes, collapsing headers)
- ImGuiButtonFlags_NoNavFocus = 1 << 13 // don't override navigation focus when activated
+ ImGuiButtonFlags_PressedOnClick = 1 << 1, // return true on click (mouse down event)
+ ImGuiButtonFlags_PressedOnClickRelease = 1 << 2, // [Default] return true on click + release on same item <-- this is what the majority of Button are using
+ ImGuiButtonFlags_PressedOnClickReleaseAnywhere = 1 << 3, // return true on click + release even if the release event is not done while hovering the item
+ ImGuiButtonFlags_PressedOnRelease = 1 << 4, // return true on release (default requires click+release)
+ ImGuiButtonFlags_PressedOnDoubleClick = 1 << 5, // return true on double-click (default requires click+release)
+ ImGuiButtonFlags_PressedOnDragDropHold = 1 << 6, // return true when held into while we are drag and dropping another item (used by e.g. tree nodes, collapsing headers)
+ ImGuiButtonFlags_FlattenChildren = 1 << 7, // allow interactions even if a child window is overlapping
+ ImGuiButtonFlags_AllowItemOverlap = 1 << 8, // require previous frame HoveredId to either match id or be null before being usable, use along with SetItemAllowOverlap()
+ ImGuiButtonFlags_DontClosePopups = 1 << 9, // disable automatically closing parent popup on press // [UNUSED]
+ ImGuiButtonFlags_Disabled = 1 << 10, // disable interactions
+ ImGuiButtonFlags_AlignTextBaseLine = 1 << 11, // vertically align button to match text baseline - ButtonEx() only // FIXME: Should be removed and handled by SmallButton(), not possible currently because of DC.CursorPosPrevLine
+ ImGuiButtonFlags_NoKeyModifiers = 1 << 12, // disable mouse interaction if a key modifier is held
+ ImGuiButtonFlags_NoHoldingActiveId = 1 << 13, // don't set ActiveId while holding the mouse (ImGuiButtonFlags_PressedOnClick only)
+ ImGuiButtonFlags_NoNavFocus = 1 << 14, // don't override navigation focus when activated
+ ImGuiButtonFlags_NoHoveredOnNav = 1 << 15, // don't report as hovered when navigated on
+ ImGuiButtonFlags_MouseButtonLeft = 1 << 16, // [Default] react on left mouse button
+ ImGuiButtonFlags_MouseButtonRight = 1 << 17, // react on right mouse button
+ ImGuiButtonFlags_MouseButtonMiddle = 1 << 18, // react on center mouse button
+
+ ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle,
+ ImGuiButtonFlags_MouseButtonShift_ = 16,
+ ImGuiButtonFlags_MouseButtonDefault_ = ImGuiButtonFlags_MouseButtonLeft,
+ ImGuiButtonFlags_PressedOnMask_ = ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClickReleaseAnywhere | ImGuiButtonFlags_PressedOnRelease | ImGuiButtonFlags_PressedOnDoubleClick | ImGuiButtonFlags_PressedOnDragDropHold,
+ ImGuiButtonFlags_PressedOnDefault_ = ImGuiButtonFlags_PressedOnClickRelease
};
enum ImGuiSliderFlags_
@@ -249,6 +448,12 @@ enum ImGuiSliderFlags_
ImGuiSliderFlags_Vertical = 1 << 0
};
+enum ImGuiDragFlags_
+{
+ ImGuiDragFlags_None = 0,
+ ImGuiDragFlags_Vertical = 1 << 0
+};
+
enum ImGuiColumnsFlags_
{
// Default: 0
@@ -260,20 +465,45 @@ enum ImGuiColumnsFlags_
ImGuiColumnsFlags_GrowParentContentsSize= 1 << 4 // (WIP) Restore pre-1.51 behavior of extending the parent window contents size but _without affecting the columns width at all_. Will eventually remove.
};
+// Extend ImGuiSelectableFlags_
enum ImGuiSelectableFlagsPrivate_
{
// NB: need to be in sync with last value of ImGuiSelectableFlags_
- ImGuiSelectableFlags_NoHoldingActiveID = 1 << 10,
- ImGuiSelectableFlags_PressedOnClick = 1 << 11,
- ImGuiSelectableFlags_PressedOnRelease = 1 << 12,
- ImGuiSelectableFlags_DrawFillAvailWidth = 1 << 13
+ ImGuiSelectableFlags_NoHoldingActiveID = 1 << 20,
+ ImGuiSelectableFlags_PressedOnClick = 1 << 21,
+ ImGuiSelectableFlags_PressedOnRelease = 1 << 22,
+ ImGuiSelectableFlags_DrawFillAvailWidth = 1 << 23, // FIXME: We may be able to remove this (added in 6251d379 for menus)
+ ImGuiSelectableFlags_DrawHoveredWhenHeld= 1 << 24, // Always show active when held, even is not hovered. This concept could probably be renamed/formalized somehow.
+ ImGuiSelectableFlags_SetNavIdOnHover = 1 << 25
+};
+
+// Extend ImGuiTreeNodeFlags_
+enum ImGuiTreeNodeFlagsPrivate_
+{
+ ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 20
};
enum ImGuiSeparatorFlags_
{
ImGuiSeparatorFlags_None = 0,
ImGuiSeparatorFlags_Horizontal = 1 << 0, // Axis default to current layout type, so generally Horizontal unless e.g. in a menu bar
- ImGuiSeparatorFlags_Vertical = 1 << 1
+ ImGuiSeparatorFlags_Vertical = 1 << 1,
+ ImGuiSeparatorFlags_SpanAllColumns = 1 << 2
+};
+
+// Transient per-window flags, reset at the beginning of the frame. For child window, inherited from parent on first Begin().
+// This is going to be exposed in imgui.h when stabilized enough.
+enum ImGuiItemFlags_
+{
+ ImGuiItemFlags_None = 0,
+ ImGuiItemFlags_NoTabStop = 1 << 0, // false
+ ImGuiItemFlags_ButtonRepeat = 1 << 1, // false // Button() will return true multiple times based on io.KeyRepeatDelay and io.KeyRepeatRate settings.
+ ImGuiItemFlags_Disabled = 1 << 2, // false // [BETA] Disable interactions but doesn't affect visuals yet. See github.com/ocornut/imgui/issues/211
+ ImGuiItemFlags_NoNav = 1 << 3, // false
+ ImGuiItemFlags_NoNavDefaultFocus = 1 << 4, // false
+ ImGuiItemFlags_SelectableDontClosePopup = 1 << 5, // false // MenuItem/Selectable() automatically closes current Popup window
+ ImGuiItemFlags_MixedValue = 1 << 6, // false // [BETA] Represent a mixed/indeterminate value, generally multi-selection where values differ. Currently only supported by Checkbox() (later should support all sorts of widgets)
+ ImGuiItemFlags_Default_ = 0
};
// Storage for LastItem data
@@ -282,16 +512,51 @@ enum ImGuiItemStatusFlags_
ImGuiItemStatusFlags_None = 0,
ImGuiItemStatusFlags_HoveredRect = 1 << 0,
ImGuiItemStatusFlags_HasDisplayRect = 1 << 1,
- ImGuiItemStatusFlags_Edited = 1 << 2 // Value exposed by item was edited in the current frame (should match the bool return value of most widgets)
+ ImGuiItemStatusFlags_Edited = 1 << 2, // Value exposed by item was edited in the current frame (should match the bool return value of most widgets)
+ ImGuiItemStatusFlags_ToggledSelection = 1 << 3, // Set when Selectable(), TreeNode() reports toggling a selection. We can't report "Selected" because reporting the change allows us to handle clipping with less issues.
+ ImGuiItemStatusFlags_ToggledOpen = 1 << 4, // Set when TreeNode() reports toggling their open state.
+ ImGuiItemStatusFlags_HasDeactivated = 1 << 5, // Set if the widget/group is able to provide data for the ImGuiItemStatusFlags_Deactivated flag.
+ ImGuiItemStatusFlags_Deactivated = 1 << 6 // Only valid if ImGuiItemStatusFlags_HasDeactivated is set.
+
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+ , // [imgui_tests only]
+ ImGuiItemStatusFlags_Openable = 1 << 10, //
+ ImGuiItemStatusFlags_Opened = 1 << 11, //
+ ImGuiItemStatusFlags_Checkable = 1 << 12, //
+ ImGuiItemStatusFlags_Checked = 1 << 13 //
+#endif
+};
+
+enum ImGuiTextFlags_
+{
+ ImGuiTextFlags_None = 0,
+ ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0
+};
+
+enum ImGuiTooltipFlags_
+{
+ ImGuiTooltipFlags_None = 0,
+ ImGuiTooltipFlags_OverridePreviousTooltip = 1 << 0 // Override will clear/ignore previously submitted tooltip (defaults to append)
};
// FIXME: this is in development, not exposed/functional as a generic feature yet.
+// Horizontal/Vertical enums are fixed to 0/1 so they may be used to index ImVec2
enum ImGuiLayoutType_
{
- ImGuiLayoutType_Vertical,
- ImGuiLayoutType_Horizontal
+ ImGuiLayoutType_Horizontal = 0,
+ ImGuiLayoutType_Vertical = 1
};
+enum ImGuiLogType
+{
+ ImGuiLogType_None = 0,
+ ImGuiLogType_TTY,
+ ImGuiLogType_File,
+ ImGuiLogType_Buffer,
+ ImGuiLogType_Clipboard
+};
+
+// X/Y enums are fixed to 0/1 so they may be used to index ImVec2
enum ImGuiAxis
{
ImGuiAxis_None = -1,
@@ -331,7 +596,7 @@ enum ImGuiNavHighlightFlags_
ImGuiNavHighlightFlags_None = 0,
ImGuiNavHighlightFlags_TypeDefault = 1 << 0,
ImGuiNavHighlightFlags_TypeThin = 1 << 1,
- ImGuiNavHighlightFlags_AlwaysDraw = 1 << 2,
+ ImGuiNavHighlightFlags_AlwaysDraw = 1 << 2, // Draw rectangular highlight if (g.NavId == id) _even_ when using the mouse.
ImGuiNavHighlightFlags_NoRounding = 1 << 3
};
@@ -351,7 +616,8 @@ enum ImGuiNavMoveFlags_
ImGuiNavMoveFlags_WrapX = 1 << 2, // On failed request, request from opposite side one line down (when NavDir==right) or one line up (when NavDir==left)
ImGuiNavMoveFlags_WrapY = 1 << 3, // This is not super useful for provided for completeness
ImGuiNavMoveFlags_AllowCurrentNavId = 1 << 4, // Allow scoring and considering the current NavId as a move target candidate. This is used when the move source is offset (e.g. pressing PageDown actually needs to send a Up move request, if we are pressing PageDown from the bottom-most item we need to stay in place)
- ImGuiNavMoveFlags_AlsoScoreVisibleSet = 1 << 5 // Store alternate result in NavMoveResultLocalVisibleSet that only comprise elements that are already fully visible.
+ ImGuiNavMoveFlags_AlsoScoreVisibleSet = 1 << 5, // Store alternate result in NavMoveResultLocalVisibleSet that only comprise elements that are already fully visible.
+ ImGuiNavMoveFlags_ScrollToEdge = 1 << 6
};
enum ImGuiNavForward
@@ -361,12 +627,36 @@ enum ImGuiNavForward
ImGuiNavForward_ForwardActive
};
+enum ImGuiNavLayer
+{
+ ImGuiNavLayer_Main = 0, // Main scrolling layer
+ ImGuiNavLayer_Menu = 1, // Menu layer (access with Alt/ImGuiNavInput_Menu)
+ ImGuiNavLayer_COUNT
+};
+
enum ImGuiPopupPositionPolicy
{
ImGuiPopupPositionPolicy_Default,
ImGuiPopupPositionPolicy_ComboBox
};
+// 1D vector (this odd construct is used to facilitate the transition between 1D and 2D, and the maintenance of some branches/patches)
+struct ImVec1
+{
+ float x;
+ ImVec1() { x = 0.0f; }
+ ImVec1(float _x) { x = _x; }
+};
+
+// 2D vector (half-size integer)
+struct ImVec2ih
+{
+ short x, y;
+ ImVec2ih() { x = y = 0; }
+ ImVec2ih(short _x, short _y) { x = _x; y = _y; }
+ explicit ImVec2ih(const ImVec2& rhs) { x = (short)rhs.x; y = (short)rhs.y; }
+};
+
// 2D axis aligned bounding-box
// NB: we can't rely on ImVec2 math operators being available here
struct IMGUI_API ImRect
@@ -374,7 +664,7 @@ struct IMGUI_API ImRect
ImVec2 Min; // Upper-left
ImVec2 Max; // Lower-right
- ImRect() : Min(FLT_MAX,FLT_MAX), Max(-FLT_MAX,-FLT_MAX) {}
+ ImRect() : Min(0.0f, 0.0f), Max(0.0f, 0.0f) {}
ImRect(const ImVec2& min, const ImVec2& max) : Min(min), Max(max) {}
ImRect(const ImVec4& v) : Min(v.x, v.y), Max(v.z, v.w) {}
ImRect(float x1, float y1, float x2, float y2) : Min(x1, y1), Max(x2, y2) {}
@@ -399,10 +689,18 @@ struct IMGUI_API ImRect
void TranslateY(float dy) { Min.y += dy; Max.y += dy; }
void ClipWith(const ImRect& r) { Min = ImMax(Min, r.Min); Max = ImMin(Max, r.Max); } // Simple version, may lead to an inverted rectangle, which is fine for Contains/Overlaps test but not for display.
void ClipWithFull(const ImRect& r) { Min = ImClamp(Min, r.Min, r.Max); Max = ImClamp(Max, r.Min, r.Max); } // Full version, ensure both points are fully clipped.
- void Floor() { Min.x = (float)(int)Min.x; Min.y = (float)(int)Min.y; Max.x = (float)(int)Max.x; Max.y = (float)(int)Max.y; }
+ void Floor() { Min.x = IM_FLOOR(Min.x); Min.y = IM_FLOOR(Min.y); Max.x = IM_FLOOR(Max.x); Max.y = IM_FLOOR(Max.y); }
bool IsInverted() const { return Min.x > Max.x || Min.y > Max.y; }
};
+// Type information associated to one ImGuiDataType. Retrieve with DataTypeGetInfo().
+struct ImGuiDataTypeInfo
+{
+ size_t Size; // Size in byte
+ const char* PrintFmt; // Default printf format for the type
+ const char* ScanFmt; // Default scanf format for the type
+};
+
// Stacked color modifier, backup of modified data so we can restore it
struct ImGuiColorMod
{
@@ -427,73 +725,78 @@ struct ImGuiGroupData
ImVec2 BackupCursorMaxPos;
ImVec1 BackupIndent;
ImVec1 BackupGroupOffset;
- ImVec2 BackupCurrentLineSize;
- float BackupCurrentLineTextBaseOffset;
- float BackupLogLinePosY;
+ ImVec2 BackupCurrLineSize;
+ float BackupCurrLineTextBaseOffset;
ImGuiID BackupActiveIdIsAlive;
bool BackupActiveIdPreviousFrameIsAlive;
- bool AdvanceCursor;
+ bool EmitItem;
};
// Simple column measurement, currently used for MenuItem() only.. This is very short-sighted/throw-away code and NOT a generic helper.
struct IMGUI_API ImGuiMenuColumns
{
- int Count;
float Spacing;
float Width, NextWidth;
- float Pos[4], NextWidths[4];
+ float Pos[3], NextWidths[3];
ImGuiMenuColumns();
void Update(int count, float spacing, bool clear);
float DeclColumns(float w0, float w1, float w2);
- float CalcExtraSpace(float avail_w);
+ float CalcExtraSpace(float avail_w) const;
};
// Internal state of the currently focused/edited text input box
struct IMGUI_API ImGuiInputTextState
{
ImGuiID ID; // widget id owning the text state
+ int CurLenW, CurLenA; // we need to maintain our buffer length in both UTF-8 and wchar format. UTF-8 len is valid even if TextA is not.
ImVector TextW; // edit buffer, we need to persist but can't guarantee the persistence of the user-provided buffer. so we copy into own buffer.
- ImVector InitialText; // backup of end-user buffer at the time of focus (in UTF-8, unaltered)
- ImVector TempBuffer; // temporary buffer for callback and other other operations. size=capacity.
- int CurLenA, CurLenW; // we need to maintain our buffer length in both UTF-8 and wchar format.
+ ImVector TextA; // temporary UTF8 buffer for callbacks and other operations. this is not updated in every code-path! size=capacity.
+ ImVector InitialTextA; // backup of end-user buffer at the time of focus (in UTF-8, unaltered)
+ bool TextAIsValid; // temporary UTF8 buffer is not initially valid before we make the widget active (until then we pull the data from user argument)
int BufCapacityA; // end-user buffer capacity
- float ScrollX;
- ImGuiStb::STB_TexteditState StbState;
- float CursorAnim;
- bool CursorFollow;
- bool SelectedAllMouseLock;
+ float ScrollX; // horizontal scrolling/offset
+ ImStb::STB_TexteditState Stb; // state for stb_textedit.h
+ float CursorAnim; // timer for cursor blink, reset on every user action so the cursor reappears immediately
+ bool CursorFollow; // set when we want scrolling to follow the current cursor position (not always!)
+ bool SelectedAllMouseLock; // after a double-click to select all, we ignore further mouse drags to update selection
+ ImGuiInputTextFlags UserFlags; // Temporarily set while we call user's callback
+ ImGuiInputTextCallback UserCallback; // "
+ void* UserCallbackData; // "
- // Temporarily set when active
- ImGuiInputTextFlags UserFlags;
- ImGuiInputTextCallback UserCallback;
- void* UserCallbackData;
+ ImGuiInputTextState() { memset(this, 0, sizeof(*this)); }
+ void ClearText() { CurLenW = CurLenA = 0; TextW[0] = 0; TextA[0] = 0; CursorClamp(); }
+ void ClearFreeMemory() { TextW.clear(); TextA.clear(); InitialTextA.clear(); }
+ int GetUndoAvailCount() const { return Stb.undostate.undo_point; }
+ int GetRedoAvailCount() const { return STB_TEXTEDIT_UNDOSTATECOUNT - Stb.undostate.redo_point; }
+ void OnKeyPressed(int key); // Cannot be inline because we call in code in stb_textedit.h implementation
- ImGuiInputTextState() { memset(this, 0, sizeof(*this)); }
- void CursorAnimReset() { CursorAnim = -0.30f; } // After a user-input the cursor stays on for a while without blinking
- void CursorClamp() { StbState.cursor = ImMin(StbState.cursor, CurLenW); StbState.select_start = ImMin(StbState.select_start, CurLenW); StbState.select_end = ImMin(StbState.select_end, CurLenW); }
- bool HasSelection() const { return StbState.select_start != StbState.select_end; }
- void ClearSelection() { StbState.select_start = StbState.select_end = StbState.cursor; }
- void SelectAll() { StbState.select_start = 0; StbState.cursor = StbState.select_end = CurLenW; StbState.has_preferred_x = false; }
- void OnKeyPressed(int key); // Cannot be inline because we call in code in stb_textedit.h implementation
+ // Cursor & Selection
+ void CursorAnimReset() { CursorAnim = -0.30f; } // After a user-input the cursor stays on for a while without blinking
+ void CursorClamp() { Stb.cursor = ImMin(Stb.cursor, CurLenW); Stb.select_start = ImMin(Stb.select_start, CurLenW); Stb.select_end = ImMin(Stb.select_end, CurLenW); }
+ bool HasSelection() const { return Stb.select_start != Stb.select_end; }
+ void ClearSelection() { Stb.select_start = Stb.select_end = Stb.cursor; }
+ void SelectAll() { Stb.select_start = 0; Stb.cursor = Stb.select_end = CurLenW; Stb.has_preferred_x = 0; }
};
// Windows data saved in imgui.ini file
+// Because we never destroy or rename ImGuiWindowSettings, we can store the names in a separate buffer easily.
+// (this is designed to be stored in a ImChunkStream buffer, with the variable-length Name following our structure)
struct ImGuiWindowSettings
{
- char* Name;
ImGuiID ID;
- ImVec2 Pos;
- ImVec2 Size;
+ ImVec2ih Pos;
+ ImVec2ih Size;
bool Collapsed;
- ImGuiWindowSettings() { Name = NULL; ID = 0; Pos = Size = ImVec2(0,0); Collapsed = false; }
+ ImGuiWindowSettings() { ID = 0; Pos = Size = ImVec2ih(0, 0); Collapsed = false; }
+ char* GetName() { return (char*)(this + 1); }
};
struct ImGuiSettingsHandler
{
- const char* TypeName; // Short description stored in .ini file. Disallowed characters: '[' ']'
- ImGuiID TypeHash; // == ImHash(TypeName, 0, 0)
+ const char* TypeName; // Short description stored in .ini file. Disallowed characters: '[' ']'
+ ImGuiID TypeHash; // == ImHashStr(TypeName)
void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name); // Read: Called when entering into a new ini entry e.g. "[Window][Name]"
void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line); // Read: Called for every line of text within an ini entry
void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf); // Write: Output every entries into 'out_buf'
@@ -503,15 +806,17 @@ struct ImGuiSettingsHandler
};
// Storage for current popup stack
-struct ImGuiPopupRef
+struct ImGuiPopupData
{
ImGuiID PopupId; // Set on OpenPopup()
ImGuiWindow* Window; // Resolved on BeginPopup() - may stay unresolved if user never calls OpenPopup()
- ImGuiWindow* ParentWindow; // Set on OpenPopup()
+ ImGuiWindow* SourceWindow; // Set on OpenPopup() copy of NavWindow at the time of opening the popup
int OpenFrameCount; // Set on OpenPopup()
- ImGuiID OpenParentId; // Set on OpenPopup(), we need this to differenciate multiple menu sets from each others (e.g. inside menu bar vs loose menu items)
+ ImGuiID OpenParentId; // Set on OpenPopup(), we need this to differentiate multiple menu sets from each others (e.g. inside menu bar vs loose menu items)
ImVec2 OpenPopupPos; // Set on OpenPopup(), preferred popup position (typically == OpenMousePos when using mouse)
ImVec2 OpenMousePos; // Set on OpenPopup(), copy of mouse position at the time of opening popup
+
+ ImGuiPopupData() { PopupId = 0; Window = SourceWindow = NULL; OpenFrameCount = -1; OpenParentId = 0; }
};
struct ImGuiColumnData
@@ -521,10 +826,10 @@ struct ImGuiColumnData
ImGuiColumnsFlags Flags; // Not exposed
ImRect ClipRect;
- ImGuiColumnData() { OffsetNorm = OffsetNormBeforeResize = 0.0f; Flags = 0; }
+ ImGuiColumnData() { OffsetNorm = OffsetNormBeforeResize = 0.0f; Flags = ImGuiColumnsFlags_None; }
};
-struct ImGuiColumnsSet
+struct ImGuiColumns
{
ImGuiID ID;
ImGuiColumnsFlags Flags;
@@ -532,43 +837,55 @@ struct ImGuiColumnsSet
bool IsBeingResized;
int Current;
int Count;
- float MinX, MaxX;
+ float OffMinX, OffMaxX; // Offsets from HostWorkRect.Min.x
float LineMinY, LineMaxY;
- float StartPosY; // Copy of CursorPos
- float StartMaxPosX; // Copy of CursorMaxPos
+ float HostCursorPosY; // Backup of CursorPos at the time of BeginColumns()
+ float HostCursorMaxPosX; // Backup of CursorMaxPos at the time of BeginColumns()
+ ImRect HostClipRect; // Backup of ClipRect at the time of BeginColumns()
+ ImRect HostWorkRect; // Backup of WorkRect at the time of BeginColumns()
ImVector Columns;
+ ImDrawListSplitter Splitter;
- ImGuiColumnsSet() { Clear(); }
+ ImGuiColumns() { Clear(); }
void Clear()
{
ID = 0;
- Flags = 0;
+ Flags = ImGuiColumnsFlags_None;
IsFirstFrame = false;
IsBeingResized = false;
Current = 0;
Count = 1;
- MinX = MaxX = 0.0f;
+ OffMinX = OffMaxX = 0.0f;
LineMinY = LineMaxY = 0.0f;
- StartPosY = 0.0f;
- StartMaxPosX = 0.0f;
+ HostCursorPosY = 0.0f;
+ HostCursorMaxPosX = 0.0f;
Columns.clear();
}
};
+// Helper function to calculate a circle's segment count given its radius and a "maximum error" value.
+#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MIN 12
+#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX 512
+#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(_RAD,_MAXERROR) ImClamp((int)((IM_PI * 2.0f) / ImAcos((_RAD - _MAXERROR) / _RAD)), IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MIN, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX)
+
// Data shared between all ImDrawList instances
+// You may want to create your own instance of this if you want to use ImDrawList completely without ImGui. In that case, watch out for future changes to this structure.
struct IMGUI_API ImDrawListSharedData
{
ImVec2 TexUvWhitePixel; // UV of white pixel in the atlas
ImFont* Font; // Current/default font (optional, for simplified AddText overload)
float FontSize; // Current/default font size (optional, for simplified AddText overload)
- float CurveTessellationTol;
+ float CurveTessellationTol; // Tessellation tolerance when using PathBezierCurveTo()
+ float CircleSegmentMaxError; // Number of circle segments to use per pixel of radius for AddCircle() etc
ImVec4 ClipRectFullscreen; // Value for PushClipRectFullscreen()
+ ImDrawListFlags InitialFlags; // Initial flags at the beginning of the frame (it is possible to alter flags on a per-drawlist basis afterwards)
- // Const data
- // FIXME: Bake rounded corners fill/borders in atlas
- ImVec2 CircleVtx12[12];
+ // [Internal] Lookup tables
+ ImVec2 CircleVtx12[12]; // FIXME: Bake rounded corners fill/borders in atlas
+ ImU8 CircleSegmentCounts[64]; // Precomputed segment count for given radius (array index + 1) before we calculate it dynamically (to avoid calculation overhead)
ImDrawListSharedData();
+ void SetCircleSegmentMaxError(float max_error);
};
struct ImDrawDataBuilder
@@ -582,134 +899,182 @@ struct ImDrawDataBuilder
struct ImGuiNavMoveResult
{
- ImGuiID ID; // Best candidate
- ImGuiWindow* Window; // Best candidate window
- float DistBox; // Best candidate box distance to current NavId
- float DistCenter; // Best candidate center distance to current NavId
- float DistAxial;
- ImRect RectRel; // Best candidate bounding box in window relative space
+ ImGuiWindow* Window; // Best candidate window
+ ImGuiID ID; // Best candidate ID
+ ImGuiID FocusScopeId; // Best candidate focus scope ID
+ float DistBox; // Best candidate box distance to current NavId
+ float DistCenter; // Best candidate center distance to current NavId
+ float DistAxial;
+ ImRect RectRel; // Best candidate bounding box in window relative space
ImGuiNavMoveResult() { Clear(); }
- void Clear() { ID = 0; Window = NULL; DistBox = DistCenter = DistAxial = FLT_MAX; RectRel = ImRect(); }
+ void Clear() { Window = NULL; ID = FocusScopeId = 0; DistBox = DistCenter = DistAxial = FLT_MAX; RectRel = ImRect(); }
+};
+
+enum ImGuiNextWindowDataFlags_
+{
+ ImGuiNextWindowDataFlags_None = 0,
+ ImGuiNextWindowDataFlags_HasPos = 1 << 0,
+ ImGuiNextWindowDataFlags_HasSize = 1 << 1,
+ ImGuiNextWindowDataFlags_HasContentSize = 1 << 2,
+ ImGuiNextWindowDataFlags_HasCollapsed = 1 << 3,
+ ImGuiNextWindowDataFlags_HasSizeConstraint = 1 << 4,
+ ImGuiNextWindowDataFlags_HasFocus = 1 << 5,
+ ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6
};
// Storage for SetNexWindow** functions
struct ImGuiNextWindowData
{
- ImGuiCond PosCond;
- ImGuiCond SizeCond;
- ImGuiCond ContentSizeCond;
- ImGuiCond CollapsedCond;
- ImGuiCond SizeConstraintCond;
- ImGuiCond FocusCond;
- ImGuiCond BgAlphaCond;
- ImVec2 PosVal;
- ImVec2 PosPivotVal;
- ImVec2 SizeVal;
- ImVec2 ContentSizeVal;
- bool CollapsedVal;
- ImRect SizeConstraintRect;
- ImGuiSizeCallback SizeCallback;
- void* SizeCallbackUserData;
- float BgAlphaVal;
- ImVec2 MenuBarOffsetMinVal; // This is not exposed publicly, so we don't clear it.
+ ImGuiNextWindowDataFlags Flags;
+ ImGuiCond PosCond;
+ ImGuiCond SizeCond;
+ ImGuiCond CollapsedCond;
+ ImVec2 PosVal;
+ ImVec2 PosPivotVal;
+ ImVec2 SizeVal;
+ ImVec2 ContentSizeVal;
+ bool CollapsedVal;
+ ImRect SizeConstraintRect;
+ ImGuiSizeCallback SizeCallback;
+ void* SizeCallbackUserData;
+ float BgAlphaVal; // Override background alpha
+ ImVec2 MenuBarOffsetMinVal; // *Always on* This is not exposed publicly, so we don't clear it.
- ImGuiNextWindowData()
- {
- PosCond = SizeCond = ContentSizeCond = CollapsedCond = SizeConstraintCond = FocusCond = BgAlphaCond = 0;
- PosVal = PosPivotVal = SizeVal = ImVec2(0.0f, 0.0f);
- ContentSizeVal = ImVec2(0.0f, 0.0f);
- CollapsedVal = false;
- SizeConstraintRect = ImRect();
- SizeCallback = NULL;
- SizeCallbackUserData = NULL;
- BgAlphaVal = FLT_MAX;
- MenuBarOffsetMinVal = ImVec2(0.0f, 0.0f);
- }
-
- void Clear()
- {
- PosCond = SizeCond = ContentSizeCond = CollapsedCond = SizeConstraintCond = FocusCond = BgAlphaCond = 0;
- }
+ ImGuiNextWindowData() { memset(this, 0, sizeof(*this)); }
+ inline void ClearFlags() { Flags = ImGuiNextWindowDataFlags_None; }
};
-// Main imgui context
+enum ImGuiNextItemDataFlags_
+{
+ ImGuiNextItemDataFlags_None = 0,
+ ImGuiNextItemDataFlags_HasWidth = 1 << 0,
+ ImGuiNextItemDataFlags_HasOpen = 1 << 1
+};
+
+struct ImGuiNextItemData
+{
+ ImGuiNextItemDataFlags Flags;
+ float Width; // Set by SetNextItemWidth()
+ ImGuiID FocusScopeId; // Set by SetNextItemMultiSelectData() (!= 0 signify value has been set, so it's an alternate version of HasSelectionData, we don't use Flags for this because they are cleared too early. This is mostly used for debugging)
+ ImGuiCond OpenCond;
+ bool OpenVal; // Set by SetNextItemOpen()
+
+ ImGuiNextItemData() { memset(this, 0, sizeof(*this)); }
+ inline void ClearFlags() { Flags = ImGuiNextItemDataFlags_None; } // Also cleared manually by ItemAdd()!
+};
+
+//-----------------------------------------------------------------------------
+// Tabs
+//-----------------------------------------------------------------------------
+
+struct ImGuiShrinkWidthItem
+{
+ int Index;
+ float Width;
+};
+
+struct ImGuiPtrOrIndex
+{
+ void* Ptr; // Either field can be set, not both. e.g. Dock node tab bars are loose while BeginTabBar() ones are in a pool.
+ int Index; // Usually index in a main pool.
+
+ ImGuiPtrOrIndex(void* ptr) { Ptr = ptr; Index = -1; }
+ ImGuiPtrOrIndex(int index) { Ptr = NULL; Index = index; }
+};
+
+//-----------------------------------------------------------------------------
+// Main Dear ImGui context
+//-----------------------------------------------------------------------------
+
struct ImGuiContext
{
bool Initialized;
- bool FrameScopeActive; // Set by NewFrame(), cleared by EndFrame()/Render()
- bool FontAtlasOwnedByContext; // Io.Fonts-> is owned by the ImGuiContext and will be destructed along with it.
+ bool FontAtlasOwnedByContext; // IO.Fonts-> is owned by the ImGuiContext and will be destructed along with it.
ImGuiIO IO;
ImGuiStyle Style;
ImFont* Font; // (Shortcut) == FontStack.empty() ? IO.Font : FontStack.back()
float FontSize; // (Shortcut) == FontBaseSize * g.CurrentWindow->FontWindowScale == window->FontSize(). Text height for current window.
float FontBaseSize; // (Shortcut) == IO.FontGlobalScale * Font->Scale * Font->FontSize. Base text height.
ImDrawListSharedData DrawListSharedData;
-
double Time;
int FrameCount;
int FrameCountEnded;
int FrameCountRendered;
+ bool WithinFrameScope; // Set by NewFrame(), cleared by EndFrame()
+ bool WithinFrameScopeWithImplicitWindow; // Set by NewFrame(), cleared by EndFrame() when the implicit debug window has been pushed
+ bool WithinEndChild; // Set within EndChild()
+
+ // Windows state
ImVector Windows; // Windows, sorted in display order, back to front
- ImVector WindowsFocusOrder; // Windows, sorted in focus order, back to front
- ImVector WindowsSortBuffer;
+ ImVector WindowsFocusOrder; // Windows, sorted in focus order, back to front. (FIXME: We could only store root windows here! Need to sort out the Docking equivalent which is RootWindowDockStop and is unfortunately a little more dynamic)
+ ImVector WindowsTempSortBuffer; // Temporary buffer used in EndFrame() to reorder windows so parents are kept before their child
ImVector CurrentWindowStack;
- ImGuiStorage WindowsById;
- int WindowsActiveCount;
- ImGuiWindow* CurrentWindow; // Being drawn into
+ ImGuiStorage WindowsById; // Map window's ImGuiID to ImGuiWindow*
+ int WindowsActiveCount; // Number of unique windows submitted by frame
+ ImGuiWindow* CurrentWindow; // Window being drawn into
ImGuiWindow* HoveredWindow; // Will catch mouse inputs
ImGuiWindow* HoveredRootWindow; // Will catch mouse inputs (for focus/move only)
+ ImGuiWindow* MovingWindow; // Track the window we clicked on (in order to preserve focus). The actually window that is moved is generally MovingWindow->RootWindow.
+ ImGuiWindow* WheelingWindow; // Track the window we started mouse-wheeling on. Until a timer elapse or mouse has moved, generally keep scrolling the same window even if during the course of scrolling the mouse ends up hovering a child window.
+ ImVec2 WheelingWindowRefMousePos;
+ float WheelingWindowTimer;
+
+ // Item/widgets state and tracking information
ImGuiID HoveredId; // Hovered widget
bool HoveredIdAllowOverlap;
ImGuiID HoveredIdPreviousFrame;
float HoveredIdTimer; // Measure contiguous hovering time
float HoveredIdNotActiveTimer; // Measure contiguous hovering time where the item has not been active
ImGuiID ActiveId; // Active widget
- ImGuiID ActiveIdPreviousFrame;
ImGuiID ActiveIdIsAlive; // Active widget has been seen this frame (we can't use a bool as the ActiveId may change within the frame)
float ActiveIdTimer;
bool ActiveIdIsJustActivated; // Set at the time of activation for one frame
bool ActiveIdAllowOverlap; // Active widget allows another widget to steal active id (generally for overlapping widgets, but not always)
- bool ActiveIdHasBeenEdited; // Was the value associated to the widget Edited over the course of the Active state.
- bool ActiveIdPreviousFrameIsAlive;
- bool ActiveIdPreviousFrameHasBeenEdited;
- int ActiveIdAllowNavDirFlags; // Active widget allows using directional navigation (e.g. can activate a button and move away from it)
+ bool ActiveIdHasBeenPressedBefore; // Track whether the active id led to a press (this is to allow changing between PressOnClick and PressOnRelease without pressing twice). Used by range_select branch.
+ bool ActiveIdHasBeenEditedBefore; // Was the value associated to the widget Edited over the course of the Active state.
+ bool ActiveIdHasBeenEditedThisFrame;
+ ImU32 ActiveIdUsingNavDirMask; // Active widget will want to read those directional navigation requests (e.g. can activate a button and move away from it)
+ ImU32 ActiveIdUsingNavInputMask; // Active widget will want to read those nav inputs.
+ ImU64 ActiveIdUsingKeyInputMask; // Active widget will want to read those key inputs. When we grow the ImGuiKey enum we'll need to either to order the enum to make useful keys come first, either redesign this into e.g. a small array.
ImVec2 ActiveIdClickOffset; // Clicked offset from upper-left corner, if applicable (currently only set by ButtonBehavior)
ImGuiWindow* ActiveIdWindow;
- ImGuiWindow* ActiveIdPreviousFrameWindow;
ImGuiInputSource ActiveIdSource; // Activating with mouse or nav (gamepad/keyboard)
+ int ActiveIdMouseButton;
+ ImGuiID ActiveIdPreviousFrame;
+ bool ActiveIdPreviousFrameIsAlive;
+ bool ActiveIdPreviousFrameHasBeenEditedBefore;
+ ImGuiWindow* ActiveIdPreviousFrameWindow;
ImGuiID LastActiveId; // Store the last non-zero ActiveId, useful for animation.
float LastActiveIdTimer; // Store the last non-zero ActiveId timer since the beginning of activation, useful for animation.
- ImGuiWindow* MovingWindow; // Track the window we clicked on (in order to preserve focus). The actually window that is moved is generally MovingWindow->RootWindow.
- ImVector ColorModifiers; // Stack for PushStyleColor()/PopStyleColor()
+
+ // Next window/item data
+ ImGuiNextWindowData NextWindowData; // Storage for SetNextWindow** functions
+ ImGuiNextItemData NextItemData; // Storage for SetNextItem** functions
+
+ // Shared stacks
+ ImVector ColorModifiers; // Stack for PushStyleColor()/PopStyleColor()
ImVector StyleModifiers; // Stack for PushStyleVar()/PopStyleVar()
ImVector FontStack; // Stack for PushFont()/PopFont()
- ImVector OpenPopupStack; // Which popups are open (persistent)
- ImVector CurrentPopupStack; // Which level of BeginPopup() we are in (reset every frame)
- ImGuiNextWindowData NextWindowData; // Storage for SetNextWindow** functions
- bool NextTreeNodeOpenVal; // Storage for SetNextTreeNode** functions
- ImGuiCond NextTreeNodeOpenCond;
+ ImVectorOpenPopupStack; // Which popups are open (persistent)
+ ImVectorBeginPopupStack; // Which level of BeginPopup() we are in (reset every frame)
- // Navigation data (for gamepad/keyboard)
+ // Gamepad/keyboard Navigation
ImGuiWindow* NavWindow; // Focused window for navigation. Could be called 'FocusWindow'
ImGuiID NavId; // Focused item for navigation
+ ImGuiID NavFocusScopeId;
ImGuiID NavActivateId; // ~~ (g.ActiveId == 0) && IsNavInputPressed(ImGuiNavInput_Activate) ? NavId : 0, also set when calling ActivateItem()
ImGuiID NavActivateDownId; // ~~ IsNavInputDown(ImGuiNavInput_Activate) ? NavId : 0
ImGuiID NavActivatePressedId; // ~~ IsNavInputPressed(ImGuiNavInput_Activate) ? NavId : 0
ImGuiID NavInputId; // ~~ IsNavInputPressed(ImGuiNavInput_Input) ? NavId : 0
ImGuiID NavJustTabbedId; // Just tabbed to this id.
- ImGuiID NavJustMovedToId; // Just navigated to this id (result of a successfully MoveRequest)
- ImGuiID NavNextActivateId; // Set by ActivateItem(), queued until next frame
- ImGuiInputSource NavInputSource; // Keyboard or Gamepad mode?
+ ImGuiID NavJustMovedToId; // Just navigated to this id (result of a successfully MoveRequest).
+ ImGuiID NavJustMovedToFocusScopeId; // Just navigated to this focus scope id (result of a successfully MoveRequest).
+ ImGuiID NavNextActivateId; // Set by ActivateItem(), queued until next frame.
+ ImGuiInputSource NavInputSource; // Keyboard or Gamepad mode? THIS WILL ONLY BE None or NavGamepad or NavKeyboard.
ImRect NavScoringRectScreen; // Rectangle used for scoring, in screen space. Based of window->DC.NavRefRectRel[], modified for directional navigation scoring.
int NavScoringCount; // Metrics for debugging
- ImGuiWindow* NavWindowingTarget; // When selecting a window (holding Menu+FocusPrev/Next, or equivalent of CTRL-TAB) this window is temporarily displayed front-most.
- ImGuiWindow* NavWindowingTargetAnim; // Record of last valid NavWindowingTarget until DimBgRatio and NavWindowingHighlightAlpha becomes 0.0f
- ImGuiWindow* NavWindowingList;
- float NavWindowingTimer;
- float NavWindowingHighlightAlpha;
- bool NavWindowingToggleLayer;
- int NavLayer; // Layer we are navigating on. For now the system is hard-coded for 0=main contents and 1=menu/title bar, may expose layers later.
+ ImGuiNavLayer NavLayer; // Layer we are navigating on. For now the system is hard-coded for 0=main contents and 1=menu/title bar, may expose layers later.
int NavIdTabCounter; // == NavWindow->DC.FocusIdxTabCounter at time of NavId processing
bool NavIdIsAlive; // Nav widget has been seen this frame ~~ NavRefRectRel is valid
bool NavMousePosDirty; // When set we will update mouse position if (io.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) if set (NB: this not enabled by default)
@@ -725,62 +1090,101 @@ struct ImGuiContext
ImGuiNavMoveFlags NavMoveRequestFlags;
ImGuiNavForward NavMoveRequestForward; // None / ForwardQueued / ForwardActive (this is used to navigate sibling parent menus from a child menu)
ImGuiDir NavMoveDir, NavMoveDirLast; // Direction of the move request (left/right/up/down), direction of the previous move request
- ImGuiDir NavMoveClipDir;
+ ImGuiDir NavMoveClipDir; // FIXME-NAV: Describe the purpose of this better. Might want to rename?
ImGuiNavMoveResult NavMoveResultLocal; // Best move request candidate within NavWindow
ImGuiNavMoveResult NavMoveResultLocalVisibleSet; // Best move request candidate within NavWindow that are mostly visible (when using ImGuiNavMoveFlags_AlsoScoreVisibleSet flag)
ImGuiNavMoveResult NavMoveResultOther; // Best move request candidate within NavWindow's flattened hierarchy (when using ImGuiWindowFlags_NavFlattened flag)
+ // Navigation: Windowing (CTRL+TAB, holding Menu button + directional pads to move/resize)
+ ImGuiWindow* NavWindowingTarget; // When selecting a window (holding Menu+FocusPrev/Next, or equivalent of CTRL-TAB) this window is temporarily displayed top-most.
+ ImGuiWindow* NavWindowingTargetAnim; // Record of last valid NavWindowingTarget until DimBgRatio and NavWindowingHighlightAlpha becomes 0.0f
+ ImGuiWindow* NavWindowingList;
+ float NavWindowingTimer;
+ float NavWindowingHighlightAlpha;
+ bool NavWindowingToggleLayer;
+
+ // Legacy Focus/Tabbing system (older than Nav, active even if Nav is disabled, misnamed. FIXME-NAV: This needs a redesign!)
+ ImGuiWindow* FocusRequestCurrWindow; //
+ ImGuiWindow* FocusRequestNextWindow; //
+ int FocusRequestCurrCounterRegular; // Any item being requested for focus, stored as an index (we on layout to be stable between the frame pressing TAB and the next frame, semi-ouch)
+ int FocusRequestCurrCounterTabStop; // Tab item being requested for focus, stored as an index
+ int FocusRequestNextCounterRegular; // Stored for next frame
+ int FocusRequestNextCounterTabStop; // "
+ bool FocusTabPressed; //
+
// Render
ImDrawData DrawData; // Main ImDrawData instance to pass render information to the user
ImDrawDataBuilder DrawDataBuilder;
float DimBgRatio; // 0.0..1.0 animation when fading in a dimming background (for modal window and CTRL+TAB list)
- ImDrawList OverlayDrawList; // Optional software render of mouse cursors, if io.MouseDrawCursor is set + a few debug overlays
+ ImDrawList BackgroundDrawList; // First draw list to be rendered.
+ ImDrawList ForegroundDrawList; // Last draw list to be rendered. This is where we the render software mouse cursor (if io.MouseDrawCursor is set) and most debug overlays.
ImGuiMouseCursor MouseCursor;
// Drag and Drop
bool DragDropActive;
- bool DragDropWithinSourceOrTarget;
+ bool DragDropWithinSourceOrTarget; // Set when within a BeginDragDropXXX/EndDragDropXXX block.
ImGuiDragDropFlags DragDropSourceFlags;
int DragDropSourceFrameCount;
int DragDropMouseButton;
ImGuiPayload DragDropPayload;
- ImRect DragDropTargetRect;
+ ImRect DragDropTargetRect; // Store rectangle of current target candidate (we favor small targets when overlapping)
ImGuiID DragDropTargetId;
ImGuiDragDropFlags DragDropAcceptFlags;
float DragDropAcceptIdCurrRectSurface; // Target item surface (we resolve overlapping targets by prioritizing the smaller surface)
ImGuiID DragDropAcceptIdCurr; // Target item id (set at the time of accepting the payload)
ImGuiID DragDropAcceptIdPrev; // Target item id from previous frame (we need to store this to allow for overlapping drag and drop targets)
int DragDropAcceptFrameCount; // Last time a target expressed a desire to accept the source
- ImVector DragDropPayloadBufHeap; // We don't expose the ImVector<> directly
- unsigned char DragDropPayloadBufLocal[8]; // Local buffer for small payloads
+ ImVector DragDropPayloadBufHeap; // We don't expose the ImVector<> directly, ImGuiPayload only holds pointer+size
+ unsigned char DragDropPayloadBufLocal[16]; // Local buffer for small payloads
+
+ // Tab bars
+ ImGuiTabBar* CurrentTabBar;
+ ImPool TabBars;
+ ImVector CurrentTabBarStack;
+ ImVector ShrinkWidthBuffer;
// Widget state
+ ImVec2 LastValidMousePos;
ImGuiInputTextState InputTextState;
ImFont InputTextPasswordFont;
- ImGuiID ScalarAsInputTextId; // Temporary text input when CTRL+clicking on a slider, etc.
+ ImGuiID TempInputTextId; // Temporary text input when CTRL+clicking on a slider, etc.
ImGuiColorEditFlags ColorEditOptions; // Store user options for color edit widgets
- ImVec4 ColorPickerRef;
+ float ColorEditLastHue; // Backup of last Hue associated to LastColor[3], so we can restore Hue in lossy RGB<>HSV round trips
+ float ColorEditLastSat; // Backup of last Saturation associated to LastColor[3], so we can restore Saturation in lossy RGB<>HSV round trips
+ float ColorEditLastColor[3];
+ ImVec4 ColorPickerRef; // Initial/reference color at the time of opening the color picker.
bool DragCurrentAccumDirty;
float DragCurrentAccum; // Accumulator for dragging modification. Always high-precision, not rounded by end-user precision settings
float DragSpeedDefaultRatio; // If speed == 0.0f, uses (max-min) * DragSpeedDefaultRatio
- ImVec2 ScrollbarClickDeltaToGrabCenter; // Distance between mouse and center of grab box, normalized in parent space. Use storage?
+ float ScrollbarClickDeltaToGrabCenter; // Distance between mouse and center of grab box, normalized in parent space. Use storage?
int TooltipOverrideCount;
ImVector PrivateClipboard; // If no custom clipboard handler is defined
- ImVec2 PlatformImePos, PlatformImeLastPos; // Cursor position request & last passed to the OS Input Method Editor
+
+ // Platform support
+ ImVec2 PlatformImePos; // Cursor position request & last passed to the OS Input Method Editor
+ ImVec2 PlatformImeLastPos;
// Settings
- bool SettingsLoaded;
- float SettingsDirtyTimer; // Save .ini Settings to memory when time reaches zero
- ImGuiTextBuffer SettingsIniData; // In memory .ini settings
- ImVector SettingsHandlers; // List of .ini settings handlers
- ImVector SettingsWindows; // ImGuiWindow .ini settings entries (parsed from the last loaded .ini file and maintained on saving)
+ bool SettingsLoaded;
+ float SettingsDirtyTimer; // Save .ini Settings to memory when time reaches zero
+ ImGuiTextBuffer SettingsIniData; // In memory .ini settings
+ ImVector SettingsHandlers; // List of .ini settings handlers
+ ImChunkStream SettingsWindows; // ImGuiWindow .ini settings entries
- // Logging
+ // Capture/Logging
bool LogEnabled;
- FILE* LogFile; // If != NULL log to stdout/ file
- ImGuiTextBuffer LogClipboard; // Accumulation buffer when log to clipboard. This is pointer so our GImGui static constructor doesn't call heap allocators.
- int LogStartDepth;
- int LogAutoExpandMaxDepth;
+ ImGuiLogType LogType;
+ ImFileHandle LogFile; // If != NULL log to stdout/ file
+ ImGuiTextBuffer LogBuffer; // Accumulation buffer when log to clipboard. This is pointer so our GImGui static constructor doesn't call heap allocators.
+ float LogLinePosY;
+ bool LogLineFirstItem;
+ int LogDepthRef;
+ int LogDepthToExpand;
+ int LogDepthToExpandDefault; // Default/stored value for LogDepthMaxExpand if not specified in the LogXXX function call.
+
+ // Debug Tools
+ bool DebugItemPickerActive;
+ ImGuiID DebugItemPickerBreakId; // Will call IM_DEBUG_BREAK() when encountering this id
// Misc
float FramerateSecPerFrame[120]; // Calculate estimate of framerate for user over the last 2 seconds.
@@ -791,55 +1195,59 @@ struct ImGuiContext
int WantTextInputNextFrame;
char TempBuffer[1024*3+1]; // Temporary text buffer
- ImGuiContext(ImFontAtlas* shared_font_atlas) : OverlayDrawList(NULL)
+ ImGuiContext(ImFontAtlas* shared_font_atlas) : BackgroundDrawList(&DrawListSharedData), ForegroundDrawList(&DrawListSharedData)
{
Initialized = false;
- FrameScopeActive = false;
Font = NULL;
FontSize = FontBaseSize = 0.0f;
FontAtlasOwnedByContext = shared_font_atlas ? false : true;
IO.Fonts = shared_font_atlas ? shared_font_atlas : IM_NEW(ImFontAtlas)();
-
Time = 0.0f;
FrameCount = 0;
FrameCountEnded = FrameCountRendered = -1;
+ WithinFrameScope = WithinFrameScopeWithImplicitWindow = WithinEndChild = false;
+
WindowsActiveCount = 0;
CurrentWindow = NULL;
HoveredWindow = NULL;
HoveredRootWindow = NULL;
+ MovingWindow = NULL;
+ WheelingWindow = NULL;
+ WheelingWindowTimer = 0.0f;
+
HoveredId = 0;
HoveredIdAllowOverlap = false;
HoveredIdPreviousFrame = 0;
HoveredIdTimer = HoveredIdNotActiveTimer = 0.0f;
ActiveId = 0;
- ActiveIdPreviousFrame = 0;
ActiveIdIsAlive = 0;
ActiveIdTimer = 0.0f;
ActiveIdIsJustActivated = false;
ActiveIdAllowOverlap = false;
- ActiveIdHasBeenEdited = false;
- ActiveIdPreviousFrameIsAlive = false;
- ActiveIdPreviousFrameHasBeenEdited = false;
- ActiveIdAllowNavDirFlags = 0;
+ ActiveIdHasBeenPressedBefore = false;
+ ActiveIdHasBeenEditedBefore = false;
+ ActiveIdHasBeenEditedThisFrame = false;
+ ActiveIdUsingNavDirMask = 0x00;
+ ActiveIdUsingNavInputMask = 0x00;
+ ActiveIdUsingKeyInputMask = 0x00;
ActiveIdClickOffset = ImVec2(-1,-1);
- ActiveIdWindow = ActiveIdPreviousFrameWindow = NULL;
+ ActiveIdWindow = NULL;
ActiveIdSource = ImGuiInputSource_None;
+ ActiveIdMouseButton = 0;
+ ActiveIdPreviousFrame = 0;
+ ActiveIdPreviousFrameIsAlive = false;
+ ActiveIdPreviousFrameHasBeenEditedBefore = false;
+ ActiveIdPreviousFrameWindow = NULL;
LastActiveId = 0;
LastActiveIdTimer = 0.0f;
- MovingWindow = NULL;
- NextTreeNodeOpenVal = false;
- NextTreeNodeOpenCond = 0;
NavWindow = NULL;
- NavId = NavActivateId = NavActivateDownId = NavActivatePressedId = NavInputId = 0;
- NavJustTabbedId = NavJustMovedToId = NavNextActivateId = 0;
+ NavId = NavFocusScopeId = NavActivateId = NavActivateDownId = NavActivatePressedId = NavInputId = 0;
+ NavJustTabbedId = NavJustMovedToId = NavJustMovedToFocusScopeId = NavNextActivateId = 0;
NavInputSource = ImGuiInputSource_None;
NavScoringRectScreen = ImRect();
NavScoringCount = 0;
- NavWindowingTarget = NavWindowingTargetAnim = NavWindowingList = NULL;
- NavWindowingTimer = NavWindowingHighlightAlpha = 0.0f;
- NavWindowingToggleLayer = false;
- NavLayer = 0;
+ NavLayer = ImGuiNavLayer_Main;
NavIdTabCounter = INT_MAX;
NavIdIsAlive = false;
NavMousePosDirty = false;
@@ -851,42 +1259,63 @@ struct ImGuiContext
NavInitResultId = 0;
NavMoveFromClampedRefRect = false;
NavMoveRequest = false;
- NavMoveRequestFlags = 0;
+ NavMoveRequestFlags = ImGuiNavMoveFlags_None;
NavMoveRequestForward = ImGuiNavForward_None;
NavMoveDir = NavMoveDirLast = NavMoveClipDir = ImGuiDir_None;
+ NavWindowingTarget = NavWindowingTargetAnim = NavWindowingList = NULL;
+ NavWindowingTimer = NavWindowingHighlightAlpha = 0.0f;
+ NavWindowingToggleLayer = false;
+
+ FocusRequestCurrWindow = FocusRequestNextWindow = NULL;
+ FocusRequestCurrCounterRegular = FocusRequestCurrCounterTabStop = INT_MAX;
+ FocusRequestNextCounterRegular = FocusRequestNextCounterTabStop = INT_MAX;
+ FocusTabPressed = false;
+
DimBgRatio = 0.0f;
- OverlayDrawList._Data = &DrawListSharedData;
- OverlayDrawList._OwnerName = "##Overlay"; // Give it a name for debugging
+ BackgroundDrawList._OwnerName = "##Background"; // Give it a name for debugging
+ ForegroundDrawList._OwnerName = "##Foreground"; // Give it a name for debugging
MouseCursor = ImGuiMouseCursor_Arrow;
DragDropActive = DragDropWithinSourceOrTarget = false;
- DragDropSourceFlags = 0;
+ DragDropSourceFlags = ImGuiDragDropFlags_None;
DragDropSourceFrameCount = -1;
DragDropMouseButton = -1;
DragDropTargetId = 0;
- DragDropAcceptFlags = 0;
+ DragDropAcceptFlags = ImGuiDragDropFlags_None;
DragDropAcceptIdCurrRectSurface = 0.0f;
DragDropAcceptIdPrev = DragDropAcceptIdCurr = 0;
DragDropAcceptFrameCount = -1;
memset(DragDropPayloadBufLocal, 0, sizeof(DragDropPayloadBufLocal));
- ScalarAsInputTextId = 0;
+ CurrentTabBar = NULL;
+
+ LastValidMousePos = ImVec2(0.0f, 0.0f);
+ TempInputTextId = 0;
ColorEditOptions = ImGuiColorEditFlags__OptionsDefault;
+ ColorEditLastHue = ColorEditLastSat = 0.0f;
+ ColorEditLastColor[0] = ColorEditLastColor[1] = ColorEditLastColor[2] = FLT_MAX;
DragCurrentAccumDirty = false;
DragCurrentAccum = 0.0f;
DragSpeedDefaultRatio = 1.0f / 100.0f;
- ScrollbarClickDeltaToGrabCenter = ImVec2(0.0f, 0.0f);
+ ScrollbarClickDeltaToGrabCenter = 0.0f;
TooltipOverrideCount = 0;
+
PlatformImePos = PlatformImeLastPos = ImVec2(FLT_MAX, FLT_MAX);
SettingsLoaded = false;
SettingsDirtyTimer = 0.0f;
LogEnabled = false;
+ LogType = ImGuiLogType_None;
LogFile = NULL;
- LogStartDepth = 0;
- LogAutoExpandMaxDepth = 2;
+ LogLinePosY = FLT_MAX;
+ LogLineFirstItem = false;
+ LogDepthRef = 0;
+ LogDepthToExpand = LogDepthToExpandDefault = 2;
+
+ DebugItemPickerActive = false;
+ DebugItemPickerBreakId = 0;
memset(FramerateSecPerFrame, 0, sizeof(FramerateSecPerFrame));
FramerateSecPerFrameIdx = 0;
@@ -896,51 +1325,57 @@ struct ImGuiContext
}
};
-// Transient per-window flags, reset at the beginning of the frame. For child window, inherited from parent on first Begin().
-// This is going to be exposed in imgui.h when stabilized enough.
-enum ImGuiItemFlags_
-{
- ImGuiItemFlags_NoTabStop = 1 << 0, // false
- ImGuiItemFlags_ButtonRepeat = 1 << 1, // false // Button() will return true multiple times based on io.KeyRepeatDelay and io.KeyRepeatRate settings.
- ImGuiItemFlags_Disabled = 1 << 2, // false // [BETA] Disable interactions but doesn't affect visuals yet. See github.com/ocornut/imgui/issues/211
- ImGuiItemFlags_NoNav = 1 << 3, // false
- ImGuiItemFlags_NoNavDefaultFocus = 1 << 4, // false
- ImGuiItemFlags_SelectableDontClosePopup = 1 << 5, // false // MenuItem/Selectable() automatically closes current Popup window
- ImGuiItemFlags_Default_ = 0
-};
+//-----------------------------------------------------------------------------
+// ImGuiWindow
+//-----------------------------------------------------------------------------
// Transient per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the DC variable name in ImGuiWindow.
// FIXME: That's theory, in practice the delimitation between ImGuiWindow and ImGuiWindowTempData is quite tenuous and could be reconsidered.
struct IMGUI_API ImGuiWindowTempData
{
- ImVec2 CursorPos;
+ // Layout
+ ImVec2 CursorPos; // Current emitting position, in absolute coordinates.
ImVec2 CursorPosPrevLine;
- ImVec2 CursorStartPos; // Initial position in client area with padding
- ImVec2 CursorMaxPos; // Used to implicitly calculate the size of our contents, always growing during the frame. Turned into window->SizeContents at the beginning of next frame
- ImVec2 CurrentLineSize;
- float CurrentLineTextBaseOffset;
+ ImVec2 CursorStartPos; // Initial position after Begin(), generally ~ window position + WindowPadding.
+ ImVec2 CursorMaxPos; // Used to implicitly calculate the size of our contents, always growing during the frame. Used to calculate window->ContentSize at the beginning of next frame
+ ImVec2 CurrLineSize;
ImVec2 PrevLineSize;
+ float CurrLineTextBaseOffset; // Baseline offset (0.0f by default on a new line, generally == style.FramePadding.y when a framed item has been added).
float PrevLineTextBaseOffset;
- float LogLinePosY;
- int TreeDepth;
- ImU32 TreeDepthMayJumpToParentOnPop; // Store a copy of !g.NavIdIsAlive for TreeDepth 0..31
- ImGuiID LastItemId;
- ImGuiItemStatusFlags LastItemStatusFlags;
- ImRect LastItemRect; // Interaction rect
- ImRect LastItemDisplayRect; // End-user display rect (only valid if LastItemStatusFlags & ImGuiItemStatusFlags_HasDisplayRect)
- bool NavHideHighlightOneFrame;
- bool NavHasScroll; // Set when scrolling can be used (ScrollMax > 0.0f)
- int NavLayerCurrent; // Current layer, 0..31 (we currently only use 0..1)
+ ImVec1 Indent; // Indentation / start position from left of window (increased by TreePush/TreePop, etc.)
+ ImVec1 ColumnsOffset; // Offset to the current column (if ColumnsCurrent > 0). FIXME: This and the above should be a stack to allow use cases like Tree->Column->Tree. Need revamp columns API.
+ ImVec1 GroupOffset;
+
+ // Last item status
+ ImGuiID LastItemId; // ID for last item
+ ImGuiItemStatusFlags LastItemStatusFlags; // Status flags for last item (see ImGuiItemStatusFlags_)
+ ImRect LastItemRect; // Interaction rect for last item
+ ImRect LastItemDisplayRect; // End-user display rect for last item (only valid if LastItemStatusFlags & ImGuiItemStatusFlags_HasDisplayRect)
+
+ // Keyboard/Gamepad navigation
+ ImGuiNavLayer NavLayerCurrent; // Current layer, 0..31 (we currently only use 0..1)
int NavLayerCurrentMask; // = (1 << NavLayerCurrent) used by ItemAdd prior to clipping.
int NavLayerActiveMask; // Which layer have been written to (result from previous frame)
int NavLayerActiveMaskNext; // Which layer have been written to (buffer for current frame)
+ ImGuiID NavFocusScopeIdCurrent; // Current focus scope ID while appending
+ bool NavHideHighlightOneFrame;
+ bool NavHasScroll; // Set when scrolling can be used (ScrollMax > 0.0f)
+
+ // Miscellaneous
bool MenuBarAppending; // FIXME: Remove this
ImVec2 MenuBarOffset; // MenuBarOffset.x is sort of equivalent of a per-layer CursorPos.x, saved/restored as we switch to the menu bar. The only situation when MenuBarOffset.y is > 0 if when (SafeAreaPadding.y > FramePadding.y), often used on TVs.
+ ImGuiMenuColumns MenuColumns; // Simplified columns storage for menu items measurement
+ int TreeDepth; // Current tree depth.
+ ImU32 TreeJumpToParentOnPopMask; // Store a copy of !g.NavIdIsAlive for TreeDepth 0..31.. Could be turned into a ImU64 if necessary.
ImVector ChildWindows;
- ImGuiStorage* StateStorage;
+ ImGuiStorage* StateStorage; // Current persistent per-window storage (store e.g. tree node open/close state)
+ ImGuiColumns* CurrentColumns; // Current columns set
ImGuiLayoutType LayoutType;
ImGuiLayoutType ParentLayoutType; // Layout type of parent window at the time of Begin()
+ int FocusCounterRegular; // (Legacy Focus/Tabbing system) Sequential counter, start at -1 and increase as assigned via FocusableItemRegister() (FIXME-NAV: Needs redesign)
+ int FocusCounterTabStop; // (Legacy Focus/Tabbing system) Same, but only count widgets which you can Tab through.
+ // Local parameters stacks
// We store the current settings outside of the vectors to increase memory locality (reduce cache misses). The vectors are rarely modified. Also it allows us to not heap allocate for short-lived windows which are not using those settings.
ImGuiItemFlags ItemFlags; // == ItemFlagsStack.back() [empty == ImGuiItemFlags_Default]
float ItemWidth; // == ItemWidthStack.back(). 0.0: default, >0.0: width in pixels, <0.0: align xx pixels to the right of window
@@ -949,67 +1384,67 @@ struct IMGUI_API ImGuiWindowTempData
ImVector ItemWidthStack;
ImVector TextWrapPosStack;
ImVectorGroupStack;
- int StackSizesBackup[6]; // Store size of various stacks for asserting
-
- ImVec1 Indent; // Indentation / start position from left of window (increased by TreePush/TreePop, etc.)
- ImVec1 GroupOffset;
- ImVec1 ColumnsOffset; // Offset to the current column (if ColumnsCurrent > 0). FIXME: This and the above should be a stack to allow use cases like Tree->Column->Tree. Need revamp columns API.
- ImGuiColumnsSet* ColumnsSet; // Current columns set
+ short StackSizesBackup[6]; // Store size of various stacks for asserting
ImGuiWindowTempData()
{
CursorPos = CursorPosPrevLine = CursorStartPos = CursorMaxPos = ImVec2(0.0f, 0.0f);
- CurrentLineSize = PrevLineSize = ImVec2(0.0f, 0.0f);
- CurrentLineTextBaseOffset = PrevLineTextBaseOffset = 0.0f;
- LogLinePosY = -1.0f;
- TreeDepth = 0;
- TreeDepthMayJumpToParentOnPop = 0x00;
+ CurrLineSize = PrevLineSize = ImVec2(0.0f, 0.0f);
+ CurrLineTextBaseOffset = PrevLineTextBaseOffset = 0.0f;
+ Indent = ImVec1(0.0f);
+ ColumnsOffset = ImVec1(0.0f);
+ GroupOffset = ImVec1(0.0f);
+
LastItemId = 0;
- LastItemStatusFlags = 0;
+ LastItemStatusFlags = ImGuiItemStatusFlags_None;
LastItemRect = LastItemDisplayRect = ImRect();
+
+ NavLayerActiveMask = NavLayerActiveMaskNext = 0x00;
+ NavLayerCurrent = ImGuiNavLayer_Main;
+ NavLayerCurrentMask = (1 << ImGuiNavLayer_Main);
+ NavFocusScopeIdCurrent = 0;
NavHideHighlightOneFrame = false;
NavHasScroll = false;
- NavLayerActiveMask = NavLayerActiveMaskNext = 0x00;
- NavLayerCurrent = 0;
- NavLayerCurrentMask = 1 << 0;
+
MenuBarAppending = false;
MenuBarOffset = ImVec2(0.0f, 0.0f);
+ TreeDepth = 0;
+ TreeJumpToParentOnPopMask = 0x00;
StateStorage = NULL;
+ CurrentColumns = NULL;
LayoutType = ParentLayoutType = ImGuiLayoutType_Vertical;
- ItemWidth = 0.0f;
+ FocusCounterRegular = FocusCounterTabStop = -1;
+
ItemFlags = ImGuiItemFlags_Default_;
+ ItemWidth = 0.0f;
TextWrapPos = -1.0f;
memset(StackSizesBackup, 0, sizeof(StackSizesBackup));
-
- Indent = ImVec1(0.0f);
- GroupOffset = ImVec1(0.0f);
- ColumnsOffset = ImVec1(0.0f);
- ColumnsSet = NULL;
}
};
// Storage for one window
struct IMGUI_API ImGuiWindow
{
- char* Name;
- ImGuiID ID; // == ImHash(Name)
+ char* Name; // Window name, owned by the window.
+ ImGuiID ID; // == ImHashStr(Name)
ImGuiWindowFlags Flags; // See enum ImGuiWindowFlags_
ImVec2 Pos; // Position (always rounded-up to nearest pixel)
ImVec2 Size; // Current size (==SizeFull or collapsed title bar size)
ImVec2 SizeFull; // Size when non collapsed
- ImVec2 SizeFullAtLastBegin; // Copy of SizeFull at the end of Begin. This is the reference value we'll use on the next frame to decide if we need scrollbars.
- ImVec2 SizeContents; // Size of contents (== extents reach of the drawing cursor) from previous frame. Include decoration, window title, border, menu, etc.
- ImVec2 SizeContentsExplicit; // Size of contents explicitly set by the user via SetNextWindowContentSize()
- ImVec2 WindowPadding; // Window padding at the time of begin.
- float WindowRounding; // Window rounding at the time of begin.
- float WindowBorderSize; // Window border size at the time of begin.
+ ImVec2 ContentSize; // Size of contents/scrollable client area (calculated from the extents reach of the cursor) from previous frame. Does not include window decoration or window padding.
+ ImVec2 ContentSizeExplicit; // Size of contents/scrollable client area explicitly request by the user via SetNextWindowContentSize().
+ ImVec2 WindowPadding; // Window padding at the time of Begin().
+ float WindowRounding; // Window rounding at the time of Begin().
+ float WindowBorderSize; // Window border size at the time of Begin().
+ int NameBufLen; // Size of buffer storing Name. May be larger than strlen(Name)!
ImGuiID MoveId; // == window->GetID("#MOVE")
ImGuiID ChildId; // ID of corresponding item in parent window (for navigation to return from child window to parent window)
ImVec2 Scroll;
+ ImVec2 ScrollMax;
ImVec2 ScrollTarget; // target scroll position. stored as cursor position with scrolling canceled out, so the highest point is always 0.0f. (FLT_MAX for no change)
ImVec2 ScrollTargetCenterRatio; // 0.0f = scroll so that target position is at top, 0.5f = scroll so that target position is centered
ImVec2 ScrollbarSizes; // Size taken by scrollbars on each axis
- bool ScrollbarX, ScrollbarY;
+ bool ScrollbarX, ScrollbarY; // Are scrollbars visible?
bool Active; // Set to true on Begin(), unless Collapsed
bool WasActive;
bool WriteAccessed; // Set to true when any widget access the current window
@@ -1017,37 +1452,45 @@ struct IMGUI_API ImGuiWindow
bool WantCollapseToggle;
bool SkipItems; // Set when items can safely be all clipped (e.g. window not visible or collapsed)
bool Appearing; // Set during the frame where the window is appearing (or re-appearing)
- bool Hidden; // Do not display (== (HiddenFramesForResize > 0) ||
+ bool Hidden; // Do not display (== (HiddenFrames*** > 0))
+ bool IsFallbackWindow; // Set on the "Debug##Default" window.
bool HasCloseButton; // Set when the window has a close button (p_open != NULL)
- int BeginCount; // Number of Begin() during the current frame (generally 0 or 1, 1+ if appending via multiple Begin/End pairs)
- int BeginOrderWithinParent; // Order within immediate parent window, if we are a child window. Otherwise 0.
- int BeginOrderWithinContext; // Order within entire imgui context. This is mostly used for debugging submission order related issues.
+ signed char ResizeBorderHeld; // Current border being held for resize (-1: none, otherwise 0-3)
+ short BeginCount; // Number of Begin() during the current frame (generally 0 or 1, 1+ if appending via multiple Begin/End pairs)
+ short BeginOrderWithinParent; // Order within immediate parent window, if we are a child window. Otherwise 0.
+ short BeginOrderWithinContext; // Order within entire imgui context. This is mostly used for debugging submission order related issues.
ImGuiID PopupId; // ID in the popup stack when this window is used as a popup/menu (because we use generic Name/ID for recycling)
- int AutoFitFramesX, AutoFitFramesY;
+ ImS8 AutoFitFramesX, AutoFitFramesY;
+ ImS8 AutoFitChildAxises;
bool AutoFitOnlyGrows;
- int AutoFitChildAxises;
ImGuiDir AutoPosLastDirection;
- int HiddenFramesRegular; // Hide the window for N frames
- int HiddenFramesForResize; // Hide the window for N frames while allowing items to be submitted so we can measure their size
+ int HiddenFramesCanSkipItems; // Hide the window for N frames
+ int HiddenFramesCannotSkipItems; // Hide the window for N frames while allowing items to be submitted so we can measure their size
ImGuiCond SetWindowPosAllowFlags; // store acceptable condition flags for SetNextWindowPos() use.
ImGuiCond SetWindowSizeAllowFlags; // store acceptable condition flags for SetNextWindowSize() use.
ImGuiCond SetWindowCollapsedAllowFlags; // store acceptable condition flags for SetNextWindowCollapsed() use.
ImVec2 SetWindowPosVal; // store window position when using a non-zero Pivot (position set needs to be processed when we know the window size)
ImVec2 SetWindowPosPivot; // store window pivot for positioning. ImVec2(0,0) when positioning from top-left corner; ImVec2(0.5f,0.5f) for centering; ImVec2(1,1) for bottom right.
+ ImVector IDStack; // ID stack. ID are hashes seeded with the value at the top of the stack. (In theory this should be in the TempData structure)
ImGuiWindowTempData DC; // Temporary per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the "DC" variable name.
- ImVector IDStack; // ID stack. ID are hashes seeded with the value at the top of the stack
- ImRect ClipRect; // Current clipping rectangle. = DrawList->clip_rect_stack.back(). Scissoring / clipping rectangle. x1, y1, x2, y2.
- ImRect OuterRectClipped; // = WindowRect just after setup in Begin(). == window->Rect() for root window.
- ImRect InnerMainRect, InnerClipRect;
- ImRect ContentsRegionRect; // FIXME: This is currently confusing/misleading. Maximum visible content position ~~ Pos + (SizeContentsExplicit ? SizeContentsExplicit : Size - ScrollbarSizes) - CursorStartPos, per axis
+
+ // The best way to understand what those rectangles are is to use the 'Metrics -> Tools -> Show windows rectangles' viewer.
+ // The main 'OuterRect', omitted as a field, is window->Rect().
+ ImRect OuterRectClipped; // == Window->Rect() just after setup in Begin(). == window->Rect() for root window.
+ ImRect InnerRect; // Inner rectangle (omit title bar, menu bar, scroll bar)
+ ImRect InnerClipRect; // == InnerRect shrunk by WindowPadding*0.5f on each side, clipped within viewport or parent clip rect.
+ ImRect WorkRect; // Cover the whole scrolling region, shrunk by WindowPadding*1.0f on each side. This is meant to replace ContentRegionRect over time (from 1.71+ onward).
+ ImRect ClipRect; // Current clipping/scissoring rectangle, evolve as we are using PushClipRect(), etc. == DrawList->clip_rect_stack.back().
+ ImRect ContentRegionRect; // FIXME: This is currently confusing/misleading. It is essentially WorkRect but not handling of scrolling. We currently rely on it as right/bottom aligned sizing operation need some size to rely on.
+
int LastFrameActive; // Last frame number the window was Active.
+ float LastTimeActive; // Last timestamp the window was Active (using float as we don't need high precision there)
float ItemWidthDefault;
- ImGuiMenuColumns MenuColumns; // Simplified columns storage for menu items
ImGuiStorage StateStorage;
- ImVector ColumnsStorage;
- float FontWindowScale; // User scale multiplier per-window
- int SettingsIdx; // Index into SettingsWindow[] (indices are always valid as we only grow the array from the back)
+ ImVector ColumnsStorage;
+ float FontWindowScale; // User scale multiplier per-window, via SetWindowFontScale()
+ int SettingsOffset; // Offset into SettingsWindows[] (offsets are always valid as we only grow the array from the back)
ImDrawList* DrawList; // == &DrawListInst (for backward compatibility reason with code using imgui_internal.h we keep this a pointer)
ImDrawList DrawListInst;
@@ -1057,17 +1500,12 @@ struct IMGUI_API ImGuiWindow
ImGuiWindow* RootWindowForNav; // Point to ourself or first ancestor which doesn't have the NavFlattened flag.
ImGuiWindow* NavLastChildNavWindow; // When going to the menu bar, we remember the child window we came from. (This could probably be made implicit if we kept g.Windows sorted by last focused including child window.)
- ImGuiID NavLastIds[2]; // Last known NavId for this window, per layer (0/1)
- ImRect NavRectRel[2]; // Reference rectangle, in window relative space
+ ImGuiID NavLastIds[ImGuiNavLayer_COUNT]; // Last known NavId for this window, per layer (0/1)
+ ImRect NavRectRel[ImGuiNavLayer_COUNT]; // Reference rectangle, in window relative space
- // Navigation / Focus
- // FIXME-NAV: Merge all this with the new Nav system, at least the request variables should be moved to ImGuiContext
- int FocusIdxAllCounter; // Start at -1 and increase as assigned via FocusItemRegister()
- int FocusIdxTabCounter; // (same, but only count widgets which you can Tab through)
- int FocusIdxAllRequestCurrent; // Item being requested for focus
- int FocusIdxTabRequestCurrent; // Tab-able item being requested for focus
- int FocusIdxAllRequestNext; // Item being requested for focus, for next update (relies on layout to be stable between the frame pressing TAB and the next frame)
- int FocusIdxTabRequestNext; // "
+ bool MemoryCompacted;
+ int MemoryDrawListIdxCapacity;
+ int MemoryDrawListVtxCapacity;
public:
ImGuiWindow(ImGuiContext* context, const char* name);
@@ -1075,17 +1513,19 @@ public:
ImGuiID GetID(const char* str, const char* str_end = NULL);
ImGuiID GetID(const void* ptr);
+ ImGuiID GetID(int n);
ImGuiID GetIDNoKeepAlive(const char* str, const char* str_end = NULL);
ImGuiID GetIDNoKeepAlive(const void* ptr);
+ ImGuiID GetIDNoKeepAlive(int n);
ImGuiID GetIDFromRectangle(const ImRect& r_abs);
// We don't use g.FontSize because the window may be != g.CurrentWidow.
- ImRect Rect() const { return ImRect(Pos.x, Pos.y, Pos.x+Size.x, Pos.y+Size.y); }
- float CalcFontSize() const { return GImGui->FontBaseSize * FontWindowScale; }
- float TitleBarHeight() const { return (Flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : CalcFontSize() + GImGui->Style.FramePadding.y * 2.0f; }
- ImRect TitleBarRect() const { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight())); }
- float MenuBarHeight() const { return (Flags & ImGuiWindowFlags_MenuBar) ? DC.MenuBarOffset.y + CalcFontSize() + GImGui->Style.FramePadding.y * 2.0f : 0.0f; }
- ImRect MenuBarRect() const { float y1 = Pos.y + TitleBarHeight(); return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight()); }
+ ImRect Rect() const { return ImRect(Pos.x, Pos.y, Pos.x+Size.x, Pos.y+Size.y); }
+ float CalcFontSize() const { ImGuiContext& g = *GImGui; float scale = g.FontBaseSize * FontWindowScale; if (ParentWindow) scale *= ParentWindow->FontWindowScale; return scale; }
+ float TitleBarHeight() const { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : CalcFontSize() + g.Style.FramePadding.y * 2.0f; }
+ ImRect TitleBarRect() const { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight())); }
+ float MenuBarHeight() const { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_MenuBar) ? DC.MenuBarOffset.y + CalcFontSize() + g.Style.FramePadding.y * 2.0f : 0.0f; }
+ ImRect MenuBarRect() const { float y1 = Pos.y + TitleBarHeight(); return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight()); }
};
// Backup and restore just enough data to be able to use IsItemHovered() on item A after another B in the same window has overwritten the data.
@@ -1101,6 +1541,76 @@ struct ImGuiItemHoveredDataBackup
void Restore() const { ImGuiWindow* window = GImGui->CurrentWindow; window->DC.LastItemId = LastItemId; window->DC.LastItemStatusFlags = LastItemStatusFlags; window->DC.LastItemRect = LastItemRect; window->DC.LastItemDisplayRect = LastItemDisplayRect; }
};
+//-----------------------------------------------------------------------------
+// Tab bar, tab item
+//-----------------------------------------------------------------------------
+
+// Extend ImGuiTabBarFlags_
+enum ImGuiTabBarFlagsPrivate_
+{
+ ImGuiTabBarFlags_DockNode = 1 << 20, // Part of a dock node [we don't use this in the master branch but it facilitate branch syncing to keep this around]
+ ImGuiTabBarFlags_IsFocused = 1 << 21,
+ ImGuiTabBarFlags_SaveSettings = 1 << 22 // FIXME: Settings are handled by the docking system, this only request the tab bar to mark settings dirty when reordering tabs
+};
+
+// Extend ImGuiTabItemFlags_
+enum ImGuiTabItemFlagsPrivate_
+{
+ ImGuiTabItemFlags_NoCloseButton = 1 << 20 // Track whether p_open was set or not (we'll need this info on the next frame to recompute ContentWidth during layout)
+};
+
+// Storage for one active tab item (sizeof() 26~32 bytes)
+struct ImGuiTabItem
+{
+ ImGuiID ID;
+ ImGuiTabItemFlags Flags;
+ int LastFrameVisible;
+ int LastFrameSelected; // This allows us to infer an ordered list of the last activated tabs with little maintenance
+ int NameOffset; // When Window==NULL, offset to name within parent ImGuiTabBar::TabsNames
+ float Offset; // Position relative to beginning of tab
+ float Width; // Width currently displayed
+ float ContentWidth; // Width of actual contents, stored during BeginTabItem() call
+
+ ImGuiTabItem() { ID = 0; Flags = ImGuiTabItemFlags_None; LastFrameVisible = LastFrameSelected = -1; NameOffset = -1; Offset = Width = ContentWidth = 0.0f; }
+};
+
+// Storage for a tab bar (sizeof() 92~96 bytes)
+struct ImGuiTabBar
+{
+ ImVector Tabs;
+ ImGuiID ID; // Zero for tab-bars used by docking
+ ImGuiID SelectedTabId; // Selected tab/window
+ ImGuiID NextSelectedTabId;
+ ImGuiID VisibleTabId; // Can occasionally be != SelectedTabId (e.g. when previewing contents for CTRL+TAB preview)
+ int CurrFrameVisible;
+ int PrevFrameVisible;
+ ImRect BarRect;
+ float LastTabContentHeight; // Record the height of contents submitted below the tab bar
+ float OffsetMax; // Distance from BarRect.Min.x, locked during layout
+ float OffsetMaxIdeal; // Ideal offset if all tabs were visible and not clipped
+ float OffsetNextTab; // Distance from BarRect.Min.x, incremented with each BeginTabItem() call, not used if ImGuiTabBarFlags_Reorderable if set.
+ float ScrollingAnim;
+ float ScrollingTarget;
+ float ScrollingTargetDistToVisibility;
+ float ScrollingSpeed;
+ ImGuiTabBarFlags Flags;
+ ImGuiID ReorderRequestTabId;
+ ImS8 ReorderRequestDir;
+ bool WantLayout;
+ bool VisibleTabWasSubmitted;
+ short LastTabItemIdx; // For BeginTabItem()/EndTabItem()
+ ImVec2 FramePadding; // style.FramePadding locked at the time of BeginTabBar()
+ ImGuiTextBuffer TabsNames; // For non-docking tab bar we re-append names in a contiguous buffer.
+
+ ImGuiTabBar();
+ int GetTabOrder(const ImGuiTabItem* tab) const { return Tabs.index_from_ptr(tab); }
+ const char* GetTabName(const ImGuiTabItem* tab) const
+ {
+ IM_ASSERT(tab->NameOffset != -1 && tab->NameOffset < TabsNames.Buf.Size);
+ return TabsNames.Buf.Data + tab->NameOffset;
+ }
+};
+
//-----------------------------------------------------------------------------
// Internal API
// No guarantee of forward compatibility here.
@@ -1108,29 +1618,35 @@ struct ImGuiItemHoveredDataBackup
namespace ImGui
{
+ // Windows
// We should always have a CurrentWindow in the stack (there is an implicit "Debug" window)
// If this ever crash because g.CurrentWindow is NULL it means that either
// - ImGui::NewFrame() has never been called, which is illegal.
// - You are calling ImGui functions after ImGui::EndFrame()/ImGui::Render() and before the next ImGui::NewFrame(), which is also illegal.
inline ImGuiWindow* GetCurrentWindowRead() { ImGuiContext& g = *GImGui; return g.CurrentWindow; }
inline ImGuiWindow* GetCurrentWindow() { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; }
+ IMGUI_API ImGuiWindow* FindWindowByID(ImGuiID id);
IMGUI_API ImGuiWindow* FindWindowByName(const char* name);
- IMGUI_API void FocusWindow(ImGuiWindow* window);
- IMGUI_API void FocusPreviousWindowIgnoringOne(ImGuiWindow* ignore_window);
- IMGUI_API void BringWindowToFocusFront(ImGuiWindow* window);
- IMGUI_API void BringWindowToDisplayFront(ImGuiWindow* window);
- IMGUI_API void BringWindowToDisplayBack(ImGuiWindow* window);
IMGUI_API void UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window);
IMGUI_API ImVec2 CalcWindowExpectedSize(ImGuiWindow* window);
IMGUI_API bool IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent);
IMGUI_API bool IsWindowNavFocusable(ImGuiWindow* window);
- IMGUI_API void SetWindowScrollX(ImGuiWindow* window, float new_scroll_x);
- IMGUI_API void SetWindowScrollY(ImGuiWindow* window, float new_scroll_y);
- IMGUI_API float GetWindowScrollMaxX(ImGuiWindow* window);
- IMGUI_API float GetWindowScrollMaxY(ImGuiWindow* window);
IMGUI_API ImRect GetWindowAllowedExtentRect(ImGuiWindow* window);
+ IMGUI_API void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond = 0);
+ IMGUI_API void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond = 0);
+ IMGUI_API void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond = 0);
+
+ // Windows: Display Order and Focus Order
+ IMGUI_API void FocusWindow(ImGuiWindow* window);
+ IMGUI_API void FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window);
+ IMGUI_API void BringWindowToFocusFront(ImGuiWindow* window);
+ IMGUI_API void BringWindowToDisplayFront(ImGuiWindow* window);
+ IMGUI_API void BringWindowToDisplayBack(ImGuiWindow* window);
+
+ // Fonts, drawing
IMGUI_API void SetCurrentFont(ImFont* font);
inline ImFont* GetDefaultFont() { ImGuiContext& g = *GImGui; return g.IO.FontDefault ? g.IO.FontDefault : g.IO.Fonts->Fonts[0]; }
+ inline ImDrawList* GetForegroundDrawList(ImGuiWindow* window) { IM_UNUSED(window); ImGuiContext& g = *GImGui; return &g.ForegroundDrawList; } // This seemingly unnecessary wrapper simplifies compatibility between the 'master' and 'docking' branches.
// Init
IMGUI_API void Initialize(ImGuiContext* context);
@@ -1139,17 +1655,27 @@ namespace ImGui
// NewFrame
IMGUI_API void UpdateHoveredWindowAndCaptureFlags();
IMGUI_API void StartMouseMovingWindow(ImGuiWindow* window);
- IMGUI_API void UpdateMouseMovingWindow();
+ IMGUI_API void UpdateMouseMovingWindowNewFrame();
+ IMGUI_API void UpdateMouseMovingWindowEndFrame();
// Settings
IMGUI_API void MarkIniSettingsDirty();
IMGUI_API void MarkIniSettingsDirty(ImGuiWindow* window);
IMGUI_API ImGuiWindowSettings* CreateNewWindowSettings(const char* name);
IMGUI_API ImGuiWindowSettings* FindWindowSettings(ImGuiID id);
+ IMGUI_API ImGuiWindowSettings* FindOrCreateWindowSettings(const char* name);
IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name);
+ // Scrolling
+ IMGUI_API void SetScrollX(ImGuiWindow* window, float new_scroll_x);
+ IMGUI_API void SetScrollY(ImGuiWindow* window, float new_scroll_y);
+ IMGUI_API void SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio = 0.5f);
+ IMGUI_API void SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio = 0.5f);
+ IMGUI_API ImVec2 ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect);
+
// Basic Accessors
inline ImGuiID GetItemID() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemId; }
+ inline ImGuiItemStatusFlags GetItemStatusFlags() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemStatusFlags; }
inline ImGuiID GetActiveID() { ImGuiContext& g = *GImGui; return g.ActiveId; }
inline ImGuiID GetFocusID() { ImGuiContext& g = *GImGui; return g.NavId; }
IMGUI_API void SetActiveID(ImGuiID id, ImGuiWindow* window);
@@ -1158,31 +1684,39 @@ namespace ImGui
IMGUI_API ImGuiID GetHoveredID();
IMGUI_API void SetHoveredID(ImGuiID id);
IMGUI_API void KeepAliveID(ImGuiID id);
- IMGUI_API void MarkItemEdited(ImGuiID id);
+ IMGUI_API void MarkItemEdited(ImGuiID id); // Mark data associated to given item as "edited", used by IsItemDeactivatedAfterEdit() function.
+ IMGUI_API void PushOverrideID(ImGuiID id); // Push given value at the top of the ID stack (whereas PushID combines old and new hashes)
// Basic Helpers for widget code
- IMGUI_API void ItemSize(const ImVec2& size, float text_offset_y = 0.0f);
- IMGUI_API void ItemSize(const ImRect& bb, float text_offset_y = 0.0f);
+ IMGUI_API void ItemSize(const ImVec2& size, float text_baseline_y = -1.0f);
+ IMGUI_API void ItemSize(const ImRect& bb, float text_baseline_y = -1.0f);
IMGUI_API bool ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb = NULL);
IMGUI_API bool ItemHoverable(const ImRect& bb, ImGuiID id);
IMGUI_API bool IsClippedEx(const ImRect& bb, ImGuiID id, bool clip_even_when_logged);
- IMGUI_API bool FocusableItemRegister(ImGuiWindow* window, ImGuiID id, bool tab_stop = true); // Return true if focus is requested
+ IMGUI_API bool FocusableItemRegister(ImGuiWindow* window, ImGuiID id); // Return true if focus is requested
IMGUI_API void FocusableItemUnregister(ImGuiWindow* window);
- IMGUI_API ImVec2 CalcItemSize(ImVec2 size, float default_x, float default_y);
+ IMGUI_API ImVec2 CalcItemSize(ImVec2 size, float default_w, float default_h);
IMGUI_API float CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x);
- IMGUI_API void PushMultiItemsWidths(int components, float width_full = 0.0f);
+ IMGUI_API void PushMultiItemsWidths(int components, float width_full);
IMGUI_API void PushItemFlag(ImGuiItemFlags option, bool enabled);
IMGUI_API void PopItemFlag();
+ IMGUI_API bool IsItemToggledSelection(); // Was the last item selection toggled? (after Selectable(), TreeNode() etc. We only returns toggle _event_ in order to handle clipping correctly)
+ IMGUI_API ImVec2 GetContentRegionMaxAbs();
+ IMGUI_API void ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_excess);
+
+ // Logging/Capture
+ IMGUI_API void LogBegin(ImGuiLogType type, int auto_open_depth); // -> BeginCapture() when we design v2 api, for now stay under the radar by using the old name.
+ IMGUI_API void LogToBuffer(int auto_open_depth = -1); // Start logging/capturing to internal buffer
// Popups, Modals, Tooltips
+ IMGUI_API bool BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags);
IMGUI_API void OpenPopupEx(ImGuiID id);
- IMGUI_API void ClosePopup(ImGuiID id);
- IMGUI_API void ClosePopupToLevel(int remaining);
- IMGUI_API void ClosePopupsOverWindow(ImGuiWindow* ref_window);
- IMGUI_API bool IsPopupOpen(ImGuiID id);
+ IMGUI_API void ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_popup);
+ IMGUI_API void ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to_window_under_popup);
+ IMGUI_API bool IsPopupOpen(ImGuiID id); // Test for id within current popup stack level (currently begin-ed into); this doesn't scan the whole popup stack!
IMGUI_API bool BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_flags);
- IMGUI_API void BeginTooltipEx(ImGuiWindowFlags extra_flags, bool override_previous_tooltip = true);
- IMGUI_API ImGuiWindow* GetFrontMostPopupModal();
+ IMGUI_API void BeginTooltipEx(ImGuiWindowFlags extra_flags, ImGuiTooltipFlags tooltip_flags);
+ IMGUI_API ImGuiWindow* GetTopMostPopupModal();
IMGUI_API ImVec2 FindBestWindowPosForPopup(ImGuiWindow* window);
IMGUI_API ImVec2 FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy = ImGuiPopupPositionPolicy_Default);
@@ -1194,26 +1728,52 @@ namespace ImGui
IMGUI_API void NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags move_flags);
IMGUI_API float GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode);
IMGUI_API ImVec2 GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInputReadMode mode, float slow_factor = 0.0f, float fast_factor = 0.0f);
- IMGUI_API int CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate);
+ IMGUI_API int CalcTypematicRepeatAmount(float t0, float t1, float repeat_delay, float repeat_rate);
IMGUI_API void ActivateItem(ImGuiID id); // Remotely activate a button, checkbox, tree node etc. given its unique ID. activation is queued and processed on the next frame when the item is encountered again.
- IMGUI_API void SetNavID(ImGuiID id, int nav_layer);
- IMGUI_API void SetNavIDWithRectRel(ImGuiID id, int nav_layer, const ImRect& rect_rel);
+ IMGUI_API void SetNavID(ImGuiID id, int nav_layer, ImGuiID focus_scope_id);
+ IMGUI_API void SetNavIDWithRectRel(ImGuiID id, int nav_layer, ImGuiID focus_scope_id, const ImRect& rect_rel);
+
+ // Focus scope (WIP)
+ IMGUI_API void PushFocusScope(ImGuiID id); // Note: this is storing in same stack as IDStack, so Push/Pop mismatch will be reported there.
+ IMGUI_API void PopFocusScope();
+ inline ImGuiID GetFocusScopeID() { ImGuiContext& g = *GImGui; return g.NavFocusScopeId; }
// Inputs
- inline bool IsKeyPressedMap(ImGuiKey key, bool repeat = true) { const int key_index = GImGui->IO.KeyMap[key]; return (key_index >= 0) ? IsKeyPressed(key_index, repeat) : false; }
- inline bool IsNavInputDown(ImGuiNavInput n) { return GImGui->IO.NavInputs[n] > 0.0f; }
- inline bool IsNavInputPressed(ImGuiNavInput n, ImGuiInputReadMode mode) { return GetNavInputAmount(n, mode) > 0.0f; }
- inline bool IsNavInputPressedAnyOfTwo(ImGuiNavInput n1, ImGuiNavInput n2, ImGuiInputReadMode mode) { return (GetNavInputAmount(n1, mode) + GetNavInputAmount(n2, mode)) > 0.0f; }
+ // FIXME: Eventually we should aim to move e.g. IsActiveIdUsingKey() into IsKeyXXX functions.
+ inline bool IsActiveIdUsingNavDir(ImGuiDir dir) { ImGuiContext& g = *GImGui; return (g.ActiveIdUsingNavDirMask & (1 << dir)) != 0; }
+ inline bool IsActiveIdUsingNavInput(ImGuiNavInput input) { ImGuiContext& g = *GImGui; return (g.ActiveIdUsingNavInputMask & (1 << input)) != 0; }
+ inline bool IsActiveIdUsingKey(ImGuiKey key) { ImGuiContext& g = *GImGui; IM_ASSERT(key < 64); return (g.ActiveIdUsingKeyInputMask & ((ImU64)1 << key)) != 0; }
+ IMGUI_API bool IsMouseDragPastThreshold(ImGuiMouseButton button, float lock_threshold = -1.0f);
+ inline bool IsKeyPressedMap(ImGuiKey key, bool repeat = true) { ImGuiContext& g = *GImGui; const int key_index = g.IO.KeyMap[key]; return (key_index >= 0) ? IsKeyPressed(key_index, repeat) : false; }
+ inline bool IsNavInputDown(ImGuiNavInput n) { ImGuiContext& g = *GImGui; return g.IO.NavInputs[n] > 0.0f; }
+ inline bool IsNavInputTest(ImGuiNavInput n, ImGuiInputReadMode rm) { return (GetNavInputAmount(n, rm) > 0.0f); }
// Drag and Drop
IMGUI_API bool BeginDragDropTargetCustom(const ImRect& bb, ImGuiID id);
IMGUI_API void ClearDragDrop();
IMGUI_API bool IsDragDropPayloadBeingAccepted();
- // New Columns API (FIXME-WIP)
+ // Internal Columns API (this is not exposed because we will encourage transitioning to the Tables api)
IMGUI_API void BeginColumns(const char* str_id, int count, ImGuiColumnsFlags flags = 0); // setup number of columns. use an identifier to distinguish multiple column sets. close with EndColumns().
IMGUI_API void EndColumns(); // close columns
- IMGUI_API void PushColumnClipRect(int column_index = -1);
+ IMGUI_API void PushColumnClipRect(int column_index);
+ IMGUI_API void PushColumnsBackground();
+ IMGUI_API void PopColumnsBackground();
+ IMGUI_API ImGuiID GetColumnsID(const char* str_id, int count);
+ IMGUI_API ImGuiColumns* FindOrCreateColumns(ImGuiWindow* window, ImGuiID id);
+ IMGUI_API float GetColumnOffsetFromNorm(const ImGuiColumns* columns, float offset_norm);
+ IMGUI_API float GetColumnNormFromOffset(const ImGuiColumns* columns, float offset);
+
+ // Tab Bars
+ IMGUI_API bool BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& bb, ImGuiTabBarFlags flags);
+ IMGUI_API ImGuiTabItem* TabBarFindTabByID(ImGuiTabBar* tab_bar, ImGuiID tab_id);
+ IMGUI_API void TabBarRemoveTab(ImGuiTabBar* tab_bar, ImGuiID tab_id);
+ IMGUI_API void TabBarCloseTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab);
+ IMGUI_API void TabBarQueueChangeTabOrder(ImGuiTabBar* tab_bar, const ImGuiTabItem* tab, int dir);
+ IMGUI_API bool TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags);
+ IMGUI_API ImVec2 TabItemCalcSize(const char* label, bool has_close_button);
+ IMGUI_API void TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImU32 col);
+ IMGUI_API bool TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id);
// Render helpers
// AVOID USING OUTSIDE OF IMGUI.CPP! NOT FOR PUBLIC CONSUMPTION. THOSE FUNCTIONS ARE A MESS. THEIR SIGNATURE AND BEHAVIOR WILL CHANGE, THEY NEED TO BE REFACTORED INTO SOMETHING DECENT.
@@ -1221,49 +1781,68 @@ namespace ImGui
IMGUI_API void RenderText(ImVec2 pos, const char* text, const char* text_end = NULL, bool hide_text_after_hash = true);
IMGUI_API void RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end, float wrap_width);
IMGUI_API void RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0,0), const ImRect* clip_rect = NULL);
+ IMGUI_API void RenderTextClippedEx(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0, 0), const ImRect* clip_rect = NULL);
+ IMGUI_API void RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, float clip_max_x, float ellipsis_max_x, const char* text, const char* text_end, const ImVec2* text_size_if_known);
IMGUI_API void RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border = true, float rounding = 0.0f);
IMGUI_API void RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding = 0.0f);
IMGUI_API void RenderColorRectWithAlphaCheckerboard(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, float grid_step, ImVec2 grid_off, float rounding = 0.0f, int rounding_corners_flags = ~0);
- IMGUI_API void RenderArrow(ImVec2 pos, ImGuiDir dir, float scale = 1.0f);
- IMGUI_API void RenderBullet(ImVec2 pos);
IMGUI_API void RenderCheckMark(ImVec2 pos, ImU32 col, float sz);
IMGUI_API void RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFlags flags = ImGuiNavHighlightFlags_TypeDefault); // Navigation highlight
IMGUI_API const char* FindRenderedTextEnd(const char* text, const char* text_end = NULL); // Find the optional ## from which we stop displaying text.
IMGUI_API void LogRenderedText(const ImVec2* ref_pos, const char* text, const char* text_end = NULL);
// Render helpers (those functions don't access any ImGui state!)
- IMGUI_API void RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor = ImGuiMouseCursor_Arrow);
+ IMGUI_API void RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale = 1.0f);
+ IMGUI_API void RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col);
+ IMGUI_API void RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow);
IMGUI_API void RenderArrowPointingAt(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, ImGuiDir direction, ImU32 col);
IMGUI_API void RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, ImU32 col, float x_start_norm, float x_end_norm, float rounding);
+#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+ // [1.71: 2019/06/07: Updating prototypes of some of the internal functions. Leaving those for reference for a short while]
+ inline void RenderArrow(ImVec2 pos, ImGuiDir dir, float scale=1.0f) { ImGuiWindow* window = GetCurrentWindow(); RenderArrow(window->DrawList, pos, GetColorU32(ImGuiCol_Text), dir, scale); }
+ inline void RenderBullet(ImVec2 pos) { ImGuiWindow* window = GetCurrentWindow(); RenderBullet(window->DrawList, pos, GetColorU32(ImGuiCol_Text)); }
+#endif
+
// Widgets
+ IMGUI_API void TextEx(const char* text, const char* text_end = NULL, ImGuiTextFlags flags = 0);
IMGUI_API bool ButtonEx(const char* label, const ImVec2& size_arg = ImVec2(0,0), ImGuiButtonFlags flags = 0);
- IMGUI_API bool CloseButton(ImGuiID id, const ImVec2& pos, float radius);
+ IMGUI_API bool CloseButton(ImGuiID id, const ImVec2& pos);
IMGUI_API bool CollapseButton(ImGuiID id, const ImVec2& pos);
- IMGUI_API bool ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size_arg, ImGuiButtonFlags flags);
- IMGUI_API void Scrollbar(ImGuiLayoutType direction);
- IMGUI_API void VerticalSeparator(); // Vertical separator, for menu bars (use current line height). Not exposed because it is misleading and it doesn't have an effect on regular layout.
+ IMGUI_API bool ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size_arg, ImGuiButtonFlags flags = 0);
+ IMGUI_API void Scrollbar(ImGuiAxis axis);
+ IMGUI_API bool ScrollbarEx(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* p_scroll_v, float avail_v, float contents_v, ImDrawCornerFlags rounding_corners);
+ IMGUI_API ImGuiID GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis);
+ IMGUI_API ImGuiID GetWindowResizeID(ImGuiWindow* window, int n); // 0..3: corners, 4..7: borders
+ IMGUI_API void SeparatorEx(ImGuiSeparatorFlags flags);
// Widgets low-level behaviors
IMGUI_API bool ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags = 0);
- IMGUI_API bool DragBehavior(ImGuiID id, ImGuiDataType data_type, void* v, float v_speed, const void* v_min, const void* v_max, const char* format, float power);
- IMGUI_API bool SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb);
+ IMGUI_API bool DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v_speed, const void* p_min, const void* p_max, const char* format, float power, ImGuiDragFlags flags);
+ IMGUI_API bool SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* p_v, const void* p_min, const void* p_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb);
IMGUI_API bool SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend = 0.0f, float hover_visibility_delay = 0.0f);
IMGUI_API bool TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* label, const char* label_end = NULL);
- IMGUI_API bool TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags = 0); // Consume previous SetNextTreeNodeOpened() data, if any. May return true when logging
- IMGUI_API void TreePushRawID(ImGuiID id);
+ IMGUI_API bool TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags = 0); // Consume previous SetNextItemOpen() data, if any. May return true when logging
+ IMGUI_API void TreePushOverrideID(ImGuiID id);
- // Template functions are instantiated in imgui_widgets.cpp for a finite number of types.
+ // Template functions are instantiated in imgui_widgets.cpp for a finite number of types.
// To use them externally (for custom widget) you may need an "extern template" statement in your code in order to link to existing instances and silence Clang warnings (see #2036).
// e.g. " extern template IMGUI_API float RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, float v); "
- template IMGUI_API bool DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, const T v_min, const T v_max, const char* format, float power);
- template IMGUI_API bool SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, const T v_min, const T v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb);
+ template IMGUI_API bool DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, T v_min, T v_max, const char* format, float power, ImGuiDragFlags flags);
+ template IMGUI_API bool SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, T v_min, T v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb);
template IMGUI_API float SliderCalcRatioFromValueT(ImGuiDataType data_type, T v, T v_min, T v_max, float power, float linear_zero_pos);
template IMGUI_API T RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, T v);
+ // Data type helpers
+ IMGUI_API const ImGuiDataTypeInfo* DataTypeGetInfo(ImGuiDataType data_type);
+ IMGUI_API int DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* p_data, const char* format);
+ IMGUI_API void DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* arg_1, const void* arg_2);
+ IMGUI_API bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* p_data, const char* format);
+
// InputText
- IMGUI_API bool InputTextEx(const char* label, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
- IMGUI_API bool InputScalarAsWidgetReplacement(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* data_ptr, const char* format);
+ IMGUI_API bool InputTextEx(const char* label, const char* hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback = NULL, void* user_data = NULL);
+ IMGUI_API bool TempInputTextScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format);
+ inline bool TempInputTextIsActive(ImGuiID id) { ImGuiContext& g = *GImGui; return (g.ActiveId == id && g.TempInputTextId == id); }
// Color
IMGUI_API void ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags flags);
@@ -1271,27 +1850,68 @@ namespace ImGui
IMGUI_API void ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags);
// Plot
- IMGUI_API void PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size);
+ IMGUI_API void PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size);
// Shade functions (write over already created vertices)
IMGUI_API void ShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, ImVec2 gradient_p0, ImVec2 gradient_p1, ImU32 col0, ImU32 col1);
IMGUI_API void ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, bool clamp);
+ // Garbage collection
+ IMGUI_API void GcCompactTransientWindowBuffers(ImGuiWindow* window);
+ IMGUI_API void GcAwakeTransientWindowBuffers(ImGuiWindow* window);
+
+ // Debug Tools
+ inline void DebugDrawItemRect(ImU32 col = IM_COL32(255,0,0,255)) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; GetForegroundDrawList(window)->AddRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max, col); }
+ inline void DebugStartItemPicker() { ImGuiContext& g = *GImGui; g.DebugItemPickerActive = true; }
+
} // namespace ImGui
// ImFontAtlas internals
IMGUI_API bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas);
IMGUI_API void ImFontAtlasBuildRegisterDefaultCustomRects(ImFontAtlas* atlas);
IMGUI_API void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* font_config, float ascent, float descent);
-IMGUI_API void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* spc);
+IMGUI_API void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque);
IMGUI_API void ImFontAtlasBuildFinish(ImFontAtlas* atlas);
IMGUI_API void ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_multiply_factor);
IMGUI_API void ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride);
-#ifdef __clang__
+// Debug Tools
+// Use 'Metrics->Tools->Item Picker' to break into the call-stack of a specific item.
+#ifndef IM_DEBUG_BREAK
+#if defined(__clang__)
+#define IM_DEBUG_BREAK() __builtin_debugtrap()
+#elif defined (_MSC_VER)
+#define IM_DEBUG_BREAK() __debugbreak()
+#else
+#define IM_DEBUG_BREAK() IM_ASSERT(0) // It is expected that you define IM_DEBUG_BREAK() into something that will break nicely in a debugger!
+#endif
+#endif // #ifndef IM_DEBUG_BREAK
+
+// Test Engine Hooks (imgui_tests)
+//#define IMGUI_ENABLE_TEST_ENGINE
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+extern void ImGuiTestEngineHook_PreNewFrame(ImGuiContext* ctx);
+extern void ImGuiTestEngineHook_PostNewFrame(ImGuiContext* ctx);
+extern void ImGuiTestEngineHook_ItemAdd(ImGuiContext* ctx, const ImRect& bb, ImGuiID id);
+extern void ImGuiTestEngineHook_ItemInfo(ImGuiContext* ctx, ImGuiID id, const char* label, ImGuiItemStatusFlags flags);
+extern void ImGuiTestEngineHook_Log(ImGuiContext* ctx, const char* fmt, ...);
+#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB, _ID) ImGuiTestEngineHook_ItemAdd(&g, _BB, _ID) // Register item bounding box
+#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID, _LABEL, _FLAGS) ImGuiTestEngineHook_ItemInfo(&g, _ID, _LABEL, _FLAGS) // Register item label and status flags (optional)
+#define IMGUI_TEST_ENGINE_LOG(_FMT, ...) ImGuiTestEngineHook_Log(&g, _FMT, __VA_ARGS__) // Custom log entry from user land into test log
+#else
+#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB, _ID) do { } while (0)
+#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID, _LABEL, _FLAGS) do { } while (0)
+#define IMGUI_TEST_ENGINE_LOG(_FMT, ...) do { } while (0)
+#endif
+
+#if defined(__clang__)
#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
#endif
#ifdef _MSC_VER
#pragma warning (pop)
#endif
+
+#endif // #ifndef IMGUI_DISABLE
diff --git a/src/imgui/imgui_widgets.cpp b/src/imgui/imgui_widgets.cpp
index 7bf5938bd4..6d2c95d991 100644
--- a/src/imgui/imgui_widgets.cpp
+++ b/src/imgui/imgui_widgets.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.66 WIP
+// dear imgui, v1.75
// (widgets code)
/*
@@ -22,6 +22,9 @@ Index of this file:
// [SECTION] Widgets: PlotLines, PlotHistogram
// [SECTION] Widgets: Value helpers
// [SECTION] Widgets: MenuItem, BeginMenu, EndMenu, etc.
+// [SECTION] Widgets: BeginTabBar, EndTabBar, etc.
+// [SECTION] Widgets: BeginTabItem, EndTabItem, etc.
+// [SECTION] Widgets: Columns, BeginColumns, EndColumns, etc.
*/
@@ -30,12 +33,14 @@ Index of this file:
#endif
#include "imgui.h"
+#ifndef IMGUI_DISABLE
+
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include "imgui_internal.h"
-#include // toupper, isprint
+#include // toupper
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
#include // intptr_t
#else
@@ -44,19 +49,29 @@ Index of this file:
// Visual Studio warnings
#ifdef _MSC_VER
-#pragma warning (disable: 4127) // condition expression is constant
-#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
+#pragma warning (disable: 4127) // condition expression is constant
+#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
+#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later
+#pragma warning (disable: 5054) // operator '|': deprecated between enumerations of different types
+#endif
#endif
// Clang/GCC warnings with -Weverything
-#ifdef __clang__
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse.
+#pragma clang diagnostic ignored "-Wfloat-equal" // warning : comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok.
#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning : format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code.
#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness //
-#elif defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked
-#if __GNUC__ >= 8
-#pragma GCC diagnostic ignored "-Wclass-memaccess" // warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0
#endif
+#if __has_warning("-Wdouble-promotion")
+#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
+#endif
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
+#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked
+#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead
#endif
//-------------------------------------------------------------------------
@@ -64,33 +79,36 @@ Index of this file:
//-------------------------------------------------------------------------
// Those MIN/MAX values are not define because we need to point to them
-static const ImS32 IM_S32_MIN = INT_MIN; // (-2147483647 - 1), (0x80000000);
-static const ImS32 IM_S32_MAX = INT_MAX; // (2147483647), (0x7FFFFFFF)
-static const ImU32 IM_U32_MIN = 0;
-static const ImU32 IM_U32_MAX = UINT_MAX; // (0xFFFFFFFF)
+static const signed char IM_S8_MIN = -128;
+static const signed char IM_S8_MAX = 127;
+static const unsigned char IM_U8_MIN = 0;
+static const unsigned char IM_U8_MAX = 0xFF;
+static const signed short IM_S16_MIN = -32768;
+static const signed short IM_S16_MAX = 32767;
+static const unsigned short IM_U16_MIN = 0;
+static const unsigned short IM_U16_MAX = 0xFFFF;
+static const ImS32 IM_S32_MIN = INT_MIN; // (-2147483647 - 1), (0x80000000);
+static const ImS32 IM_S32_MAX = INT_MAX; // (2147483647), (0x7FFFFFFF)
+static const ImU32 IM_U32_MIN = 0;
+static const ImU32 IM_U32_MAX = UINT_MAX; // (0xFFFFFFFF)
#ifdef LLONG_MIN
-static const ImS64 IM_S64_MIN = LLONG_MIN; // (-9223372036854775807ll - 1ll);
-static const ImS64 IM_S64_MAX = LLONG_MAX; // (9223372036854775807ll);
+static const ImS64 IM_S64_MIN = LLONG_MIN; // (-9223372036854775807ll - 1ll);
+static const ImS64 IM_S64_MAX = LLONG_MAX; // (9223372036854775807ll);
#else
-static const ImS64 IM_S64_MIN = -9223372036854775807LL - 1;
-static const ImS64 IM_S64_MAX = 9223372036854775807LL;
+static const ImS64 IM_S64_MIN = -9223372036854775807LL - 1;
+static const ImS64 IM_S64_MAX = 9223372036854775807LL;
#endif
-static const ImU64 IM_U64_MIN = 0;
+static const ImU64 IM_U64_MIN = 0;
#ifdef ULLONG_MAX
-static const ImU64 IM_U64_MAX = ULLONG_MAX; // (0xFFFFFFFFFFFFFFFFull);
+static const ImU64 IM_U64_MAX = ULLONG_MAX; // (0xFFFFFFFFFFFFFFFFull);
#else
-static const ImU64 IM_U64_MAX = (2ULL * 9223372036854775807LL + 1);
+static const ImU64 IM_U64_MAX = (2ULL * 9223372036854775807LL + 1);
#endif
//-------------------------------------------------------------------------
// [SECTION] Forward Declarations
//-------------------------------------------------------------------------
-// Data Type helpers
-static inline int DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* data_ptr, const char* format);
-static void DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* arg_1, const void* arg_2);
-static bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* data_ptr, const char* format);
-
// For InputTextEx()
static bool InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data);
static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end);
@@ -99,6 +117,7 @@ static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const
//-------------------------------------------------------------------------
// [SECTION] Widgets: Text, etc.
//-------------------------------------------------------------------------
+// - TextEx() [Internal]
// - TextUnformatted()
// - Text()
// - TextV()
@@ -114,7 +133,7 @@ static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const
// - BulletTextV()
//-------------------------------------------------------------------------
-void ImGui::TextUnformatted(const char* text, const char* text_end)
+void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags)
{
ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems)
@@ -126,9 +145,9 @@ void ImGui::TextUnformatted(const char* text, const char* text_end)
if (text_end == NULL)
text_end = text + strlen(text); // FIXME-OPT
- const ImVec2 text_pos(window->DC.CursorPos.x, window->DC.CursorPos.y + window->DC.CurrentLineTextBaseOffset);
+ const ImVec2 text_pos(window->DC.CursorPos.x, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset);
const float wrap_pos_x = window->DC.TextWrapPos;
- const bool wrap_enabled = wrap_pos_x >= 0.0f;
+ const bool wrap_enabled = (wrap_pos_x >= 0.0f);
if (text_end - text > 2000 && !wrap_enabled)
{
// Long text!
@@ -138,71 +157,68 @@ void ImGui::TextUnformatted(const char* text, const char* text_end)
// - We use memchr(), pay attention that well optimized versions of those str/mem functions are much faster than a casually written loop.
const char* line = text;
const float line_height = GetTextLineHeight();
- const ImRect clip_rect = window->ClipRect;
ImVec2 text_size(0,0);
- if (text_pos.y <= clip_rect.Max.y)
+ // Lines to skip (can't skip when logging text)
+ ImVec2 pos = text_pos;
+ if (!g.LogEnabled)
{
- ImVec2 pos = text_pos;
-
- // Lines to skip (can't skip when logging text)
- if (!g.LogEnabled)
+ int lines_skippable = (int)((window->ClipRect.Min.y - text_pos.y) / line_height);
+ if (lines_skippable > 0)
{
- int lines_skippable = (int)((clip_rect.Min.y - text_pos.y) / line_height);
- if (lines_skippable > 0)
- {
- int lines_skipped = 0;
- while (line < text_end && lines_skipped < lines_skippable)
- {
- const char* line_end = (const char*)memchr(line, '\n', text_end - line);
- if (!line_end)
- line_end = text_end;
- line = line_end + 1;
- lines_skipped++;
- }
- pos.y += lines_skipped * line_height;
- }
- }
-
- // Lines to render
- if (line < text_end)
- {
- ImRect line_rect(pos, pos + ImVec2(FLT_MAX, line_height));
- while (line < text_end)
- {
- if (IsClippedEx(line_rect, 0, false))
- break;
-
- const char* line_end = (const char*)memchr(line, '\n', text_end - line);
- if (!line_end)
- line_end = text_end;
- const ImVec2 line_size = CalcTextSize(line, line_end, false);
- text_size.x = ImMax(text_size.x, line_size.x);
- RenderText(pos, line, line_end, false);
- line = line_end + 1;
- line_rect.Min.y += line_height;
- line_rect.Max.y += line_height;
- pos.y += line_height;
- }
-
- // Count remaining lines
int lines_skipped = 0;
- while (line < text_end)
+ while (line < text_end && lines_skipped < lines_skippable)
{
const char* line_end = (const char*)memchr(line, '\n', text_end - line);
if (!line_end)
line_end = text_end;
+ if ((flags & ImGuiTextFlags_NoWidthForLargeClippedText) == 0)
+ text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x);
line = line_end + 1;
lines_skipped++;
}
pos.y += lines_skipped * line_height;
}
-
- text_size.y += (pos - text_pos).y;
}
+ // Lines to render
+ if (line < text_end)
+ {
+ ImRect line_rect(pos, pos + ImVec2(FLT_MAX, line_height));
+ while (line < text_end)
+ {
+ if (IsClippedEx(line_rect, 0, false))
+ break;
+
+ const char* line_end = (const char*)memchr(line, '\n', text_end - line);
+ if (!line_end)
+ line_end = text_end;
+ text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x);
+ RenderText(pos, line, line_end, false);
+ line = line_end + 1;
+ line_rect.Min.y += line_height;
+ line_rect.Max.y += line_height;
+ pos.y += line_height;
+ }
+
+ // Count remaining lines
+ int lines_skipped = 0;
+ while (line < text_end)
+ {
+ const char* line_end = (const char*)memchr(line, '\n', text_end - line);
+ if (!line_end)
+ line_end = text_end;
+ if ((flags & ImGuiTextFlags_NoWidthForLargeClippedText) == 0)
+ text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x);
+ line = line_end + 1;
+ lines_skipped++;
+ }
+ pos.y += lines_skipped * line_height;
+ }
+ text_size.y = (pos - text_pos).y;
+
ImRect bb(text_pos, text_pos + text_size);
- ItemSize(bb);
+ ItemSize(text_size, 0.0f);
ItemAdd(bb, 0);
}
else
@@ -210,9 +226,8 @@ void ImGui::TextUnformatted(const char* text, const char* text_end)
const float wrap_width = wrap_enabled ? CalcWrapWidthForPos(window->DC.CursorPos, wrap_pos_x) : 0.0f;
const ImVec2 text_size = CalcTextSize(text_begin, text_end, false, wrap_width);
- // Account of baseline offset
ImRect bb(text_pos, text_pos + text_size);
- ItemSize(text_size);
+ ItemSize(text_size, 0.0f);
if (!ItemAdd(bb, 0))
return;
@@ -221,6 +236,11 @@ void ImGui::TextUnformatted(const char* text, const char* text_end)
}
}
+void ImGui::TextUnformatted(const char* text, const char* text_end)
+{
+ TextEx(text, text_end, ImGuiTextFlags_NoWidthForLargeClippedText);
+}
+
void ImGui::Text(const char* fmt, ...)
{
va_list args;
@@ -237,7 +257,7 @@ void ImGui::TextV(const char* fmt, va_list args)
ImGuiContext& g = *GImGui;
const char* text_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
- TextUnformatted(g.TempBuffer, text_end);
+ TextEx(g.TempBuffer, text_end, ImGuiTextFlags_NoWidthForLargeClippedText);
}
void ImGui::TextColored(const ImVec4& col, const char* fmt, ...)
@@ -280,10 +300,13 @@ void ImGui::TextWrapped(const char* fmt, ...)
void ImGui::TextWrappedV(const char* fmt, va_list args)
{
- bool need_wrap = (GImGui->CurrentWindow->DC.TextWrapPos < 0.0f); // Keep existing wrap position is one ia already set
- if (need_wrap) PushTextWrapPos(0.0f);
+ ImGuiWindow* window = GetCurrentWindow();
+ bool need_backup = (window->DC.TextWrapPos < 0.0f); // Keep existing wrap position if one is already set
+ if (need_backup)
+ PushTextWrapPos(0.0f);
TextV(fmt, args);
- if (need_wrap) PopTextWrapPos();
+ if (need_backup)
+ PopTextWrapPos();
}
void ImGui::LabelText(const char* label, const char* fmt, ...)
@@ -341,16 +364,18 @@ void ImGui::BulletTextV(const char* fmt, va_list args)
const char* text_begin = g.TempBuffer;
const char* text_end = text_begin + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args);
const ImVec2 label_size = CalcTextSize(text_begin, text_end, false);
- const float text_base_offset_y = ImMax(0.0f, window->DC.CurrentLineTextBaseOffset); // Latch before ItemSize changes it
- const float line_height = ImMax(ImMin(window->DC.CurrentLineSize.y, g.FontSize + g.Style.FramePadding.y*2), g.FontSize);
- const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(g.FontSize + (label_size.x > 0.0f ? (label_size.x + style.FramePadding.x*2) : 0.0f), ImMax(line_height, label_size.y))); // Empty text doesn't add padding
- ItemSize(bb);
+ const ImVec2 total_size = ImVec2(g.FontSize + (label_size.x > 0.0f ? (label_size.x + style.FramePadding.x * 2) : 0.0f), label_size.y); // Empty text doesn't add padding
+ ImVec2 pos = window->DC.CursorPos;
+ pos.y += window->DC.CurrLineTextBaseOffset;
+ ItemSize(total_size, 0.0f);
+ const ImRect bb(pos, pos + total_size);
if (!ItemAdd(bb, 0))
return;
// Render
- RenderBullet(bb.Min + ImVec2(style.FramePadding.x + g.FontSize*0.5f, line_height*0.5f));
- RenderText(bb.Min+ImVec2(g.FontSize + style.FramePadding.x*2, text_base_offset_y), text_begin, text_end, false);
+ ImU32 text_col = GetColorU32(ImGuiCol_Text);
+ RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize*0.5f, g.FontSize*0.5f), text_col);
+ RenderText(bb.Min + ImVec2(g.FontSize + style.FramePadding.x * 2, 0.0f), text_begin, text_end, false);
}
//-------------------------------------------------------------------------
@@ -363,6 +388,7 @@ void ImGui::BulletTextV(const char* fmt, va_list args)
// - ArrowButton()
// - CloseButton() [Internal]
// - CollapseButton() [Internal]
+// - ScrollbarEx() [Internal]
// - Scrollbar() [Internal]
// - Image()
// - ImageButton()
@@ -373,6 +399,60 @@ void ImGui::BulletTextV(const char* fmt, va_list args)
// - Bullet()
//-------------------------------------------------------------------------
+// The ButtonBehavior() function is key to many interactions and used by many/most widgets.
+// Because we handle so many cases (keyboard/gamepad navigation, drag and drop) and many specific behavior (via ImGuiButtonFlags_),
+// this code is a little complex.
+// By far the most common path is interacting with the Mouse using the default ImGuiButtonFlags_PressedOnClickRelease button behavior.
+// See the series of events below and the corresponding state reported by dear imgui:
+//------------------------------------------------------------------------------------------------------------------------------------------------
+// with PressedOnClickRelease: return-value IsItemHovered() IsItemActive() IsItemActivated() IsItemDeactivated() IsItemClicked()
+// Frame N+0 (mouse is outside bb) - - - - - -
+// Frame N+1 (mouse moves inside bb) - true - - - -
+// Frame N+2 (mouse button is down) - true true true - true
+// Frame N+3 (mouse button is down) - true true - - -
+// Frame N+4 (mouse moves outside bb) - - true - - -
+// Frame N+5 (mouse moves inside bb) - true true - - -
+// Frame N+6 (mouse button is released) true true - - true -
+// Frame N+7 (mouse button is released) - true - - - -
+// Frame N+8 (mouse moves outside bb) - - - - - -
+//------------------------------------------------------------------------------------------------------------------------------------------------
+// with PressedOnClick: return-value IsItemHovered() IsItemActive() IsItemActivated() IsItemDeactivated() IsItemClicked()
+// Frame N+2 (mouse button is down) true true true true - true
+// Frame N+3 (mouse button is down) - true true - - -
+// Frame N+6 (mouse button is released) - true - - true -
+// Frame N+7 (mouse button is released) - true - - - -
+//------------------------------------------------------------------------------------------------------------------------------------------------
+// with PressedOnRelease: return-value IsItemHovered() IsItemActive() IsItemActivated() IsItemDeactivated() IsItemClicked()
+// Frame N+2 (mouse button is down) - true - - - true
+// Frame N+3 (mouse button is down) - true - - - -
+// Frame N+6 (mouse button is released) true true - - - -
+// Frame N+7 (mouse button is released) - true - - - -
+//------------------------------------------------------------------------------------------------------------------------------------------------
+// with PressedOnDoubleClick: return-value IsItemHovered() IsItemActive() IsItemActivated() IsItemDeactivated() IsItemClicked()
+// Frame N+0 (mouse button is down) - true - - - true
+// Frame N+1 (mouse button is down) - true - - - -
+// Frame N+2 (mouse button is released) - true - - - -
+// Frame N+3 (mouse button is released) - true - - - -
+// Frame N+4 (mouse button is down) true true true true - true
+// Frame N+5 (mouse button is down) - true true - - -
+// Frame N+6 (mouse button is released) - true - - true -
+// Frame N+7 (mouse button is released) - true - - - -
+//------------------------------------------------------------------------------------------------------------------------------------------------
+// Note that some combinations are supported,
+// - PressedOnDragDropHold can generally be associated with any flag.
+// - PressedOnDoubleClick can be associated by PressedOnClickRelease/PressedOnRelease, in which case the second release event won't be reported.
+//------------------------------------------------------------------------------------------------------------------------------------------------
+// The behavior of the return-value changes when ImGuiButtonFlags_Repeat is set:
+// Repeat+ Repeat+ Repeat+ Repeat+
+// PressedOnClickRelease PressedOnClick PressedOnRelease PressedOnDoubleClick
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+// Frame N+0 (mouse button is down) - true - true
+// ... - - - -
+// Frame N + RepeatDelay true true - true
+// ... - - - -
+// Frame N + RepeatDelay + RepeatRate*N true true - true
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags)
{
ImGuiContext& g = *GImGui;
@@ -386,14 +466,24 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
return false;
}
- // Default behavior requires click+release on same spot
- if ((flags & (ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnRelease | ImGuiButtonFlags_PressedOnDoubleClick)) == 0)
- flags |= ImGuiButtonFlags_PressedOnClickRelease;
+ // Default only reacts to left mouse button
+ if ((flags & ImGuiButtonFlags_MouseButtonMask_) == 0)
+ flags |= ImGuiButtonFlags_MouseButtonDefault_;
+
+ // Default behavior requires click + release inside bounding box
+ if ((flags & ImGuiButtonFlags_PressedOnMask_) == 0)
+ flags |= ImGuiButtonFlags_PressedOnDefault_;
ImGuiWindow* backup_hovered_window = g.HoveredWindow;
- if ((flags & ImGuiButtonFlags_FlattenChildren) && g.HoveredRootWindow == window)
+ const bool flatten_hovered_children = (flags & ImGuiButtonFlags_FlattenChildren) && g.HoveredRootWindow == window;
+ if (flatten_hovered_children)
g.HoveredWindow = window;
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+ if (id != 0 && window->DC.LastItemId != id)
+ ImGuiTestEngineHook_ItemAdd(&g, bb, id);
+#endif
+
bool pressed = false;
bool hovered = ItemHoverable(bb, id);
@@ -407,58 +497,69 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
{
hovered = true;
SetHoveredID(id);
- if (CalcTypematicPressedRepeatAmount(g.HoveredIdTimer + 0.0001f, g.HoveredIdTimer + 0.0001f - g.IO.DeltaTime, 0.01f, 0.70f)) // FIXME: Our formula for CalcTypematicPressedRepeatAmount() is fishy
+ if (CalcTypematicRepeatAmount(g.HoveredIdTimer + 0.0001f - g.IO.DeltaTime, g.HoveredIdTimer + 0.0001f, 0.70f, 0.00f))
{
pressed = true;
FocusWindow(window);
}
}
- if ((flags & ImGuiButtonFlags_FlattenChildren) && g.HoveredRootWindow == window)
+ if (flatten_hovered_children)
g.HoveredWindow = backup_hovered_window;
// AllowOverlap mode (rarely used) requires previous frame HoveredId to be null or to match. This allows using patterns where a later submitted widget overlaps a previous one.
if (hovered && (flags & ImGuiButtonFlags_AllowItemOverlap) && (g.HoveredIdPreviousFrame != id && g.HoveredIdPreviousFrame != 0))
hovered = false;
- // Mouse
+ // Mouse handling
if (hovered)
{
if (!(flags & ImGuiButtonFlags_NoKeyModifiers) || (!g.IO.KeyCtrl && !g.IO.KeyShift && !g.IO.KeyAlt))
{
- // | CLICKING | HOLDING with ImGuiButtonFlags_Repeat
- // PressedOnClickRelease | * | .. (NOT on release) <-- MOST COMMON! (*) only if both click/release were over bounds
- // PressedOnClick | | ..
- // PressedOnRelease | | .. (NOT on release)
- // PressedOnDoubleClick | | ..
- // FIXME-NAV: We don't honor those different behaviors.
- if ((flags & ImGuiButtonFlags_PressedOnClickRelease) && g.IO.MouseClicked[0])
+ // Poll buttons
+ int mouse_button_clicked = -1;
+ int mouse_button_released = -1;
+ if ((flags & ImGuiButtonFlags_MouseButtonLeft) && g.IO.MouseClicked[0]) { mouse_button_clicked = 0; }
+ else if ((flags & ImGuiButtonFlags_MouseButtonRight) && g.IO.MouseClicked[1]) { mouse_button_clicked = 1; }
+ else if ((flags & ImGuiButtonFlags_MouseButtonMiddle) && g.IO.MouseClicked[2]) { mouse_button_clicked = 2; }
+ if ((flags & ImGuiButtonFlags_MouseButtonLeft) && g.IO.MouseReleased[0]) { mouse_button_released = 0; }
+ else if ((flags & ImGuiButtonFlags_MouseButtonRight) && g.IO.MouseReleased[1]) { mouse_button_released = 1; }
+ else if ((flags & ImGuiButtonFlags_MouseButtonMiddle) && g.IO.MouseReleased[2]) { mouse_button_released = 2; }
+
+ if (mouse_button_clicked != -1 && g.ActiveId != id)
{
- SetActiveID(id, window);
- if (!(flags & ImGuiButtonFlags_NoNavFocus))
- SetFocusID(id, window);
- FocusWindow(window);
+ if (flags & (ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClickReleaseAnywhere))
+ {
+ SetActiveID(id, window);
+ g.ActiveIdMouseButton = mouse_button_clicked;
+ if (!(flags & ImGuiButtonFlags_NoNavFocus))
+ SetFocusID(id, window);
+ FocusWindow(window);
+ }
+ if ((flags & ImGuiButtonFlags_PressedOnClick) || ((flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDoubleClicked[mouse_button_clicked]))
+ {
+ pressed = true;
+ if (flags & ImGuiButtonFlags_NoHoldingActiveId)
+ ClearActiveID();
+ else
+ SetActiveID(id, window); // Hold on ID
+ g.ActiveIdMouseButton = mouse_button_clicked;
+ FocusWindow(window);
+ }
}
- if (((flags & ImGuiButtonFlags_PressedOnClick) && g.IO.MouseClicked[0]) || ((flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDoubleClicked[0]))
+ if ((flags & ImGuiButtonFlags_PressedOnRelease) && mouse_button_released != -1)
{
- pressed = true;
- if (flags & ImGuiButtonFlags_NoHoldingActiveID)
- ClearActiveID();
- else
- SetActiveID(id, window); // Hold on ID
- FocusWindow(window);
- }
- if ((flags & ImGuiButtonFlags_PressedOnRelease) && g.IO.MouseReleased[0])
- {
- if (!((flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[0] >= g.IO.KeyRepeatDelay)) // Repeat mode trumps
+ // Repeat mode trumps on release behavior
+ if (!((flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[mouse_button_released] >= g.IO.KeyRepeatDelay))
pressed = true;
ClearActiveID();
}
// 'Repeat' mode acts when held regardless of _PressedOn flags (see table above).
// Relies on repeat logic of IsMouseClicked() but we may as well do it ourselves if we end up exposing finer RepeatDelay/RepeatRate settings.
- if ((flags & ImGuiButtonFlags_Repeat) && g.ActiveId == id && g.IO.MouseDownDuration[0] > 0.0f && IsMouseClicked(0, true))
- pressed = true;
+ if (g.ActiveId == id && (flags & ImGuiButtonFlags_Repeat))
+ if (g.IO.MouseDownDuration[g.ActiveIdMouseButton] > 0.0f && IsMouseClicked(g.ActiveIdMouseButton, true))
+ pressed = true;
}
if (pressed)
@@ -468,12 +569,12 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
// Gamepad/Keyboard navigation
// We report navigated item as hovered but we don't set g.HoveredId to not interfere with mouse.
if (g.NavId == id && !g.NavDisableHighlight && g.NavDisableMouseHover && (g.ActiveId == 0 || g.ActiveId == id || g.ActiveId == window->MoveId))
- hovered = true;
-
+ if (!(flags & ImGuiButtonFlags_NoHoveredOnNav))
+ hovered = true;
if (g.NavActivateDownId == id)
{
bool nav_activated_by_code = (g.NavActivateId == id);
- bool nav_activated_by_inputs = IsNavInputPressed(ImGuiNavInput_Activate, (flags & ImGuiButtonFlags_Repeat) ? ImGuiInputReadMode_Repeat : ImGuiInputReadMode_Pressed);
+ bool nav_activated_by_inputs = IsNavInputTest(ImGuiNavInput_Activate, (flags & ImGuiButtonFlags_Repeat) ? ImGuiInputReadMode_Repeat : ImGuiInputReadMode_Pressed);
if (nav_activated_by_code || nav_activated_by_inputs)
pressed = true;
if (nav_activated_by_code || nav_activated_by_inputs || g.ActiveId == id)
@@ -481,9 +582,8 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
// Set active id so it can be queried by user via IsItemActive(), equivalent of holding the mouse button.
g.NavActivateId = id; // This is so SetActiveId assign a Nav source
SetActiveID(id, window);
- if (!(flags & ImGuiButtonFlags_NoNavFocus))
+ if ((nav_activated_by_code || nav_activated_by_inputs) && !(flags & ImGuiButtonFlags_NoNavFocus))
SetFocusID(id, window);
- g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right) | (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down);
}
}
@@ -494,16 +594,24 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
{
if (g.ActiveIdIsJustActivated)
g.ActiveIdClickOffset = g.IO.MousePos - bb.Min;
- if (g.IO.MouseDown[0])
+
+ const int mouse_button = g.ActiveIdMouseButton;
+ IM_ASSERT(mouse_button >= 0 && mouse_button < ImGuiMouseButton_COUNT);
+ if (g.IO.MouseDown[mouse_button])
{
held = true;
}
else
{
- if (hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease))
- if (!((flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[0] >= g.IO.KeyRepeatDelay)) // Repeat mode trumps
- if (!g.DragDropActive)
- pressed = true;
+ bool release_in = hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease) != 0;
+ bool release_anywhere = (flags & ImGuiButtonFlags_PressedOnClickReleaseAnywhere) != 0;
+ if ((release_in || release_anywhere) && !g.DragDropActive)
+ {
+ bool is_double_click_release = (flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDownWasDoubleClick[mouse_button];
+ bool is_repeating_already = (flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[mouse_button] >= g.IO.KeyRepeatDelay; // Repeat mode trumps
+ if (!is_double_click_release && !is_repeating_already)
+ pressed = true;
+ }
ClearActiveID();
}
if (!(flags & ImGuiButtonFlags_NoNavFocus))
@@ -514,6 +622,8 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
if (g.NavActivateDownId != id)
ClearActiveID();
}
+ if (pressed)
+ g.ActiveIdHasBeenPressedBefore = true;
}
if (out_hovered) *out_hovered = hovered;
@@ -534,12 +644,12 @@ bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags
const ImVec2 label_size = CalcTextSize(label, NULL, true);
ImVec2 pos = window->DC.CursorPos;
- if ((flags & ImGuiButtonFlags_AlignTextBaseLine) && style.FramePadding.y < window->DC.CurrentLineTextBaseOffset) // Try to vertically align buttons that are smaller/have no padding so that text baseline matches (bit hacky, since it shouldn't be a flag)
- pos.y += window->DC.CurrentLineTextBaseOffset - style.FramePadding.y;
+ if ((flags & ImGuiButtonFlags_AlignTextBaseLine) && style.FramePadding.y < window->DC.CurrLineTextBaseOffset) // Try to vertically align buttons that are smaller/have no padding so that text baseline matches (bit hacky, since it shouldn't be a flag)
+ pos.y += window->DC.CurrLineTextBaseOffset - style.FramePadding.y;
ImVec2 size = CalcItemSize(size_arg, label_size.x + style.FramePadding.x * 2.0f, label_size.y + style.FramePadding.y * 2.0f);
const ImRect bb(pos, pos + size);
- ItemSize(bb, style.FramePadding.y);
+ ItemSize(size, style.FramePadding.y);
if (!ItemAdd(bb, id))
return false;
@@ -547,8 +657,6 @@ bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags
flags |= ImGuiButtonFlags_Repeat;
bool hovered, held;
bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags);
- if (pressed)
- MarkItemEdited(id);
// Render
const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
@@ -560,6 +668,7 @@ bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags
//if (pressed && !(flags & ImGuiButtonFlags_DontClosePopups) && (window->Flags & ImGuiWindowFlags_Popup))
// CloseCurrentPopup();
+ IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags);
return pressed;
}
@@ -593,7 +702,7 @@ bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg)
const ImGuiID id = window->GetID(str_id);
ImVec2 size = CalcItemSize(size_arg, 0.0f, 0.0f);
const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
- ItemSize(bb);
+ ItemSize(size);
if (!ItemAdd(bb, id))
return false;
@@ -613,7 +722,7 @@ bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiBu
const ImGuiID id = window->GetID(str_id);
const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
const float default_size = GetFrameHeight();
- ItemSize(bb, (size.y >= default_size) ? g.Style.FramePadding.y : 0.0f);
+ ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : -1.0f);
if (!ItemAdd(bb, id))
return false;
@@ -624,10 +733,11 @@ bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiBu
bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags);
// Render
- const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
+ const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
+ const ImU32 text_col = GetColorU32(ImGuiCol_Text);
RenderNavHighlight(bb, id);
- RenderFrame(bb.Min, bb.Max, col, true, g.Style.FrameRounding);
- RenderArrow(bb.Min + ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)), dir);
+ RenderFrame(bb.Min, bb.Max, bg_col, true, g.Style.FrameRounding);
+ RenderArrow(window->DrawList, bb.Min + ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)), text_col, dir);
return pressed;
}
@@ -635,18 +745,18 @@ bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiBu
bool ImGui::ArrowButton(const char* str_id, ImGuiDir dir)
{
float sz = GetFrameHeight();
- return ArrowButtonEx(str_id, dir, ImVec2(sz, sz), 0);
+ return ArrowButtonEx(str_id, dir, ImVec2(sz, sz), ImGuiButtonFlags_None);
}
// Button to close a window
-bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos, float radius)
+bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos)//, float size)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
// We intentionally allow interaction when clipped so that a mechanical Alt,Right,Validate sequence close a window.
// (this isn't the regular behavior of buttons, but it doesn't affect the user much because navigation tends to keep items visible).
- const ImRect bb(pos - ImVec2(radius,radius), pos + ImVec2(radius,radius));
+ const ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize) + g.Style.FramePadding * 2.0f);
bool is_clipped = !ItemAdd(bb, id);
bool hovered, held;
@@ -655,11 +765,12 @@ bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos, float radius)
return pressed;
// Render
+ ImU32 col = GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered);
ImVec2 center = bb.GetCenter();
if (hovered)
- window->DrawList->AddCircleFilled(center, ImMax(2.0f, radius), GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered), 9);
+ window->DrawList->AddCircleFilled(center, ImMax(2.0f, g.FontSize * 0.5f + 1.0f), col, 12);
- float cross_extent = (radius * 0.7071f) - 1.0f;
+ float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f;
ImU32 cross_col = GetColorU32(ImGuiCol_Text);
center -= ImVec2(0.5f, 0.5f);
window->DrawList->AddLine(center + ImVec2(+cross_extent,+cross_extent), center + ImVec2(-cross_extent,-cross_extent), cross_col, 1.0f);
@@ -678,126 +789,153 @@ bool ImGui::CollapseButton(ImGuiID id, const ImVec2& pos)
bool hovered, held;
bool pressed = ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_None);
- ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
+ // Render
+ ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
+ ImU32 text_col = GetColorU32(ImGuiCol_Text);
+ ImVec2 center = bb.GetCenter();
if (hovered || held)
- window->DrawList->AddCircleFilled(bb.GetCenter() + ImVec2(0.0f, -0.5f), g.FontSize * 0.5f + 1.0f, col, 9);
- RenderArrow(bb.Min + g.Style.FramePadding, window->Collapsed ? ImGuiDir_Right : ImGuiDir_Down, 1.0f);
+ window->DrawList->AddCircleFilled(center/*+ ImVec2(0.0f, -0.5f)*/, g.FontSize * 0.5f + 1.0f, bg_col, 12);
+ RenderArrow(window->DrawList, bb.Min + g.Style.FramePadding, text_col, window->Collapsed ? ImGuiDir_Right : ImGuiDir_Down, 1.0f);
// Switch to moving the window after mouse is moved beyond the initial drag threshold
- if (IsItemActive() && IsMouseDragging())
+ if (IsItemActive() && IsMouseDragging(0))
StartMouseMovingWindow(window);
return pressed;
}
+ImGuiID ImGui::GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis)
+{
+ return window->GetIDNoKeepAlive(axis == ImGuiAxis_X ? "#SCROLLX" : "#SCROLLY");
+}
+
// Vertical/Horizontal scrollbar
// The entire piece of code below is rather confusing because:
// - We handle absolute seeking (when first clicking outside the grab) and relative manipulation (afterward or when clicking inside the grab)
// - We store values as normalized ratio and in a form that allows the window content to change while we are holding on a scrollbar
// - We handle both horizontal and vertical scrollbars, which makes the terminology not ideal.
-void ImGui::Scrollbar(ImGuiLayoutType direction)
+// Still, the code should probably be made simpler..
+bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, float* p_scroll_v, float size_avail_v, float size_contents_v, ImDrawCornerFlags rounding_corners)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = g.CurrentWindow;
+ if (window->SkipItems)
+ return false;
+
+ const float bb_frame_width = bb_frame.GetWidth();
+ const float bb_frame_height = bb_frame.GetHeight();
+ if (bb_frame_width <= 0.0f || bb_frame_height <= 0.0f)
+ return false;
+
+ // When we are too small, start hiding and disabling the grab (this reduce visual noise on very small window and facilitate using the resize grab)
+ float alpha = 1.0f;
+ if ((axis == ImGuiAxis_Y) && bb_frame_height < g.FontSize + g.Style.FramePadding.y * 2.0f)
+ alpha = ImSaturate((bb_frame_height - g.FontSize) / (g.Style.FramePadding.y * 2.0f));
+ if (alpha <= 0.0f)
+ return false;
- const bool horizontal = (direction == ImGuiLayoutType_Horizontal);
const ImGuiStyle& style = g.Style;
- const ImGuiID id = window->GetID(horizontal ? "#SCROLLX" : "#SCROLLY");
+ const bool allow_interaction = (alpha >= 1.0f);
+ const bool horizontal = (axis == ImGuiAxis_X);
- // Render background
- bool other_scrollbar = (horizontal ? window->ScrollbarY : window->ScrollbarX);
- float other_scrollbar_size_w = other_scrollbar ? style.ScrollbarSize : 0.0f;
- const ImRect window_rect = window->Rect();
- const float border_size = window->WindowBorderSize;
- ImRect bb = horizontal
- ? ImRect(window->Pos.x + border_size, window_rect.Max.y - style.ScrollbarSize, window_rect.Max.x - other_scrollbar_size_w - border_size, window_rect.Max.y - border_size)
- : ImRect(window_rect.Max.x - style.ScrollbarSize, window->Pos.y + border_size, window_rect.Max.x - border_size, window_rect.Max.y - other_scrollbar_size_w - border_size);
- if (!horizontal)
- bb.Min.y += window->TitleBarHeight() + ((window->Flags & ImGuiWindowFlags_MenuBar) ? window->MenuBarHeight() : 0.0f);
- if (bb.GetWidth() <= 0.0f || bb.GetHeight() <= 0.0f)
- return;
-
- int window_rounding_corners;
- if (horizontal)
- window_rounding_corners = ImDrawCornerFlags_BotLeft | (other_scrollbar ? 0 : ImDrawCornerFlags_BotRight);
- else
- window_rounding_corners = (((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) ? ImDrawCornerFlags_TopRight : 0) | (other_scrollbar ? 0 : ImDrawCornerFlags_BotRight);
- window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_ScrollbarBg), window->WindowRounding, window_rounding_corners);
- bb.Expand(ImVec2(-ImClamp((float)(int)((bb.Max.x - bb.Min.x - 2.0f) * 0.5f), 0.0f, 3.0f), -ImClamp((float)(int)((bb.Max.y - bb.Min.y - 2.0f) * 0.5f), 0.0f, 3.0f)));
+ ImRect bb = bb_frame;
+ bb.Expand(ImVec2(-ImClamp(IM_FLOOR((bb_frame_width - 2.0f) * 0.5f), 0.0f, 3.0f), -ImClamp(IM_FLOOR((bb_frame_height - 2.0f) * 0.5f), 0.0f, 3.0f)));
// V denote the main, longer axis of the scrollbar (= height for a vertical scrollbar)
- float scrollbar_size_v = horizontal ? bb.GetWidth() : bb.GetHeight();
- float scroll_v = horizontal ? window->Scroll.x : window->Scroll.y;
- float win_size_avail_v = (horizontal ? window->SizeFull.x : window->SizeFull.y) - other_scrollbar_size_w;
- float win_size_contents_v = horizontal ? window->SizeContents.x : window->SizeContents.y;
+ const float scrollbar_size_v = horizontal ? bb.GetWidth() : bb.GetHeight();
// Calculate the height of our grabbable box. It generally represent the amount visible (vs the total scrollable amount)
// But we maintain a minimum size in pixel to allow for the user to still aim inside.
- IM_ASSERT(ImMax(win_size_contents_v, win_size_avail_v) > 0.0f); // Adding this assert to check if the ImMax(XXX,1.0f) is still needed. PLEASE CONTACT ME if this triggers.
- const float win_size_v = ImMax(ImMax(win_size_contents_v, win_size_avail_v), 1.0f);
- const float grab_h_pixels = ImClamp(scrollbar_size_v * (win_size_avail_v / win_size_v), style.GrabMinSize, scrollbar_size_v);
+ IM_ASSERT(ImMax(size_contents_v, size_avail_v) > 0.0f); // Adding this assert to check if the ImMax(XXX,1.0f) is still needed. PLEASE CONTACT ME if this triggers.
+ const float win_size_v = ImMax(ImMax(size_contents_v, size_avail_v), 1.0f);
+ const float grab_h_pixels = ImClamp(scrollbar_size_v * (size_avail_v / win_size_v), style.GrabMinSize, scrollbar_size_v);
const float grab_h_norm = grab_h_pixels / scrollbar_size_v;
// Handle input right away. None of the code of Begin() is relying on scrolling position before calling Scrollbar().
bool held = false;
bool hovered = false;
- const bool previously_held = (g.ActiveId == id);
ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_NoNavFocus);
- float scroll_max = ImMax(1.0f, win_size_contents_v - win_size_avail_v);
- float scroll_ratio = ImSaturate(scroll_v / scroll_max);
+ float scroll_max = ImMax(1.0f, size_contents_v - size_avail_v);
+ float scroll_ratio = ImSaturate(*p_scroll_v / scroll_max);
float grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v;
- if (held && grab_h_norm < 1.0f)
+ if (held && allow_interaction && grab_h_norm < 1.0f)
{
float scrollbar_pos_v = horizontal ? bb.Min.x : bb.Min.y;
float mouse_pos_v = horizontal ? g.IO.MousePos.x : g.IO.MousePos.y;
- float* click_delta_to_grab_center_v = horizontal ? &g.ScrollbarClickDeltaToGrabCenter.x : &g.ScrollbarClickDeltaToGrabCenter.y;
// Click position in scrollbar normalized space (0.0f->1.0f)
const float clicked_v_norm = ImSaturate((mouse_pos_v - scrollbar_pos_v) / scrollbar_size_v);
SetHoveredID(id);
bool seek_absolute = false;
- if (!previously_held)
+ if (g.ActiveIdIsJustActivated)
{
// On initial click calculate the distance between mouse and the center of the grab
- if (clicked_v_norm >= grab_v_norm && clicked_v_norm <= grab_v_norm + grab_h_norm)
- {
- *click_delta_to_grab_center_v = clicked_v_norm - grab_v_norm - grab_h_norm*0.5f;
- }
+ seek_absolute = (clicked_v_norm < grab_v_norm || clicked_v_norm > grab_v_norm + grab_h_norm);
+ if (seek_absolute)
+ g.ScrollbarClickDeltaToGrabCenter = 0.0f;
else
- {
- seek_absolute = true;
- *click_delta_to_grab_center_v = 0.0f;
- }
+ g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f;
}
// Apply scroll
- // It is ok to modify Scroll here because we are being called in Begin() after the calculation of SizeContents and before setting up our starting position
- const float scroll_v_norm = ImSaturate((clicked_v_norm - *click_delta_to_grab_center_v - grab_h_norm*0.5f) / (1.0f - grab_h_norm));
- scroll_v = (float)(int)(0.5f + scroll_v_norm * scroll_max);//(win_size_contents_v - win_size_v));
- if (horizontal)
- window->Scroll.x = scroll_v;
- else
- window->Scroll.y = scroll_v;
+ // It is ok to modify Scroll here because we are being called in Begin() after the calculation of ContentSize and before setting up our starting position
+ const float scroll_v_norm = ImSaturate((clicked_v_norm - g.ScrollbarClickDeltaToGrabCenter - grab_h_norm * 0.5f) / (1.0f - grab_h_norm));
+ *p_scroll_v = IM_ROUND(scroll_v_norm * scroll_max);//(win_size_contents_v - win_size_v));
// Update values for rendering
- scroll_ratio = ImSaturate(scroll_v / scroll_max);
+ scroll_ratio = ImSaturate(*p_scroll_v / scroll_max);
grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v;
// Update distance to grab now that we have seeked and saturated
if (seek_absolute)
- *click_delta_to_grab_center_v = clicked_v_norm - grab_v_norm - grab_h_norm*0.5f;
+ g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f;
}
// Render
- const ImU32 grab_col = GetColorU32(held ? ImGuiCol_ScrollbarGrabActive : hovered ? ImGuiCol_ScrollbarGrabHovered : ImGuiCol_ScrollbarGrab);
+ window->DrawList->AddRectFilled(bb_frame.Min, bb_frame.Max, GetColorU32(ImGuiCol_ScrollbarBg), window->WindowRounding, rounding_corners);
+ const ImU32 grab_col = GetColorU32(held ? ImGuiCol_ScrollbarGrabActive : hovered ? ImGuiCol_ScrollbarGrabHovered : ImGuiCol_ScrollbarGrab, alpha);
ImRect grab_rect;
if (horizontal)
- grab_rect = ImRect(ImLerp(bb.Min.x, bb.Max.x, grab_v_norm), bb.Min.y, ImMin(ImLerp(bb.Min.x, bb.Max.x, grab_v_norm) + grab_h_pixels, window_rect.Max.x), bb.Max.y);
+ grab_rect = ImRect(ImLerp(bb.Min.x, bb.Max.x, grab_v_norm), bb.Min.y, ImLerp(bb.Min.x, bb.Max.x, grab_v_norm) + grab_h_pixels, bb.Max.y);
else
- grab_rect = ImRect(bb.Min.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm), bb.Max.x, ImMin(ImLerp(bb.Min.y, bb.Max.y, grab_v_norm) + grab_h_pixels, window_rect.Max.y));
+ grab_rect = ImRect(bb.Min.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm), bb.Max.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm) + grab_h_pixels);
window->DrawList->AddRectFilled(grab_rect.Min, grab_rect.Max, grab_col, style.ScrollbarRounding);
+
+ return held;
+}
+
+void ImGui::Scrollbar(ImGuiAxis axis)
+{
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
+
+ const ImGuiID id = GetWindowScrollbarID(window, axis);
+ KeepAliveID(id);
+
+ // Calculate scrollbar bounding box
+ const ImRect outer_rect = window->Rect();
+ const ImRect inner_rect = window->InnerRect;
+ const float border_size = window->WindowBorderSize;
+ const float scrollbar_size = window->ScrollbarSizes[axis ^ 1];
+ IM_ASSERT(scrollbar_size > 0.0f);
+ const float other_scrollbar_size = window->ScrollbarSizes[axis];
+ ImDrawCornerFlags rounding_corners = (other_scrollbar_size <= 0.0f) ? ImDrawCornerFlags_BotRight : 0;
+ ImRect bb;
+ if (axis == ImGuiAxis_X)
+ {
+ bb.Min = ImVec2(inner_rect.Min.x, ImMax(outer_rect.Min.y, outer_rect.Max.y - border_size - scrollbar_size));
+ bb.Max = ImVec2(inner_rect.Max.x, outer_rect.Max.y);
+ rounding_corners |= ImDrawCornerFlags_BotLeft;
+ }
+ else
+ {
+ bb.Min = ImVec2(ImMax(outer_rect.Min.x, outer_rect.Max.x - border_size - scrollbar_size), inner_rect.Min.y);
+ bb.Max = ImVec2(outer_rect.Max.x, window->InnerRect.Max.y);
+ rounding_corners |= ((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) ? ImDrawCornerFlags_TopRight : 0;
+ }
+ ScrollbarEx(bb, id, axis, &window->Scroll[axis], inner_rect.Max[axis] - inner_rect.Min[axis], window->ContentSize[axis] + window->WindowPadding[axis] * 2.0f, rounding_corners);
}
void ImGui::Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& tint_col, const ImVec4& border_col)
@@ -875,19 +1013,10 @@ bool ImGui::Checkbox(const char* label, bool* v)
const ImGuiID id = window->GetID(label);
const ImVec2 label_size = CalcTextSize(label, NULL, true);
- const ImRect check_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(label_size.y + style.FramePadding.y*2, label_size.y + style.FramePadding.y*2)); // We want a square shape to we use Y twice
- ItemSize(check_bb, style.FramePadding.y);
-
- ImRect total_bb = check_bb;
- if (label_size.x > 0)
- SameLine(0, style.ItemInnerSpacing.x);
- const ImRect text_bb(window->DC.CursorPos + ImVec2(0,style.FramePadding.y), window->DC.CursorPos + ImVec2(0,style.FramePadding.y) + label_size);
- if (label_size.x > 0)
- {
- ItemSize(ImVec2(text_bb.GetWidth(), check_bb.GetHeight()), style.FramePadding.y);
- total_bb = ImRect(ImMin(check_bb.Min, text_bb.Min), ImMax(check_bb.Max, text_bb.Max));
- }
-
+ const float square_sz = GetFrameHeight();
+ const ImVec2 pos = window->DC.CursorPos;
+ const ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f));
+ ItemSize(total_bb, style.FramePadding.y);
if (!ItemAdd(total_bb, id))
return false;
@@ -899,20 +1028,28 @@ bool ImGui::Checkbox(const char* label, bool* v)
MarkItemEdited(id);
}
+ const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
RenderNavHighlight(total_bb, id);
RenderFrame(check_bb.Min, check_bb.Max, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding);
- if (*v)
+ ImU32 check_col = GetColorU32(ImGuiCol_CheckMark);
+ if (window->DC.ItemFlags & ImGuiItemFlags_MixedValue)
{
- const float check_sz = ImMin(check_bb.GetWidth(), check_bb.GetHeight());
- const float pad = ImMax(1.0f, (float)(int)(check_sz / 6.0f));
- RenderCheckMark(check_bb.Min + ImVec2(pad,pad), GetColorU32(ImGuiCol_CheckMark), check_bb.GetWidth() - pad*2.0f);
+ // Undocumented tristate/mixed/indeterminate checkbox (#2644)
+ ImVec2 pad(ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)), ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)));
+ window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding);
+ }
+ else if (*v)
+ {
+ const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
+ RenderCheckMark(check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad*2.0f);
}
if (g.LogEnabled)
- LogRenderedText(&text_bb.Min, *v ? "[x]" : "[ ]");
+ LogRenderedText(&total_bb.Min, *v ? "[x]" : "[ ]");
if (label_size.x > 0.0f)
- RenderText(text_bb.Min, label);
+ RenderText(ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y), label);
+ IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
return pressed;
}
@@ -942,26 +1079,18 @@ bool ImGui::RadioButton(const char* label, bool active)
const ImGuiID id = window->GetID(label);
const ImVec2 label_size = CalcTextSize(label, NULL, true);
- const ImRect check_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(label_size.y + style.FramePadding.y*2-1, label_size.y + style.FramePadding.y*2-1));
- ItemSize(check_bb, style.FramePadding.y);
-
- ImRect total_bb = check_bb;
- if (label_size.x > 0)
- SameLine(0, style.ItemInnerSpacing.x);
- const ImRect text_bb(window->DC.CursorPos + ImVec2(0, style.FramePadding.y), window->DC.CursorPos + ImVec2(0, style.FramePadding.y) + label_size);
- if (label_size.x > 0)
- {
- ItemSize(ImVec2(text_bb.GetWidth(), check_bb.GetHeight()), style.FramePadding.y);
- total_bb.Add(text_bb);
- }
-
+ const float square_sz = GetFrameHeight();
+ const ImVec2 pos = window->DC.CursorPos;
+ const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
+ const ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f));
+ ItemSize(total_bb, style.FramePadding.y);
if (!ItemAdd(total_bb, id))
return false;
ImVec2 center = check_bb.GetCenter();
- center.x = (float)(int)center.x + 0.5f;
- center.y = (float)(int)center.y + 0.5f;
- const float radius = check_bb.GetHeight() * 0.5f;
+ center.x = IM_ROUND(center.x);
+ center.y = IM_ROUND(center.y);
+ const float radius = (square_sz - 1.0f) * 0.5f;
bool hovered, held;
bool pressed = ButtonBehavior(total_bb, id, &hovered, &held);
@@ -972,25 +1101,25 @@ bool ImGui::RadioButton(const char* label, bool active)
window->DrawList->AddCircleFilled(center, radius, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), 16);
if (active)
{
- const float check_sz = ImMin(check_bb.GetWidth(), check_bb.GetHeight());
- const float pad = ImMax(1.0f, (float)(int)(check_sz / 6.0f));
- window->DrawList->AddCircleFilled(center, radius-pad, GetColorU32(ImGuiCol_CheckMark), 16);
+ const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
+ window->DrawList->AddCircleFilled(center, radius - pad, GetColorU32(ImGuiCol_CheckMark), 16);
}
if (style.FrameBorderSize > 0.0f)
{
- window->DrawList->AddCircle(center+ImVec2(1,1), radius, GetColorU32(ImGuiCol_BorderShadow), 16, style.FrameBorderSize);
+ window->DrawList->AddCircle(center + ImVec2(1,1), radius, GetColorU32(ImGuiCol_BorderShadow), 16, style.FrameBorderSize);
window->DrawList->AddCircle(center, radius, GetColorU32(ImGuiCol_Border), 16, style.FrameBorderSize);
}
if (g.LogEnabled)
- LogRenderedText(&text_bb.Min, active ? "(x)" : "( )");
+ LogRenderedText(&total_bb.Min, active ? "(x)" : "( )");
if (label_size.x > 0.0f)
- RenderText(text_bb.Min, label);
+ RenderText(ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y), label);
return pressed;
}
+// FIXME: This would work nicely if it was a public template, e.g. 'template RadioButton(const char* label, T* v, T v_button)', but I'm not sure how we would expose it..
bool ImGui::RadioButton(const char* label, int* v, int v_button)
{
const bool pressed = RadioButton(label, *v == v_button);
@@ -1010,8 +1139,9 @@ void ImGui::ProgressBar(float fraction, const ImVec2& size_arg, const char* over
const ImGuiStyle& style = g.Style;
ImVec2 pos = window->DC.CursorPos;
- ImRect bb(pos, pos + CalcItemSize(size_arg, CalcItemWidth(), g.FontSize + style.FramePadding.y*2.0f));
- ItemSize(bb, style.FramePadding.y);
+ ImVec2 size = CalcItemSize(size_arg, CalcItemWidth(), g.FontSize + style.FramePadding.y*2.0f);
+ ImRect bb(pos, pos + size);
+ ItemSize(size, style.FramePadding.y);
if (!ItemAdd(bb, 0))
return;
@@ -1043,7 +1173,7 @@ void ImGui::Bullet()
ImGuiContext& g = *GImGui;
const ImGuiStyle& style = g.Style;
- const float line_height = ImMax(ImMin(window->DC.CurrentLineSize.y, g.FontSize + g.Style.FramePadding.y*2), g.FontSize);
+ const float line_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + g.Style.FramePadding.y*2), g.FontSize);
const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(g.FontSize, line_height));
ItemSize(bb);
if (!ItemAdd(bb, 0))
@@ -1053,8 +1183,9 @@ void ImGui::Bullet()
}
// Render and stay on same line
- RenderBullet(bb.Min + ImVec2(style.FramePadding.x + g.FontSize*0.5f, line_height*0.5f));
- SameLine(0, style.FramePadding.x*2);
+ ImU32 text_col = GetColorU32(ImGuiCol_Text);
+ RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize*0.5f, line_height*0.5f), text_col);
+ SameLine(0, style.FramePadding.x * 2.0f);
}
//-------------------------------------------------------------------------
@@ -1064,9 +1195,10 @@ void ImGui::Bullet()
// - Dummy()
// - NewLine()
// - AlignTextToFramePadding()
+// - SeparatorEx() [Internal]
// - Separator()
-// - VerticalSeparator() [Internal]
// - SplitterBehavior() [Internal]
+// - ShrinkWidths() [Internal]
//-------------------------------------------------------------------------
void ImGui::Spacing()
@@ -1084,7 +1216,7 @@ void ImGui::Dummy(const ImVec2& size)
return;
const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
- ItemSize(bb);
+ ItemSize(size);
ItemAdd(bb, 0);
}
@@ -1097,7 +1229,7 @@ void ImGui::NewLine()
ImGuiContext& g = *GImGui;
const ImGuiLayoutType backup_layout_type = window->DC.LayoutType;
window->DC.LayoutType = ImGuiLayoutType_Vertical;
- if (window->DC.CurrentLineSize.y > 0.0f) // In the event that we are on a line with items that is smaller that FontSize high, we will preserve its height.
+ if (window->DC.CurrLineSize.y > 0.0f) // In the event that we are on a line with items that is smaller that FontSize high, we will preserve its height.
ItemSize(ImVec2(0,0));
else
ItemSize(ImVec2(0.0f, g.FontSize));
@@ -1111,74 +1243,79 @@ void ImGui::AlignTextToFramePadding()
return;
ImGuiContext& g = *GImGui;
- window->DC.CurrentLineSize.y = ImMax(window->DC.CurrentLineSize.y, g.FontSize + g.Style.FramePadding.y * 2);
- window->DC.CurrentLineTextBaseOffset = ImMax(window->DC.CurrentLineTextBaseOffset, g.Style.FramePadding.y);
+ window->DC.CurrLineSize.y = ImMax(window->DC.CurrLineSize.y, g.FontSize + g.Style.FramePadding.y * 2);
+ window->DC.CurrLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, g.Style.FramePadding.y);
}
// Horizontal/vertical separating line
-void ImGui::Separator()
+void ImGui::SeparatorEx(ImGuiSeparatorFlags flags)
{
ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems)
return;
- ImGuiContext& g = *GImGui;
- // Those flags should eventually be overridable by the user
- ImGuiSeparatorFlags flags = (window->DC.LayoutType == ImGuiLayoutType_Horizontal) ? ImGuiSeparatorFlags_Vertical : ImGuiSeparatorFlags_Horizontal;
- IM_ASSERT(ImIsPowerOfTwo((int)(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)))); // Check that only 1 option is selected
+ ImGuiContext& g = *GImGui;
+ IM_ASSERT(ImIsPowerOfTwo(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical))); // Check that only 1 option is selected
+
+ float thickness_draw = 1.0f;
+ float thickness_layout = 0.0f;
if (flags & ImGuiSeparatorFlags_Vertical)
{
- VerticalSeparator();
- return;
+ // Vertical separator, for menu bars (use current line height). Not exposed because it is misleading and it doesn't have an effect on regular layout.
+ float y1 = window->DC.CursorPos.y;
+ float y2 = window->DC.CursorPos.y + window->DC.CurrLineSize.y;
+ const ImRect bb(ImVec2(window->DC.CursorPos.x, y1), ImVec2(window->DC.CursorPos.x + thickness_draw, y2));
+ ItemSize(ImVec2(thickness_layout, 0.0f));
+ if (!ItemAdd(bb, 0))
+ return;
+
+ // Draw
+ window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator));
+ if (g.LogEnabled)
+ LogText(" |");
}
-
- // Horizontal Separator
- if (window->DC.ColumnsSet)
- PopClipRect();
-
- float x1 = window->Pos.x;
- float x2 = window->Pos.x + window->Size.x;
- if (!window->DC.GroupStack.empty())
- x1 += window->DC.Indent.x;
-
- const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y+1.0f));
- ItemSize(ImVec2(0.0f, 0.0f)); // NB: we don't provide our width so that it doesn't get feed back into AutoFit, we don't provide height to not alter layout.
- if (!ItemAdd(bb, 0))
+ else if (flags & ImGuiSeparatorFlags_Horizontal)
{
- if (window->DC.ColumnsSet)
- PushColumnClipRect();
- return;
- }
+ // Horizontal Separator
+ float x1 = window->Pos.x;
+ float x2 = window->Pos.x + window->Size.x;
+ if (!window->DC.GroupStack.empty())
+ x1 += window->DC.Indent.x;
- window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x,bb.Min.y), GetColorU32(ImGuiCol_Separator));
+ ImGuiColumns* columns = (flags & ImGuiSeparatorFlags_SpanAllColumns) ? window->DC.CurrentColumns : NULL;
+ if (columns)
+ PushColumnsBackground();
- if (g.LogEnabled)
- LogRenderedText(NULL, IM_NEWLINE "--------------------------------");
-
- if (window->DC.ColumnsSet)
- {
- PushColumnClipRect();
- window->DC.ColumnsSet->LineMinY = window->DC.CursorPos.y;
+ // We don't provide our width to the layout so that it doesn't get feed back into AutoFit
+ const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y + thickness_draw));
+ ItemSize(ImVec2(0.0f, thickness_layout));
+ const bool item_visible = ItemAdd(bb, 0);
+ if (item_visible)
+ {
+ // Draw
+ window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x, bb.Min.y), GetColorU32(ImGuiCol_Separator));
+ if (g.LogEnabled)
+ LogRenderedText(&bb.Min, "--------------------------------");
+ }
+ if (columns)
+ {
+ PopColumnsBackground();
+ columns->LineMinY = window->DC.CursorPos.y;
+ }
}
}
-void ImGui::VerticalSeparator()
+void ImGui::Separator()
{
- ImGuiWindow* window = GetCurrentWindow();
+ ImGuiContext& g = *GImGui;
+ ImGuiWindow* window = g.CurrentWindow;
if (window->SkipItems)
return;
- ImGuiContext& g = *GImGui;
- float y1 = window->DC.CursorPos.y;
- float y2 = window->DC.CursorPos.y + window->DC.CurrentLineSize.y;
- const ImRect bb(ImVec2(window->DC.CursorPos.x, y1), ImVec2(window->DC.CursorPos.x + 1.0f, y2));
- ItemSize(ImVec2(bb.GetWidth(), 0.0f));
- if (!ItemAdd(bb, 0))
- return;
-
- window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator));
- if (g.LogEnabled)
- LogText(" |");
+ // Those flags should eventually be overridable by the user
+ ImGuiSeparatorFlags flags = (window->DC.LayoutType == ImGuiLayoutType_Horizontal) ? ImGuiSeparatorFlags_Vertical : ImGuiSeparatorFlags_Horizontal;
+ flags |= ImGuiSeparatorFlags_SpanAllColumns;
+ SeparatorEx(flags);
}
// Using 'hover_visibility_delay' allows us to hide the highlight and mouse cursor for a short time, which can be convenient to reduce visual noise.
@@ -1234,14 +1371,58 @@ bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float
// Render
const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : (hovered && g.HoveredIdTimer >= hover_visibility_delay) ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator);
- window->DrawList->AddRectFilled(bb_render.Min, bb_render.Max, col, g.Style.FrameRounding);
+ window->DrawList->AddRectFilled(bb_render.Min, bb_render.Max, col, 0.0f);
return held;
}
+static int IMGUI_CDECL ShrinkWidthItemComparer(const void* lhs, const void* rhs)
+{
+ const ImGuiShrinkWidthItem* a = (const ImGuiShrinkWidthItem*)lhs;
+ const ImGuiShrinkWidthItem* b = (const ImGuiShrinkWidthItem*)rhs;
+ if (int d = (int)(b->Width - a->Width))
+ return d;
+ return (b->Index - a->Index);
+}
+
+// Shrink excess width from a set of item, by removing width from the larger items first.
+void ImGui::ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_excess)
+{
+ if (count == 1)
+ {
+ items[0].Width = ImMax(items[0].Width - width_excess, 1.0f);
+ return;
+ }
+ ImQsort(items, (size_t)count, sizeof(ImGuiShrinkWidthItem), ShrinkWidthItemComparer);
+ int count_same_width = 1;
+ while (width_excess > 0.0f && count_same_width < count)
+ {
+ while (count_same_width < count && items[0].Width <= items[count_same_width].Width)
+ count_same_width++;
+ float max_width_to_remove_per_item = (count_same_width < count) ? (items[0].Width - items[count_same_width].Width) : (items[0].Width - 1.0f);
+ float width_to_remove_per_item = ImMin(width_excess / count_same_width, max_width_to_remove_per_item);
+ for (int item_n = 0; item_n < count_same_width; item_n++)
+ items[item_n].Width -= width_to_remove_per_item;
+ width_excess -= width_to_remove_per_item * count_same_width;
+ }
+
+ // Round width and redistribute remainder left-to-right (could make it an option of the function?)
+ // Ensure that e.g. the right-most tab of a shrunk tab-bar always reaches exactly at the same distance from the right-most edge of the tab bar separator.
+ width_excess = 0.0f;
+ for (int n = 0; n < count; n++)
+ {
+ float width_rounded = ImFloor(items[n].Width);
+ width_excess += items[n].Width - width_rounded;
+ items[n].Width = width_rounded;
+ }
+ if (width_excess > 0.0f)
+ for (int n = 0; n < count; n++)
+ if (items[n].Index < (int)(width_excess + 0.01f))
+ items[n].Width += 1.0f;
+}
//-------------------------------------------------------------------------
-// [SECTION] Widgets: Combo Box
+// [SECTION] Widgets: ComboBox
//-------------------------------------------------------------------------
// - BeginCombo()
// - EndCombo()
@@ -1260,8 +1441,8 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF
{
// Always consume the SetNextWindowSizeConstraint() call in our early return paths
ImGuiContext& g = *GImGui;
- ImGuiCond backup_next_window_size_constraint = g.NextWindowData.SizeConstraintCond;
- g.NextWindowData.SizeConstraintCond = 0;
+ bool has_window_size_constraint = (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint) != 0;
+ g.NextWindowData.Flags &= ~ImGuiNextWindowDataFlags_HasSizeConstraint;
ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems)
@@ -1274,7 +1455,8 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF
const float arrow_size = (flags & ImGuiComboFlags_NoArrowButton) ? 0.0f : GetFrameHeight();
const ImVec2 label_size = CalcTextSize(label, NULL, true);
- const float w = (flags & ImGuiComboFlags_NoPreview) ? arrow_size : CalcItemWidth();
+ const float expected_w = CalcItemWidth();
+ const float w = (flags & ImGuiComboFlags_NoPreview) ? arrow_size : expected_w;
const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y*2.0f));
const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f));
ItemSize(total_bb, style.FramePadding.y);
@@ -1285,19 +1467,22 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF
bool pressed = ButtonBehavior(frame_bb, id, &hovered, &held);
bool popup_open = IsPopupOpen(id);
- const ImRect value_bb(frame_bb.Min, frame_bb.Max - ImVec2(arrow_size, 0.0f));
const ImU32 frame_col = GetColorU32(hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg);
+ const float value_x2 = ImMax(frame_bb.Min.x, frame_bb.Max.x - arrow_size);
RenderNavHighlight(frame_bb, id);
if (!(flags & ImGuiComboFlags_NoPreview))
- window->DrawList->AddRectFilled(frame_bb.Min, ImVec2(frame_bb.Max.x - arrow_size, frame_bb.Max.y), frame_col, style.FrameRounding, ImDrawCornerFlags_Left);
+ window->DrawList->AddRectFilled(frame_bb.Min, ImVec2(value_x2, frame_bb.Max.y), frame_col, style.FrameRounding, (flags & ImGuiComboFlags_NoArrowButton) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Left);
if (!(flags & ImGuiComboFlags_NoArrowButton))
{
- window->DrawList->AddRectFilled(ImVec2(frame_bb.Max.x - arrow_size, frame_bb.Min.y), frame_bb.Max, GetColorU32((popup_open || hovered) ? ImGuiCol_ButtonHovered : ImGuiCol_Button), style.FrameRounding, (w <= arrow_size) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Right);
- RenderArrow(ImVec2(frame_bb.Max.x - arrow_size + style.FramePadding.y, frame_bb.Min.y + style.FramePadding.y), ImGuiDir_Down);
+ ImU32 bg_col = GetColorU32((popup_open || hovered) ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
+ ImU32 text_col = GetColorU32(ImGuiCol_Text);
+ window->DrawList->AddRectFilled(ImVec2(value_x2, frame_bb.Min.y), frame_bb.Max, bg_col, style.FrameRounding, (w <= arrow_size) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Right);
+ if (value_x2 + arrow_size - style.FramePadding.x <= frame_bb.Max.x)
+ RenderArrow(window->DrawList, ImVec2(value_x2 + style.FramePadding.y, frame_bb.Min.y + style.FramePadding.y), text_col, ImGuiDir_Down, 1.0f);
}
RenderFrameBorder(frame_bb.Min, frame_bb.Max, style.FrameRounding);
if (preview_value != NULL && !(flags & ImGuiComboFlags_NoPreview))
- RenderTextClipped(frame_bb.Min + style.FramePadding, value_bb.Max, preview_value, NULL, NULL, ImVec2(0.0f,0.0f));
+ RenderTextClipped(frame_bb.Min + style.FramePadding, ImVec2(value_x2, frame_bb.Max.y), preview_value, NULL, NULL, ImVec2(0.0f,0.0f));
if (label_size.x > 0)
RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label);
@@ -1312,9 +1497,9 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF
if (!popup_open)
return false;
- if (backup_next_window_size_constraint)
+ if (has_window_size_constraint)
{
- g.NextWindowData.SizeConstraintCond = backup_next_window_size_constraint;
+ g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSizeConstraint;
g.NextWindowData.SizeConstraintRect.Min.x = ImMax(g.NextWindowData.SizeConstraintRect.Min.x, w);
}
else
@@ -1330,7 +1515,7 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF
}
char name[16];
- ImFormatString(name, IM_ARRAYSIZE(name), "##Combo_%02d", g.CurrentPopupStack.Size); // Recycle windows based on depth
+ ImFormatString(name, IM_ARRAYSIZE(name), "##Combo_%02d", g.BeginPopupStack.Size); // Recycle windows based on depth
// Peak into expected window size so we can position it
if (ImGuiWindow* popup_window = FindWindowByName(name))
@@ -1344,8 +1529,10 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF
SetNextWindowPos(pos);
}
+ // We don't use BeginPopupEx() solely because we have a custom name string, which we could make an argument to BeginPopupEx()
+ ImGuiWindowFlags window_flags = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_Popup | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoMove;
+
// Horizontally align ourselves with the framed text
- ImGuiWindowFlags window_flags = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_Popup | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings;
PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(style.FramePadding.x, style.WindowPadding.y));
bool ret = Begin(name, NULL, window_flags);
PopStyleVar();
@@ -1404,7 +1591,7 @@ bool ImGui::Combo(const char* label, int* current_item, bool (*items_getter)(voi
items_getter(data, *current_item, &preview_value);
// The old Combo() API exposed "popup_max_height_in_items". The new more general BeginCombo() API doesn't have/need it, but we emulate it here.
- if (popup_max_height_in_items != -1 && !g.NextWindowData.SizeConstraintCond)
+ if (popup_max_height_in_items != -1 && !(g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint))
SetNextWindowSizeConstraints(ImVec2(0,0), ImVec2(FLT_MAX, CalcMaxPopupHeightFromItemCount(popup_max_height_in_items)));
if (!BeginCombo(label, preview_value, ImGuiComboFlags_None))
@@ -1441,7 +1628,7 @@ bool ImGui::Combo(const char* label, int* current_item, const char* const items[
return value_changed;
}
-// Combo box helper allowing to pass all items in a single string literal holding multiple zero-terminated items "item1\0item2\0"
+// Combo box helper allowing to pass all items in a single string literal holding multiple zero-terminated items "item1\0item2\0"
bool ImGui::Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int height_in_items)
{
int items_count = 0;
@@ -1459,6 +1646,7 @@ bool ImGui::Combo(const char* label, int* current_item, const char* items_separa
// [SECTION] Data Type and Data Formatting Helpers [Internal]
//-------------------------------------------------------------------------
// - PatchFormatStringFloatToInt()
+// - DataTypeGetInfo()
// - DataTypeFormatString()
// - DataTypeApplyOp()
// - DataTypeApplyOpFromText()
@@ -1466,26 +1654,23 @@ bool ImGui::Combo(const char* label, int* current_item, const char* items_separa
// - RoundScalarWithFormat<>()
//-------------------------------------------------------------------------
-struct ImGuiDataTypeInfo
-{
- size_t Size;
- const char* PrintFmt; // Unused
- const char* ScanFmt;
-};
-
static const ImGuiDataTypeInfo GDataTypeInfo[] =
{
- { sizeof(int), "%d", "%d" },
- { sizeof(unsigned int), "%u", "%u" },
+ { sizeof(char), "%d", "%d" }, // ImGuiDataType_S8
+ { sizeof(unsigned char), "%u", "%u" },
+ { sizeof(short), "%d", "%d" }, // ImGuiDataType_S16
+ { sizeof(unsigned short), "%u", "%u" },
+ { sizeof(int), "%d", "%d" }, // ImGuiDataType_S32
+ { sizeof(unsigned int), "%u", "%u" },
#ifdef _MSC_VER
- { sizeof(ImS64), "%I64d","%I64d" },
- { sizeof(ImU64), "%I64u","%I64u" },
+ { sizeof(ImS64), "%I64d","%I64d" }, // ImGuiDataType_S64
+ { sizeof(ImU64), "%I64u","%I64u" },
#else
- { sizeof(ImS64), "%lld", "%lld" },
- { sizeof(ImU64), "%llu", "%llu" },
+ { sizeof(ImS64), "%lld", "%lld" }, // ImGuiDataType_S64
+ { sizeof(ImU64), "%llu", "%llu" },
#endif
- { sizeof(float), "%f", "%f" }, // float are promoted to double in va_arg
- { sizeof(double), "%f", "%lf" },
+ { sizeof(float), "%f", "%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg)
+ { sizeof(double), "%f", "%lf" }, // ImGuiDataType_Double
};
IM_STATIC_ASSERT(IM_ARRAYSIZE(GDataTypeInfo) == ImGuiDataType_COUNT);
@@ -1513,49 +1698,79 @@ static const char* PatchFormatStringFloatToInt(const char* fmt)
return fmt;
}
-static inline int DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* data_ptr, const char* format)
+const ImGuiDataTypeInfo* ImGui::DataTypeGetInfo(ImGuiDataType data_type)
{
- if (data_type == ImGuiDataType_S32 || data_type == ImGuiDataType_U32) // Signedness doesn't matter when pushing the argument
- return ImFormatString(buf, buf_size, format, *(const ImU32*)data_ptr);
- if (data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64) // Signedness doesn't matter when pushing the argument
- return ImFormatString(buf, buf_size, format, *(const ImU64*)data_ptr);
+ IM_ASSERT(data_type >= 0 && data_type < ImGuiDataType_COUNT);
+ return &GDataTypeInfo[data_type];
+}
+
+int ImGui::DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* p_data, const char* format)
+{
+ // Signedness doesn't matter when pushing integer arguments
+ if (data_type == ImGuiDataType_S32 || data_type == ImGuiDataType_U32)
+ return ImFormatString(buf, buf_size, format, *(const ImU32*)p_data);
+ if (data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64)
+ return ImFormatString(buf, buf_size, format, *(const ImU64*)p_data);
if (data_type == ImGuiDataType_Float)
- return ImFormatString(buf, buf_size, format, *(const float*)data_ptr);
+ return ImFormatString(buf, buf_size, format, *(const float*)p_data);
if (data_type == ImGuiDataType_Double)
- return ImFormatString(buf, buf_size, format, *(const double*)data_ptr);
+ return ImFormatString(buf, buf_size, format, *(const double*)p_data);
+ if (data_type == ImGuiDataType_S8)
+ return ImFormatString(buf, buf_size, format, *(const ImS8*)p_data);
+ if (data_type == ImGuiDataType_U8)
+ return ImFormatString(buf, buf_size, format, *(const ImU8*)p_data);
+ if (data_type == ImGuiDataType_S16)
+ return ImFormatString(buf, buf_size, format, *(const ImS16*)p_data);
+ if (data_type == ImGuiDataType_U16)
+ return ImFormatString(buf, buf_size, format, *(const ImU16*)p_data);
IM_ASSERT(0);
return 0;
}
-// FIXME: Adding support for clamping on boundaries of the data type would be nice.
-static void DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* arg1, const void* arg2)
+void ImGui::DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* arg1, const void* arg2)
{
IM_ASSERT(op == '+' || op == '-');
switch (data_type)
{
+ case ImGuiDataType_S8:
+ if (op == '+') { *(ImS8*)output = ImAddClampOverflow(*(const ImS8*)arg1, *(const ImS8*)arg2, IM_S8_MIN, IM_S8_MAX); }
+ if (op == '-') { *(ImS8*)output = ImSubClampOverflow(*(const ImS8*)arg1, *(const ImS8*)arg2, IM_S8_MIN, IM_S8_MAX); }
+ return;
+ case ImGuiDataType_U8:
+ if (op == '+') { *(ImU8*)output = ImAddClampOverflow(*(const ImU8*)arg1, *(const ImU8*)arg2, IM_U8_MIN, IM_U8_MAX); }
+ if (op == '-') { *(ImU8*)output = ImSubClampOverflow(*(const ImU8*)arg1, *(const ImU8*)arg2, IM_U8_MIN, IM_U8_MAX); }
+ return;
+ case ImGuiDataType_S16:
+ if (op == '+') { *(ImS16*)output = ImAddClampOverflow(*(const ImS16*)arg1, *(const ImS16*)arg2, IM_S16_MIN, IM_S16_MAX); }
+ if (op == '-') { *(ImS16*)output = ImSubClampOverflow(*(const ImS16*)arg1, *(const ImS16*)arg2, IM_S16_MIN, IM_S16_MAX); }
+ return;
+ case ImGuiDataType_U16:
+ if (op == '+') { *(ImU16*)output = ImAddClampOverflow(*(const ImU16*)arg1, *(const ImU16*)arg2, IM_U16_MIN, IM_U16_MAX); }
+ if (op == '-') { *(ImU16*)output = ImSubClampOverflow(*(const ImU16*)arg1, *(const ImU16*)arg2, IM_U16_MIN, IM_U16_MAX); }
+ return;
case ImGuiDataType_S32:
- if (op == '+') *(int*)output = *(const int*)arg1 + *(const int*)arg2;
- else if (op == '-') *(int*)output = *(const int*)arg1 - *(const int*)arg2;
+ if (op == '+') { *(ImS32*)output = ImAddClampOverflow(*(const ImS32*)arg1, *(const ImS32*)arg2, IM_S32_MIN, IM_S32_MAX); }
+ if (op == '-') { *(ImS32*)output = ImSubClampOverflow(*(const ImS32*)arg1, *(const ImS32*)arg2, IM_S32_MIN, IM_S32_MAX); }
return;
case ImGuiDataType_U32:
- if (op == '+') *(unsigned int*)output = *(const unsigned int*)arg1 + *(const ImU32*)arg2;
- else if (op == '-') *(unsigned int*)output = *(const unsigned int*)arg1 - *(const ImU32*)arg2;
+ if (op == '+') { *(ImU32*)output = ImAddClampOverflow(*(const ImU32*)arg1, *(const ImU32*)arg2, IM_U32_MIN, IM_U32_MAX); }
+ if (op == '-') { *(ImU32*)output = ImSubClampOverflow(*(const ImU32*)arg1, *(const ImU32*)arg2, IM_U32_MIN, IM_U32_MAX); }
return;
case ImGuiDataType_S64:
- if (op == '+') *(ImS64*)output = *(const ImS64*)arg1 + *(const ImS64*)arg2;
- else if (op == '-') *(ImS64*)output = *(const ImS64*)arg1 - *(const ImS64*)arg2;
+ if (op == '+') { *(ImS64*)output = ImAddClampOverflow(*(const ImS64*)arg1, *(const ImS64*)arg2, IM_S64_MIN, IM_S64_MAX); }
+ if (op == '-') { *(ImS64*)output = ImSubClampOverflow(*(const ImS64*)arg1, *(const ImS64*)arg2, IM_S64_MIN, IM_S64_MAX); }
return;
case ImGuiDataType_U64:
- if (op == '+') *(ImU64*)output = *(const ImU64*)arg1 + *(const ImU64*)arg2;
- else if (op == '-') *(ImU64*)output = *(const ImU64*)arg1 - *(const ImU64*)arg2;
+ if (op == '+') { *(ImU64*)output = ImAddClampOverflow(*(const ImU64*)arg1, *(const ImU64*)arg2, IM_U64_MIN, IM_U64_MAX); }
+ if (op == '-') { *(ImU64*)output = ImSubClampOverflow(*(const ImU64*)arg1, *(const ImU64*)arg2, IM_U64_MIN, IM_U64_MAX); }
return;
case ImGuiDataType_Float:
- if (op == '+') *(float*)output = *(const float*)arg1 + *(const float*)arg2;
- else if (op == '-') *(float*)output = *(const float*)arg1 - *(const float*)arg2;
+ if (op == '+') { *(float*)output = *(const float*)arg1 + *(const float*)arg2; }
+ if (op == '-') { *(float*)output = *(const float*)arg1 - *(const float*)arg2; }
return;
case ImGuiDataType_Double:
- if (op == '+') *(double*)output = *(const double*)arg1 + *(const double*)arg2;
- else if (op == '-') *(double*)output = *(const double*)arg1 - *(const double*)arg2;
+ if (op == '+') { *(double*)output = *(const double*)arg1 + *(const double*)arg2; }
+ if (op == '-') { *(double*)output = *(const double*)arg1 - *(const double*)arg2; }
return;
case ImGuiDataType_COUNT: break;
}
@@ -1564,7 +1779,7 @@ static void DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void*
// User can input math operators (e.g. +100) to edit a numerical values.
// NB: This is _not_ a full expression evaluator. We should probably add one and replace this dumb mess..
-static bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* data_ptr, const char* format)
+bool ImGui::DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* p_data, const char* format)
{
while (ImCharIsBlankA(*buf))
buf++;
@@ -1588,16 +1803,18 @@ static bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_b
// Copy the value in an opaque buffer so we can compare at the end of the function if it changed at all.
IM_ASSERT(data_type < ImGuiDataType_COUNT);
int data_backup[2];
- IM_ASSERT(GDataTypeInfo[data_type].Size <= sizeof(data_backup));
- memcpy(data_backup, data_ptr, GDataTypeInfo[data_type].Size);
+ const ImGuiDataTypeInfo* type_info = ImGui::DataTypeGetInfo(data_type);
+ IM_ASSERT(type_info->Size <= sizeof(data_backup));
+ memcpy(data_backup, p_data, type_info->Size);
if (format == NULL)
- format = GDataTypeInfo[data_type].ScanFmt;
+ format = type_info->ScanFmt;
+ // FIXME-LEGACY: The aim is to remove those operators and write a proper expression evaluator at some point..
int arg1i = 0;
if (data_type == ImGuiDataType_S32)
{
- int* v = (int*)data_ptr;
+ int* v = (int*)p_data;
int arg0i = *v;
float arg1f = 0.0f;
if (op && sscanf(initial_value_buf, format, &arg0i) < 1)
@@ -1608,17 +1825,11 @@ static bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_b
else if (op == '/') { if (sscanf(buf, "%f", &arg1f) && arg1f != 0.0f) *v = (int)(arg0i / arg1f); } // Divide
else { if (sscanf(buf, format, &arg1i) == 1) *v = arg1i; } // Assign constant
}
- else if (data_type == ImGuiDataType_U32 || data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64)
- {
- // Assign constant
- // FIXME: We don't bother handling support for legacy operators since they are a little too crappy. Instead we may implement a proper expression evaluator in the future.
- sscanf(buf, format, data_ptr);
- }
else if (data_type == ImGuiDataType_Float)
{
// For floats we have to ignore format with precision (e.g. "%.2f") because sscanf doesn't take them in
format = "%f";
- float* v = (float*)data_ptr;
+ float* v = (float*)p_data;
float arg0f = *v, arg1f = 0.0f;
if (op && sscanf(initial_value_buf, format, &arg0f) < 1)
return false;
@@ -1632,7 +1843,7 @@ static bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_b
else if (data_type == ImGuiDataType_Double)
{
format = "%lf"; // scanf differentiate float/double unlike printf which forces everything to double because of ellipsis
- double* v = (double*)data_ptr;
+ double* v = (double*)p_data;
double arg0f = *v, arg1f = 0.0;
if (op && sscanf(initial_value_buf, format, &arg0f) < 1)
return false;
@@ -1643,7 +1854,30 @@ static bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_b
else if (op == '/') { if (arg1f != 0.0f) *v = arg0f / arg1f; } // Divide
else { *v = arg1f; } // Assign constant
}
- return memcmp(data_backup, data_ptr, GDataTypeInfo[data_type].Size) != 0;
+ else if (data_type == ImGuiDataType_U32 || data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64)
+ {
+ // All other types assign constant
+ // We don't bother handling support for legacy operators since they are a little too crappy. Instead we will later implement a proper expression evaluator in the future.
+ sscanf(buf, format, p_data);
+ }
+ else
+ {
+ // Small types need a 32-bit buffer to receive the result from scanf()
+ int v32;
+ sscanf(buf, format, &v32);
+ if (data_type == ImGuiDataType_S8)
+ *(ImS8*)p_data = (ImS8)ImClamp(v32, (int)IM_S8_MIN, (int)IM_S8_MAX);
+ else if (data_type == ImGuiDataType_U8)
+ *(ImU8*)p_data = (ImU8)ImClamp(v32, (int)IM_U8_MIN, (int)IM_U8_MAX);
+ else if (data_type == ImGuiDataType_S16)
+ *(ImS16*)p_data = (ImS16)ImClamp(v32, (int)IM_S16_MIN, (int)IM_S16_MAX);
+ else if (data_type == ImGuiDataType_U16)
+ *(ImU16*)p_data = (ImU16)ImClamp(v32, (int)IM_U16_MIN, (int)IM_U16_MAX);
+ else
+ IM_ASSERT(0);
+ }
+
+ return memcmp(data_backup, p_data, type_info->Size) != 0;
}
static float GetMinimumStepAtDecimalPrecision(int decimal_precision)
@@ -1651,7 +1885,7 @@ static float GetMinimumStepAtDecimalPrecision(int decimal_precision)
static const float min_steps[10] = { 1.0f, 0.1f, 0.01f, 0.001f, 0.0001f, 0.00001f, 0.000001f, 0.0000001f, 0.00000001f, 0.000000001f };
if (decimal_precision < 0)
return FLT_MIN;
- return (decimal_precision >= 0 && decimal_precision < 10) ? min_steps[decimal_precision] : ImPow(10.0f, (float)-decimal_precision);
+ return (decimal_precision < IM_ARRAYSIZE(min_steps)) ? min_steps[decimal_precision] : ImPow(10.0f, (float)-decimal_precision);
}
template
@@ -1706,21 +1940,26 @@ TYPE ImGui::RoundScalarWithFormatT(const char* format, ImGuiDataType data_type,
// This is called by DragBehavior() when the widget is active (held by mouse or being manipulated with Nav controls)
template
-bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const TYPE v_min, const TYPE v_max, const char* format, float power)
+bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const TYPE v_min, const TYPE v_max, const char* format, float power, ImGuiDragFlags flags)
{
ImGuiContext& g = *GImGui;
+ const ImGuiAxis axis = (flags & ImGuiDragFlags_Vertical) ? ImGuiAxis_Y : ImGuiAxis_X;
const bool is_decimal = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double);
- const bool has_min_max = (v_min != v_max);
+ const bool is_clamped = (v_min < v_max);
+ const bool is_power = (power != 1.0f && is_decimal && is_clamped && (v_max - v_min < FLT_MAX));
+ const bool is_locked = (v_min > v_max);
+ if (is_locked)
+ return false;
// Default tweak speed
- if (v_speed == 0.0f && has_min_max && (v_max - v_min < FLT_MAX))
+ if (v_speed == 0.0f && is_clamped && (v_max - v_min < FLT_MAX))
v_speed = (float)((v_max - v_min) * g.DragSpeedDefaultRatio);
// Inputs accumulates into g.DragCurrentAccum, which is flushed into the current value as soon as it makes a difference with our precision settings
float adjust_delta = 0.0f;
if (g.ActiveIdSource == ImGuiInputSource_Mouse && IsMousePosValid() && g.IO.MouseDragMaxDistanceSqr[0] > 1.0f*1.0f)
{
- adjust_delta = g.IO.MouseDelta.x;
+ adjust_delta = g.IO.MouseDelta[axis];
if (g.IO.KeyAlt)
adjust_delta *= 1.0f / 100.0f;
if (g.IO.KeyShift)
@@ -1729,16 +1968,21 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const
else if (g.ActiveIdSource == ImGuiInputSource_Nav)
{
int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 0;
- adjust_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard | ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_RepeatFast, 1.0f / 10.0f, 10.0f).x;
+ adjust_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard | ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_RepeatFast, 1.0f / 10.0f, 10.0f)[axis];
v_speed = ImMax(v_speed, GetMinimumStepAtDecimalPrecision(decimal_precision));
}
adjust_delta *= v_speed;
+ // For vertical drag we currently assume that Up=higher value (like we do with vertical sliders). This may become a parameter.
+ if (axis == ImGuiAxis_Y)
+ adjust_delta = -adjust_delta;
+
// Clear current value on activation
// Avoid altering values and clamping when we are _already_ past the limits and heading in the same direction, so e.g. if range is 0..255, current value is 300 and we are pushing to the right side, keep the 300.
bool is_just_activated = g.ActiveIdIsJustActivated;
- bool is_already_past_limits_and_pushing_outward = has_min_max && ((*v >= v_max && adjust_delta > 0.0f) || (*v <= v_min && adjust_delta < 0.0f));
- if (is_just_activated || is_already_past_limits_and_pushing_outward)
+ bool is_already_past_limits_and_pushing_outward = is_clamped && ((*v >= v_max && adjust_delta > 0.0f) || (*v <= v_min && adjust_delta < 0.0f));
+ bool is_drag_direction_change_with_power = is_power && ((adjust_delta < 0 && g.DragCurrentAccum > 0) || (adjust_delta > 0 && g.DragCurrentAccum < 0));
+ if (is_just_activated || is_already_past_limits_and_pushing_outward || is_drag_direction_change_with_power)
{
g.DragCurrentAccum = 0.0f;
g.DragCurrentAccumDirty = false;
@@ -1755,18 +1999,17 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const
TYPE v_cur = *v;
FLOATTYPE v_old_ref_for_accum_remainder = (FLOATTYPE)0.0f;
- const bool is_power = (power != 1.0f && is_decimal && has_min_max && (v_max - v_min < FLT_MAX));
if (is_power)
{
// Offset + round to user desired precision, with a curve on the v_min..v_max range to get more precision on one side of the range
FLOATTYPE v_old_norm_curved = ImPow((FLOATTYPE)(v_cur - v_min) / (FLOATTYPE)(v_max - v_min), (FLOATTYPE)1.0f / power);
FLOATTYPE v_new_norm_curved = v_old_norm_curved + (g.DragCurrentAccum / (v_max - v_min));
- v_cur = v_min + (TYPE)ImPow(ImSaturate((float)v_new_norm_curved), power) * (v_max - v_min);
+ v_cur = v_min + (SIGNEDTYPE)ImPow(ImSaturate((float)v_new_norm_curved), power) * (v_max - v_min);
v_old_ref_for_accum_remainder = v_old_norm_curved;
}
else
{
- v_cur += (TYPE)g.DragCurrentAccum;
+ v_cur += (SIGNEDTYPE)g.DragCurrentAccum;
}
// Round to user desired precision based on format string
@@ -1789,7 +2032,7 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const
v_cur = (TYPE)0;
// Clamp values (+ handle overflow/wrap-around for integer types)
- if (*v != v_cur && has_min_max)
+ if (*v != v_cur && is_clamped)
{
if (v_cur < v_min || (v_cur > *v && adjust_delta < 0.0f && !is_decimal))
v_cur = v_min;
@@ -1804,7 +2047,7 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const
return true;
}
-bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* v, float v_speed, const void* v_min, const void* v_max, const char* format, float power)
+bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v_speed, const void* p_min, const void* p_max, const char* format, float power, ImGuiDragFlags flags)
{
ImGuiContext& g = *GImGui;
if (g.ActiveId == id)
@@ -1819,94 +2062,99 @@ bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* v, float v_s
switch (data_type)
{
- case ImGuiDataType_S32: return DragBehaviorT(data_type, (ImS32*)v, v_speed, v_min ? *(const ImS32* )v_min : IM_S32_MIN, v_max ? *(const ImS32* )v_max : IM_S32_MAX, format, power);
- case ImGuiDataType_U32: return DragBehaviorT(data_type, (ImU32*)v, v_speed, v_min ? *(const ImU32* )v_min : IM_U32_MIN, v_max ? *(const ImU32* )v_max : IM_U32_MAX, format, power);
- case ImGuiDataType_S64: return DragBehaviorT(data_type, (ImS64*)v, v_speed, v_min ? *(const ImS64* )v_min : IM_S64_MIN, v_max ? *(const ImS64* )v_max : IM_S64_MAX, format, power);
- case ImGuiDataType_U64: return DragBehaviorT(data_type, (ImU64*)v, v_speed, v_min ? *(const ImU64* )v_min : IM_U64_MIN, v_max ? *(const ImU64* )v_max : IM_U64_MAX, format, power);
- case ImGuiDataType_Float: return DragBehaviorT(data_type, (float*)v, v_speed, v_min ? *(const float* )v_min : -FLT_MAX, v_max ? *(const float* )v_max : FLT_MAX, format, power);
- case ImGuiDataType_Double: return DragBehaviorT(data_type, (double*)v, v_speed, v_min ? *(const double*)v_min : -DBL_MAX, v_max ? *(const double*)v_max : DBL_MAX, format, power);
+ case ImGuiDataType_S8: { ImS32 v32 = (ImS32)*(ImS8*)p_v; bool r = DragBehaviorT(ImGuiDataType_S32, &v32, v_speed, p_min ? *(const ImS8*) p_min : IM_S8_MIN, p_max ? *(const ImS8*)p_max : IM_S8_MAX, format, power, flags); if (r) *(ImS8*)p_v = (ImS8)v32; return r; }
+ case ImGuiDataType_U8: { ImU32 v32 = (ImU32)*(ImU8*)p_v; bool r = DragBehaviorT(ImGuiDataType_U32, &v32, v_speed, p_min ? *(const ImU8*) p_min : IM_U8_MIN, p_max ? *(const ImU8*)p_max : IM_U8_MAX, format, power, flags); if (r) *(ImU8*)p_v = (ImU8)v32; return r; }
+ case ImGuiDataType_S16: { ImS32 v32 = (ImS32)*(ImS16*)p_v; bool r = DragBehaviorT(ImGuiDataType_S32, &v32, v_speed, p_min ? *(const ImS16*)p_min : IM_S16_MIN, p_max ? *(const ImS16*)p_max : IM_S16_MAX, format, power, flags); if (r) *(ImS16*)p_v = (ImS16)v32; return r; }
+ case ImGuiDataType_U16: { ImU32 v32 = (ImU32)*(ImU16*)p_v; bool r = DragBehaviorT(ImGuiDataType_U32, &v32, v_speed, p_min ? *(const ImU16*)p_min : IM_U16_MIN, p_max ? *(const ImU16*)p_max : IM_U16_MAX, format, power, flags); if (r) *(ImU16*)p_v = (ImU16)v32; return r; }
+ case ImGuiDataType_S32: return DragBehaviorT(data_type, (ImS32*)p_v, v_speed, p_min ? *(const ImS32* )p_min : IM_S32_MIN, p_max ? *(const ImS32* )p_max : IM_S32_MAX, format, power, flags);
+ case ImGuiDataType_U32: return DragBehaviorT(data_type, (ImU32*)p_v, v_speed, p_min ? *(const ImU32* )p_min : IM_U32_MIN, p_max ? *(const ImU32* )p_max : IM_U32_MAX, format, power, flags);
+ case ImGuiDataType_S64: return DragBehaviorT(data_type, (ImS64*)p_v, v_speed, p_min ? *(const ImS64* )p_min : IM_S64_MIN, p_max ? *(const ImS64* )p_max : IM_S64_MAX, format, power, flags);
+ case ImGuiDataType_U64: return DragBehaviorT(data_type, (ImU64*)p_v, v_speed, p_min ? *(const ImU64* )p_min : IM_U64_MIN, p_max ? *(const ImU64* )p_max : IM_U64_MAX, format, power, flags);
+ case ImGuiDataType_Float: return DragBehaviorT(data_type, (float*)p_v, v_speed, p_min ? *(const float* )p_min : -FLT_MAX, p_max ? *(const float* )p_max : FLT_MAX, format, power, flags);
+ case ImGuiDataType_Double: return DragBehaviorT