Merge branch 'main' into sm-profiles

2026-03-04 17:44:46 -07:00 · 2024-06-19 10:46:17 +08:00 · 2024-06-19 10:46:17 +08:00 · 5170c0a057
commit 5170c0a057
parent 9efcacebaa 1678127e2b
1710 changed files with 61619 additions and 20760 deletions
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@ -58,4 +58,21 @@ jobs:
      os: ${{ matrix.os }}
      arch: ${{ matrix.arch }}
      build-deps-only: ${{ inputs.build-deps-only || false }}
-    secrets: inherit
+    secrets: inherit
+  # flatpak:
+  #   name: "Flatpak"
+  #   runs-on: ubuntu-latest
+  #   container:
+  #     image: bilelmoussaoui/flatpak-github-actions:gnome-45
+  #     options: --privileged
+  #   steps:
+  #   # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd
+  #   - name: "Remove unneeded stuff to free disk space"
+  #     run:
+  #       sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
+  #   - uses: actions/checkout@v4
+  #   - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+  #     with:
+  #       bundle: orcaslicer.flatpak
+  #       manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
+  #       cache-key: flatpak-builder-${{ github.sha }}
--- a/.gitignore
+++ b/.gitignore
@ -32,4 +32,5 @@ src/OrcaSlicer-doc/
 **/filament_full/
 /deps/DL_CACHE/
 /deps/DL_CACHE
-resources/profiles/user/default
+**/.flatpak-builder/
+resources/profiles/user/default
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -271,9 +271,18 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
    # We will turn the warning of for GCC for now:
    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        # GCC generates loads of -Wunknown-pragmas when compiling igl. The fix is not easy due to a bug in gcc, see
+        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66943 or
+        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
+        # We will turn the warning of for GCC for now:
        add_compile_options(-Wno-unknown-pragmas)
    endif()

+    # Bit of a hack for flatpak building: compress the debug info with zstd to save space in CI 
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0)
+        add_compile_options(-gz=zstd)
+    endif()
+
 endif()

 if (SLIC3R_ASAN)
@ -382,9 +391,7 @@ endif()
 # set(Boost_COMPILER "-mgw81")
 # boost::process was introduced first in version 1.64.0,
 # boost::beast::detail::base64 was introduced first in version 1.66.0
-set(MINIMUM_BOOST_VERSION "1.66.0")
-set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;program_options")
-find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
+find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options)

 add_library(boost_libs INTERFACE)
 add_library(boost_headeronly INTERFACE)
@ -410,28 +417,8 @@ function(slic3r_remap_configs targets from_Cfg to_Cfg)
    endif()
 endfunction()

-if(TARGET Boost::system)
-    message(STATUS "Boost::boost exists")
-    target_link_libraries(boost_headeronly INTERFACE Boost::boost)
-
-    # Only from cmake 3.12
-    # list(TRANSFORM _boost_components PREPEND Boost:: OUTPUT_VARIABLE _boost_targets)
-    set(_boost_targets "")
-    foreach(comp ${_boost_components})
-        list(APPEND _boost_targets "Boost::${comp}")
-    endforeach()
-
-    target_link_libraries(boost_libs INTERFACE
-        boost_headeronly # includes the custom compile definitions as well
-        ${_boost_targets}
-        )
-    slic3r_remap_configs("${_boost_targets}" RelWithDebInfo Release)
-else()
-    target_include_directories(boost_headeronly INTERFACE ${Boost_INCLUDE_DIRS})
-    target_link_libraries(boost_libs INTERFACE boost_headeronly ${Boost_LIBRARIES})
-endif()
-
-
+target_include_directories(boost_headeronly INTERFACE ${Boost_INCLUDE_DIRS})
+target_link_libraries(boost_libs INTERFACE boost_headeronly ${Boost_LIBRARIES})

 # Find and configure intel-tbb
 if(SLIC3R_STATIC)
--- a/README.md
+++ b/README.md
@ -133,7 +133,7 @@ Support me
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP)

 ## Some background
-OrcaSlicer is originaly forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
+OrcaSlicer is originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.

 Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
 Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@ -26,17 +26,19 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>ATSApplicationFontsPath</key>
+  	<string>fonts/</string>
  <key>CFBundleURLTypes</key>
-  <array>
-    <dict>
-      <key>CFBundleURLName</key>
-      <string>orcasliceropen url</string>
-      <key>CFBundleURLSchemes</key>
-      <array>
-        <string>orcasliceropen</string>
-      </array>
-    </dict>
-  </array>
+    <array>
+      <dict>
+        <key>CFBundleURLName</key>
+        <string>OrcaSlicer Downloads</string>
+        <key>CFBundleURLSchemes</key>
+        <array>
+          <string>orcaslicer</string>
+        </array>
+      </dict>
+    </array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@ -42,6 +42,10 @@ endif ()

 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
 set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.")
+set(FLATPAK FALSE CACHE BOOL "Toggles various build settings for flatpak, like /usr/local in DESTDIR or not building wxwidgets")
+if (NOT FLATPAK)
+    set(DESTDIR "${DESTDIR}/usr/local/")
+endif()

 get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

@ -120,13 +124,13 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
    ExternalProject_Add(
        dep_${projectname}
        EXCLUDE_FROM_ALL    ON
-        INSTALL_DIR         ${DESTDIR}/usr/local
+        INSTALL_DIR         ${DESTDIR}
        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
        ${_gen}
        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
            -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
            -DCMAKE_DEBUG_POSTFIX:STRING=d
            -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
            -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
@ -140,16 +144,26 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
    )
-else()
+elseif(FLATPAK)
+    # the only reason this is here is because of the HACK at the bottom for ci
+    #
+    # note for future devs: shared libs may actually create a size reduction
+    # but orcaslicer_deps tends to get really funny regarding linking after that (notably boost)
+    # so, as much as I would like to use that, it's not happening
    ExternalProject_Add(
        dep_${projectname}
        EXCLUDE_FROM_ALL    ON
-        INSTALL_DIR         ${DESTDIR}/usr/local
+        INSTALL_DIR         ${DESTDIR}
        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
        ${_gen}
        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_DEBUG_POSTFIX:STRING=d
+            -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
+            -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
+            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
            -DBUILD_SHARED_LIBS:BOOL=OFF
            ${_cmake_osx_arch}
            "${_configs_line}"
@ -158,6 +172,29 @@ else()
       ${P_ARGS_UNPARSED_ARGUMENTS}
       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
+       # HACK: save space after each compile job, because CI
+       # reasoning: cmake changes directory after this command, so just keep only the folders
+       # so that it can navigate out
+       COMMAND find "${CMAKE_BINARY_DIR}/dep_${projectname}-prefix/" -type f -delete
+    )
+else()
+    ExternalProject_Add(
+        dep_${projectname}
+        EXCLUDE_FROM_ALL    ON
+        INSTALL_DIR         ${DESTDIR}
+        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
+        ${_gen}
+        CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            ${_cmake_osx_arch}
+            "${_configs_line}"
+            ${DEP_CMAKE_OPTS}
+            ${P_ARGS_CMAKE_ARGS}
+       ${P_ARGS_UNPARSED_ARGUMENTS}
+       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release 
    )

 endif()
@ -203,6 +240,20 @@ else()
    include("deps-linux.cmake")
 endif()

+if(FLATPAK)
+    # flatpak bundles some deps with the layer, so attempt to find them first
+    # also, yes, this reduces CI by not needing to vendor certain deps
+    find_package(ZLIB)
+    find_package(PNG)
+    find_package(EXPAT)
+    find_package(CURL)
+    find_package(JPEG)
+    find_package(TIFF)
+    find_package(Freetype)
+    find_package(OpenSSL 1.1...<3.2)
+    find_package(CURL)
+endif()
+
 set(ZLIB_PKG "")
 if (NOT ZLIB_FOUND) 
    include(ZLIB/ZLIB.cmake)
@ -214,6 +265,7 @@ if (NOT PNG_FOUND)
    set(PNG_PKG dep_PNG)
 endif ()
 set(EXPAT_PKG "")
+find_package(EXPAT)
 if (NOT EXPAT_FOUND) 
    include(EXPAT/EXPAT.cmake)
    set(EXPAT_PKG dep_EXPAT)
@ -226,6 +278,7 @@ include(Boost/Boost.cmake)
 include(Cereal/Cereal.cmake)
 include(Qhull/Qhull.cmake)
 include(GLEW/GLEW.cmake)
+
 include(GLFW/GLFW.cmake)
 include(OpenCSG/OpenCSG.cmake)

@ -241,34 +294,69 @@ include(CGAL/CGAL.cmake)

 include(NLopt/NLopt.cmake)

-include(OpenSSL/OpenSSL.cmake)

+# I *think* 1.1 is used for *just* md5 hashing?
+# 3.1 has everything in the right place, but the md5 funcs used are deprecated
+# a grep across the repo shows it is used for other things
+# TODO: update openssl and everything that uses <openssl/md5.h> 
+set(OPENSSL_PKG "")
+if(NOT OPENSSL_FOUND)
+    include(OpenSSL/OpenSSL.cmake)
+    set(OPENSSL_PKG dep_OpenSSL)
+endif()
+
+# we don't want to load a "wrong" openssl when loading curl
+# so, just don't even bother 
+# ...i think this is how it works? change if wrong
 set(CURL_PKG "")
-if (NOT CURL_FOUND)
+if (NOT OPENSSL_FOUND OR NOT CURL_FOUND)
    include(CURL/CURL.cmake)
    set(CURL_PKG dep_CURL)
 endif ()

-include(JPEG/JPEG.cmake)
-include(TIFF/TIFF.cmake)
-include(wxWidgets/wxWidgets.cmake)
+set(JPEG_PKG "")
+if (NOT JPEG_FOUND)
+    include(JPEG/JPEG.cmake)
+    set(JPEG_PKG dep_JPEG)
+endif()
+
+set(TIFF_PKG "")
+if (NOT TIFF_FOUND)
+    include(TIFF/TIFF.cmake)
+    set(TIFF_PKG "dep_TIFF")
+endif()
+
+# flatpak builds wxwidgets separately 
+set(WXWIDGETS_PKG "")
+if (NOT FLATPAK)
+    include(wxWidgets/wxWidgets.cmake)
+    set(WXWIDGETS_PKG "dep_wxWidgets")
+endif()
+
+set(FREETYPE_PKG "")
+if(NOT FREETYPE_FOUND)
+    include(FREETYPE/FREETYPE.cmake)
+    set(FREETYPE_PKG "dep_FREETYPE") 
+endif()
+
 include(OCCT/OCCT.cmake)
 include(OpenCV/OpenCV.cmake)
-include(FREETYPE/FREETYPE.cmake)

 set(_dep_list
    dep_Boost
    dep_TBB
+    ${OPENSSL_PKG}
    ${CURL_PKG}
-    dep_wxWidgets
+    ${WXWIDGETS_PKG}
    dep_Cereal
    dep_NLopt
    dep_OpenVDB
    dep_OpenCSG
    dep_OpenCV
    dep_CGAL
-    dep_OpenSSL
    dep_GLFW
+    dep_OCCT
+    ${FREETYPE_PKG}
    ${PNG_PKG}
    ${ZLIB_PKG}
    ${EXPAT_PKG}
@ -283,9 +371,6 @@ else()
    #list(APPEND _dep_list "dep_libigl")
 endif()

-list(APPEND _dep_list "dep_OCCT")
-list(APPEND _dep_list "dep_FREETYPE")
-
 add_custom_target(deps ALL DEPENDS ${_dep_list})

 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
--- a/deps/CURL/CURL.cmake
+++ b/deps/CURL/CURL.cmake
@ -72,9 +72,10 @@ orcaslicer_add_cmake_project(CURL
    ${_curl_platform_flags}
 )

-# if (APPLE OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-  add_dependencies(dep_CURL dep_OpenSSL)
-# endif ()
+if(NOT OPENSSL_FOUND)
+  # (openssl may or may not be built)
+  add_dependencies(dep_CURL ${OPENSSL_PKG})
+endif()

 if (MSVC)
    add_debug_dep(dep_CURL)
--- a/deps/GMP/GMP.cmake
+++ b/deps/GMP/GMP.cmake
@ -1,17 +1,16 @@

 set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/gmp)
-set(_dstdir ${DESTDIR}/usr/local)

 if (MSVC)
-    set(_output  ${_dstdir}/include/gmp.h 
-                 ${_dstdir}/lib/libgmp-10.lib 
-                 ${_dstdir}/bin/libgmp-10.dll)
+    set(_output  ${DESTDIR}/include/gmp.h 
+                 ${DESTDIR}/lib/libgmp-10.lib 
+                 ${DESTDIR}/bin/libgmp-10.dll)

    add_custom_command(
        OUTPUT  ${_output}
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/gmp.h ${_dstdir}/include/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.lib ${_dstdir}/lib/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.dll ${_dstdir}/bin/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/gmp.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.lib ${DESTDIR}/lib/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.dll ${DESTDIR}/bin/
    )
    
    add_custom_target(dep_GMP SOURCES ${_output})
@ -61,8 +60,8 @@ else ()
        URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
        BUILD_IN_SOURCE ON 
-        CONFIGURE_COMMAND  env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt}
+        CONFIGURE_COMMAND  env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}" ${_gmp_build_tgt}
        BUILD_COMMAND     make -j
        INSTALL_COMMAND   make install
    )
-endif ()
+endif ()
--- a/deps/MPFR/MPFR.cmake
+++ b/deps/MPFR/MPFR.cmake
@ -1,18 +1,17 @@
 set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/mpfr)
-set(_dstdir ${DESTDIR}/usr/local)

 if (MSVC)
-    set(_output  ${_dstdir}/include/mpfr.h
-                 ${_dstdir}/include/mpf2mpfr.h
-                 ${_dstdir}/lib/libmpfr-4.lib 
-                 ${_dstdir}/bin/libmpfr-4.dll)
+    set(_output  ${DESTDIR}/include/mpfr.h
+                 ${DESTDIR}/include/mpf2mpfr.h
+                 ${DESTDIR}/lib/libmpfr-4.lib 
+                 ${DESTDIR}/bin/libmpfr-4.dll)

    add_custom_command(
        OUTPUT  ${_output}
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpfr.h ${_dstdir}/include/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpf2mpfr.h ${_dstdir}/include/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.lib ${_dstdir}/lib/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.dll ${_dstdir}/bin/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpfr.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpf2mpfr.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.lib ${DESTDIR}/lib/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.dll ${DESTDIR}/bin/
    )

    add_custom_target(dep_MPFR SOURCES ${_output})
@ -31,7 +30,7 @@ else ()
        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
        BUILD_IN_SOURCE ON
        CONFIGURE_COMMAND autoreconf -f -i && 
-                          env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
+                          env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR} ${_gmp_build_tgt}
        BUILD_COMMAND make -j
        INSTALL_COMMAND make install
        DEPENDS dep_GMP
--- a/deps/OCCT/OCCT.cmake
+++ b/deps/OCCT/OCCT.cmake
@ -14,7 +14,7 @@ orcaslicer_add_cmake_project(OCCT
    #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
    PATCH_COMMAND git apply --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
    #DEPENDS dep_Boost
-    #DEPENDS dep_FREETYPE
+    DEPENDS ${FREETYPE_PKG}
    CMAKE_ARGS
        -DBUILD_LIBRARY_TYPE=${library_build_type}
        -DUSE_TK=OFF
@ -31,4 +31,4 @@ orcaslicer_add_cmake_project(OCCT
        -DBUILD_MODULE_Visualization=OFF
 )

-add_dependencies(dep_OCCT dep_FREETYPE)
+# add_dependencies(dep_OCCT ${FREETYPE_PKG})
--- a/deps/OpenCV/0001-vs2022.patch
+++ b/deps/OpenCV/0001-vs2022.patch
@ -0,0 +1,52 @@
+From 6fb3f6333150a777e835fc7c48e49750591bf7fe Mon Sep 17 00:00:00 2001
+From: Benjamin Buch <bebuch@users.noreply.github.com>
+Date: Thu, 23 May 2024 16:05:19 +0200
+Subject: [PATCH] Support VS 2022 17.1x.y
+
+With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility test in the OpenCV's CMake Config files.
+---
+ cmake/templates/OpenCVConfig.root-WIN32.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
+index b0f254ebe8..62e36272f3 100644
+--- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
+++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
+@@ -137,7 +137,7 @@ elseif(MSVC)
+         set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
+       endif()
+     endif()
+-  elseif(MSVC_VERSION MATCHES "^193[0-9]$")
+  elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
+     set(OpenCV_RUNTIME vc17)
+     check_one_config(has_VS2022)
+     if(NOT has_VS2022)
+-- 
+2.45.2.windows.1
+
+From f85818ba6f9031c450475a7453dee0acce31a881 Mon Sep 17 00:00:00 2001
+From: Benjamin Buch <bebuch@users.noreply.github.com>
+Date: Fri, 24 May 2024 11:10:09 +0200
+Subject: [PATCH] Support VS 2022 17.1x.y in OpenCVDetectCXXCompiler.cmake
+
+With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility test in the OpenCV's CMake Config files.
+---
+ cmake/OpenCVDetectCXXCompiler.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
+index 1743aca11f..448afd46ea 100644
+--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
+@@ -176,7 +176,7 @@ elseif(MSVC)
+     set(OpenCV_RUNTIME vc15)
+   elseif(MSVC_VERSION MATCHES "^192[0-9]$")
+     set(OpenCV_RUNTIME vc16)
+-  elseif(MSVC_VERSION MATCHES "^193[0-9]$")
+  elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
+     set(OpenCV_RUNTIME vc17)
+   else()
+     message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
+-- 
+2.45.2.windows.1
+
--- a/deps/OpenCV/OpenCV.cmake
+++ b/deps/OpenCV/OpenCV.cmake
@ -7,6 +7,7 @@ endif ()
 orcaslicer_add_cmake_project(OpenCV
    URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
    URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
+    PATCH_COMMAND git apply --directory ${BINARY_DIR_REL}/dep_OpenCV-prefix/src/dep_OpenCV --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-vs2022.patch
    CMAKE_ARGS
    -DBUILD_SHARED_LIBS=0
       -DBUILD_PERE_TESTS=OFF
@ -26,7 +27,7 @@ orcaslicer_add_cmake_project(OpenCV
       -DBUILD_ZLIB=OFF
       -DWITH_1394=OFF
       -DWITH_CUDA=OFF
-       -DWITH_EIGEN=ON
+       -DWITH_EIGEN=OFF
       ${_use_IPP}
       -DWITH_ITT=OFF
       -DWITH_FFMPEG=OFF
--- a/deps/OpenEXR/OpenEXR.cmake
+++ b/deps/OpenEXR/OpenEXR.cmake
@ -15,11 +15,11 @@ if (APPLE AND IS_CROSS_COMPILE)
        EXCLUDE_FROM_ALL    ON
        URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
        URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
-        INSTALL_DIR         ${DESTDIR}/usr/local
+        INSTALL_DIR         ${DESTDIR}
        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/OpenEXR
        ${_openxr_list_sep}
        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
            -DBUILD_SHARED_LIBS:BOOL=OFF
            -DCMAKE_POSITION_INDEPENDENT_CODE=ON
            -DBUILD_TESTING=OFF 
@ -54,4 +54,4 @@ endif()

 if (MSVC)
    add_debug_dep(dep_OpenEXR)
-endif ()
+endif ()
--- a/deps/OpenSSL/OpenSSL.cmake
+++ b/deps/OpenSSL/OpenSSL.cmake
@ -46,8 +46,8 @@ ExternalProject_Add(dep_OpenSSL
    # URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31
    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenSSL
 	CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
-        "--openssldir=${DESTDIR}/usr/local"
-        "--prefix=${DESTDIR}/usr/local"
+        "--openssldir=${DESTDIR}"
+        "--prefix=${DESTDIR}"
        ${_cross_comp_prefix_line}
        no-shared
        no-asm
@ -61,6 +61,6 @@ ExternalProject_Add(dep_OpenSSL
 ExternalProject_Add_Step(dep_OpenSSL install_cmake_files
    DEPENDEES install

-    COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
    WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
 )
--- a/deps/TBB/GNU.cmake
+++ b/deps/TBB/GNU.cmake
@ -0,0 +1,79 @@
+# Copyright (c) 2020-2021 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if (MINGW)
+    set(TBB_LINK_DEF_FILE_FLAG "")
+    set(TBB_DEF_FILE_PREFIX "")
+elseif (APPLE)
+    set(TBB_LINK_DEF_FILE_FLAG -Wl,-exported_symbols_list,)
+    set(TBB_DEF_FILE_PREFIX mac${TBB_ARCH})
+
+    # For correct ucontext.h structures layout
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -D_XOPEN_SOURCE)
+else()
+    set(TBB_LINK_DEF_FILE_FLAG -Wl,--version-script=)
+    set(TBB_DEF_FILE_PREFIX lin${TBB_ARCH})
+endif()
+
+# Add -Wno-error=stringop-overflow to fix GCC 12+ build as suggested on https://github.com/oneapi-src/oneTBB/issues/843#issuecomment-1152646035
+set(TBB_WARNING_LEVEL -Wall -Wextra $<$<BOOL:${TBB_STRICT}>:-Werror> -Wfatal-errors -Wno-error=stringop-overflow)
+set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor)
+
+# Depfile options (e.g. -MD) are inserted automatically in some cases.
+# Don't add -MMD to avoid conflicts in such cases.
+if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
+    set(TBB_MMD_FLAG -MMD)
+endif()
+
+# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
+    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
+endif()
+
+if (NOT MINGW)
+    set(TBB_COMMON_LINK_LIBS dl)
+endif()
+
+# Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
+if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+    tbb_remove_compile_flag(-Werror)
+endif()
+
+if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL Intel)
+    # gcc 6.0 and later have -flifetime-dse option that controls elimination of stores done outside the object lifetime
+    set(TBB_DSE_FLAG $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},6.0>>:-flifetime-dse=1>)
+endif()
+
+# Workaround for heavy tests and too many symbols in debug (rellocation truncated to fit: R_MIPS_CALL16)
+if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips")
+    set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} -DTBB_TEST_LOW_WORKLOAD $<$<CONFIG:DEBUG>:-mxgot>)
+endif()
+
+if (MINGW)
+    list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
+endif()
+
+# For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
+if (NOT TBB_SANITIZE MATCHES "thread")
+    set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
+endif()
+
+# Disable lto flag
+set(TBB_IPO_COMPILE_FLAGS "")
+set(TBB_IPO_LINK_FLAGS "")
+
+# TBB malloc settings
+set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
+set(TBB_OPENMP_FLAG -fopenmp)
--- a/deps/TBB/TBB.cmake
+++ b/deps/TBB/TBB.cmake
@ -1,8 +1,14 @@
+if (FLATPAK)
+    set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/GNU.cmake ./cmake/compilers/GNU.cmake)
+else()
+    set(_patch_command "")
+endif()
+
 orcaslicer_add_cmake_project(
    TBB
    URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip"
    URL_HASH SHA256=83ea786c964a384dd72534f9854b419716f412f9d43c0be88d41874763e7bb47
-    #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-TBB-GCC13.patch
+    PATCH_COMMAND ${_patch_command}
    CMAKE_ARGS          
        -DTBB_BUILD_SHARED=OFF
        -DTBB_BUILD_TESTS=OFF
--- a/deps/deps-windows.cmake
+++ b/deps/deps-windows.cmake
@ -15,8 +15,8 @@ elseif (MSVC_VERSION LESS 1930)
 # 1920-1929 = VS 16.0 (v142 toolset)
    set(DEP_VS_VER "16")
    set(DEP_BOOST_TOOLSET "msvc-14.2")
-elseif (MSVC_VERSION LESS 1940)
-# 1930-1939 = VS 17.0 (v143 toolset)
+elseif (MSVC_VERSION LESS 1950)
+# 1930-1949 = VS 17.0 (v143 toolset)
    set(DEP_VS_VER "17")
    set(DEP_BOOST_TOOLSET "msvc-14.3")
 else ()
--- a/deps/wxWidgets/wxWidgets.cmake
+++ b/deps/wxWidgets/wxWidgets.cmake
@ -17,11 +17,16 @@ else ()
    set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
 endif ()

+# Note: The flatpak build builds wxwidgets separately due to CI size constraints.
+# ANY CHANGES MADE IN HERE MUST ALSO BE REFLECTED IN `flatpak/io.github.SoftFever.OrcaSlicer.yml`.
+# ** THIS INCLUDES BUILD ARGS. **
+# ...if you can find a way around this size limitation, be my guest.
+
 orcaslicer_add_cmake_project(
    wxWidgets
    GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
    GIT_SHALLOW ON
-    DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
+    DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${TIFF_PKG} ${JPEG_PKG}
    CMAKE_ARGS
        -DwxBUILD_PRECOMP=ON
        ${_wx_toolkit}
@ -34,6 +39,7 @@ orcaslicer_add_cmake_project(
        -DwxUSE_UNICODE=ON
        ${_wx_private_font}
        -DwxUSE_OPENGL=ON
+        -DwxUSE_WEBREQUEST=ON
        -DwxUSE_WEBVIEW=ON
        ${_wx_edge}
        -DwxUSE_WEBVIEW_IE=OFF
@ -47,9 +53,10 @@ orcaslicer_add_cmake_project(
        -DwxUSE_ZLIB=sys
        -DwxUSE_LIBJPEG=sys
        -DwxUSE_LIBTIFF=sys
+        -DwxUSE_NANOSVG=OFF
        -DwxUSE_EXPAT=sys
 )

 if (MSVC)
    add_debug_dep(dep_wxWidgets)
-endif ()
+endif ()
--- a/flatpak/.gitignore
+++ b/flatpak/.gitignore
@ -0,0 +1,2 @@
+builddir
+.flatpak-builder
--- a/flatpak/README.md
+++ b/flatpak/README.md
@ -0,0 +1,3 @@
+# OrcaSlicer
+
+This is basically a copy of [com.bambulab.BambuStudio](https://github.com/flathub/com.bambulab.BambuStudio). As such, same rules apply here as does over there.
--- a/flatpak/entrypoint
+++ b/flatpak/entrypoint
@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+# Work-around https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/754
+grep -q org.freedesktop.Platform.GL.nvidia /.flatpak-info && export WEBKIT_DISABLE_DMABUF_RENDERER=1
+
+# Work-around https://github.com/bambulab/BambuStudio/issues/3440
+export LC_ALL=C.UTF-8
+
+if [ $BAMBU_STUDIO_DARK_THEME == true ]; then
+    export GTK_THEME='Adwaita:dark'
+    # echo "Message: $(date +%T): INFO: using dark theme variant"
+fi
+
+exec /app/bin/orca-slicer "$@" &
+$(/app/bin/set-dark-theme-variant.py) &
--- a/flatpak/images/1.png
+++ b/flatpak/images/1.png
--- a/flatpak/images/2.png
+++ b/flatpak/images/2.png
--- a/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml
+++ b/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>io.github.softfever.OrcaSlicer</id>
+    <launchable type="desktop-id">io.github.softfever.OrcaSlicer.desktop</launchable>
+    <provides>
+        <id>io.github.softfever.OrcaSlicer.desktop</id>
+    </provides>
+    <name>OrcaSlicer</name>
+    <!-- hehe hadess @ppd 
+    ... seriously though, thanks -->
+    <summary>Get even more perfect prints!</summary>
+    <developer_name>SoftFever</developer_name>
+    <url type="homepage">https://github.com/SoftFever/OrcaSlicer</url>
+    <url type="help">https://github.com/SoftFever/OrcaSlicer/wiki</url>
+    <url type="bugtracker">https://github.com/SoftFever/OrcaSlicer/issues/</url>
+    <url type="donation">https://ko-fi.com/SoftFever</url>
+    <metadata_license>0BSD</metadata_license>
+    <project_license>AGPL-3.0-only</project_license>
+    <content_rating type="oars-1.1" />
+    <requires>
+        <display_length compare="gt">768</display_length>
+    </requires>
+    <recommends>
+        <control>keyboard</control>
+        <control>pointing</control>
+    </recommends>
+    <screenshots>
+	    <screenshot type="default">
+		    <image>https://raw.githubusercontent.com/powpingdone/com.github.softfever.orcaslicer/master/images/1.png</image>
+		    <caption>A model ready to be sliced on a buildplate.</caption>
+	    </screenshot>
+	    <screenshot>
+		<image>https://raw.githubusercontent.com/powpingdone/com.github.softfever.orcaslicer/master/images/2.png
+	</image>
+	<caption>A calibration test ready to be printed out.</caption>
+	    </screenshot>
+    </screenshots>
+    <description>
+	    <p>A 3D printer slicer forked from Bambu Studio, PrusaSlicer, and SuperSlicer with many more printer profiles, helpful calibration prints, and many more features to get your 3D printer printing perfectly!</p>
+    </description>
+    <branding>
+	  <color type="primary" scheme_preference="light">#009688</color>
+	</branding>
+    <releases>
+	    <release version="2.0.0-951fc8e" date="2024-01-30"> <url>https://github.com/SoftFever/OrcaSlicer/commit/951fc8e98a0d5ca0ccb254315646ce7889a44836</url>
+        </release>
+    </releases>
+</component>
--- a/flatpak/io.github.softfever.OrcaSlicer.yml
+++ b/flatpak/io.github.softfever.OrcaSlicer.yml
@ -0,0 +1,344 @@
+app-id: io.github.softfever.OrcaSlicer
+runtime: org.gnome.Platform
+runtime-version: "45"
+sdk: org.gnome.Sdk
+command: entrypoint
+separate-locales: true
+rename-icon: OrcaSlicer 
+finish-args:
+  - --share=ipc
+  - --socket=x11
+  - --share=network
+  - --device=all
+  - --filesystem=home
+  - --filesystem=xdg-run/gvfs
+  - --filesystem=/run/media
+  - --filesystem=/media
+  # Allow OrcaSlicer to talk to other instances
+  - --talk-name=io.github.softfever.OrcaSlicer.InstanceCheck.*
+  - --system-talk-name=org.freedesktop.UDisks2
+  # set dark theme
+  - --env=BAMBU_STUDIO_DARK_THEME=false
+
+modules:
+
+  # JPEG codec for the liveview
+  - name: gst-plugins-good
+    buildsystem: meson
+    config-opts:
+      - -Dauto_features=disabled
+      - -Djpeg=enabled
+      - -Ddoc=disabled
+      - -Dexamples=disabled
+      - -Dtests=disabled
+    sources:
+      - type: archive
+        url: https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz
+        sha256: e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39
+
+  # xprop, xlib is needed to manipulate the X11 window and set _GTK_THEME_VARIANT dark on X11
+  # and paint the window dark when PRUSA_SLICER_DARK_THEME is true
+  # see: entrypoint & set-dark-theme-variant.py (originated from spotify client flatpak)
+  - name: xprop
+    sources:
+      - type: archive
+        url: http://mirrors.ircam.fr/pub/x.org/individual/app/xprop-1.2.5.tar.gz
+        sha256: b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670
+  - name: python-setuptools_scm
+    buildsystem: simple
+    build-commands:
+      - pip3 install --no-deps --no-build-isolation --verbose --prefix=${FLATPAK_DEST} .
+    sources:
+      - type: archive
+        url: https://files.pythonhosted.org/packages/57/38/930b1241372a9f266a7df2b184fb9d4f497c2cef2e016b014f82f541fe7c/setuptools_scm-6.0.1.tar.gz
+        sha256: d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92
+  - name: python-xlib
+    buildsystem: simple
+    build-commands:
+      - pip3 install --no-deps --no-build-isolation --verbose --prefix=${FLATPAK_DEST} .
+    sources:
+      - type: archive
+        url: https://files.pythonhosted.org/packages/86/f5/8c0653e5bb54e0cbdfe27bf32d41f27bc4e12faa8742778c17f2a71be2c0/python-xlib-0.33.tar.gz
+        sha256: 55af7906a2c75ce6cb280a584776080602444f75815a7aff4d287bb2d7018b32
+
+  # For libOSMesa
+  - name: mesa
+    buildsystem: meson
+    config-opts:
+      - -Dosmesa=classic
+      - -Ddri-drivers=[]
+      - -Dgallium-drivers=[]
+      - -Dvulkan-drivers=[]
+      - -Dplatforms=[]
+    build-options:
+      arch:
+        aarch64:
+          config-opts:
+            - -Dlibunwind=disabled
+    cleanup:
+      - /share/drirc.d
+      - /include
+      - "*.a"
+    sources:
+      - type: archive
+        url: https://archive.mesa3d.org/mesa-20.2.6.tar.xz
+        sha256: f12ca3c6c622f11cd79ad66b4220f04514fa96f795062fe92a37339ab19885db
+
+  - name: glu
+    config-opts:
+      - --disable-static
+    sources:
+      - type: archive
+        url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz
+        sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
+    cleanup:
+      - /include
+      - /lib/*.a
+      - /lib/*.la
+      - /lib/pkgconfig
+
+  - name: kde-extra-cmake-modules
+    buildsystem: cmake-ninja
+    sources:
+      - type: git
+        url: https://github.com/KDE/extra-cmake-modules
+        tag: v5.249.0
+    cleanup:
+      - / 
+ 
+  - name: orca_wxwidgets
+    buildsystem: simple
+    build-commands:
+      - |
+        mkdir builddir && cd builddir
+        cmake ../ -GNinja \
+          -DwxBUILD_PRECOMP=ON \
+          -DwxBUILD_TOOLKIT=gtk3 \
+          -DwxBUILD_DEBUG_LEVEL=0 \
+          -DwxBUILD_SAMPLES=OFF \
+          -DwxBUILD_SHARED=ON \
+          -DwxUSE_MEDIACTRL=ON \
+          -DwxUSE_DETECT_SM=OFF \
+          -DwxUSE_UNICODE=ON \
+          -DwxUSE_PRIVATE_FONTS=ON \
+          -DwxUSE_OPENGL=ON \
+          -DwxUSE_WEBREQUEST=ON \
+          -DwxUSE_WEBVIEW=ON \
+          -DwxUSE_WEBVIEW_EDGE=OFF \
+          -DwxUSE_WEBVIEW_IE=OFF \
+          -DwxUSE_REGEX=builtin \
+          -DwxUSE_LIBSDL=OFF \
+          -DwxUSE_XTEST=OFF \
+          -DwxUSE_STC=OFF \
+          -DwxUSE_AUI=ON \
+          -DwxUSE_LIBPNG=sys \
+          -DwxUSE_ZLIB=sys \
+          -DwxUSE_LIBJPEG=sys \
+          -DwxUSE_LIBTIFF=sys \
+          -DwxUSE_EXPAT=sys \
+          -DBUILD_SHARED_LIBS:BOOL=ON \
+          -DCMAKE_INSTALL_PREFIX:STRING=/app \
+          -DCMAKE_PREFIX_PATH=/app \
+          -DCMAKE_BUILD_TYPE=Release
+        cmake --build . --target install -j$FLATPAK_BUILDER_N_JOBS
+    sources:
+      - type: git
+        url: https://github.com/SoftFever/Orca-deps-wxWidgets
+        branch: master
+        path: ../
+    cleanup:
+      - "*.la"
+      - "*.a"
+      - "*.cmake"
+      - /include
+      - /app/bin/*
+
+  - name: orca_deps
+    buildsystem: simple
+    build-commands:
+      # start build
+      - |
+        mkdir deps/build && cd deps/build
+        cmake ../ \
+          -DDEP_WX_GTK3=ON \
+          -DDEP_DOWNLOAD_DIR=/run/build/orca_deps/external-packages \
+          -DCMAKE_PREFIX_PATH=/app \
+          -DDESTDIR=/app \
+          -DCMAKE_INSTALL_LIBDIR=/app/lib \
+          -DFLATPAK=ON \
+          -DCMAKE_INSTALL_PREFIX=/app
+        cmake --build . 
+        rm -r /run/build/orca_deps/external-packages
+    
+    cleanup:
+      - /app/include
+      - "*.a"
+      - "*.la"
+      - /app/lib/cmake
+    
+    sources:
+      # -
+      # Section bellow fetches all OrcaSlicer dependencies before the build process and stores them in external-packages/*/* .
+      # -DDEP_DOWNLOAD_DIR is set in the build process which has to match with dest.
+      #
+      # NOTE: The url, dest folder name and sha256 must match from OrcaSlicer's cmake scripts and folder names in OrcaSlicer/deps/
+      # -
+      
+      # OrcaSlicer Source Archive
+      - type: dir 
+        path: ../
+
+      # Blosc
+      - type: file
+        url: https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
+        dest: external-packages/Blosc
+        sha256: dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
+
+      # Cereal
+      - type: file
+        url: https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip
+        dest: external-packages/Cereal
+        sha256: 71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657
+
+      # CGAL
+      - type: file
+        url: https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip
+        dest: external-packages/CGAL
+        sha256: d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0
+
+      # GMP
+      - type: file
+        url: https://github.com/SoftFever/OrcaSlicer_deps/releases/download/gmp-6.2.1/gmp-6.2.1.tar.bz2
+        dest: external-packages/GMP
+        sha256: eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
+
+      # MPFR
+      - type: file
+        url: https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
+        dest: external-packages/MPFR
+        sha256: b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
+
+      # NLopt
+      - type: file
+        url: https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz
+        dest: external-packages/NLopt
+        sha256: c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
+
+      # OCCT
+      - type: file
+        url: https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip
+        dest: external-packages/OCCT
+        sha256: 28334f0e98f1b1629799783e9b4d21e05349d89e695809d7e6dfa45ea43e1dbc
+
+      # OpenCSG
+      - type: file
+        url: https://github.com/floriankirsch/OpenCSG/archive/refs/tags/opencsg-1-4-2-release.zip
+        dest: external-packages/OpenCSG
+        sha256: 51afe0db79af8386e2027d56d685177135581e0ee82ade9d7f2caff8deab5ec5
+
+      # OpenCV
+      - type: file
+        url: https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
+        dest: external-packages/OpenCV
+        sha256: 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
+
+      # OpenEXR
+      - type: file
+        url: https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
+        dest: external-packages/OpenEXR
+        sha256: 0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+
+      # OpenVDB
+      - type: file
+        url: https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip
+        dest: external-packages/OpenVDB
+        sha256: f353e7b99bd0cbfc27ac9082de51acf32a8bc0b3e21ff9661ecca6f205ec1d81
+
+      # Qhull
+      - type: file
+        url: https://github.com/qhull/qhull/archive/v8.0.1.zip
+        dest: external-packages/Qhull
+        sha256: 5287f5edd6a0372588f5d6640799086a4033d89d19711023ef8229dd9301d69b
+
+      # TBB
+      - type: file
+        url: https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip
+        dest: external-packages/TBB
+        sha256: 83ea786c964a384dd72534f9854b419716f412f9d43c0be88d41874763e7bb47
+      
+      # Boost
+      - type: file
+        url: https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz
+        dest: external-packages/Boost
+        sha256: 4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
+
+      # GLFW
+      - type: file
+        url: https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip
+        dest: external-packages/GLFW
+        sha256: e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0
+
+  - name: OrcaSlicer 
+    buildsystem: simple
+    build-commands:
+      - |
+        mkdir -p build && cd build
+        CXXFLAGS=-std=gnu++20 cmake ../ \
+          -DSLIC3R_PCH=OFF \
+          -DSLIC3R_FHS=ON \
+          -DSLIC3R_GTK=3 \
+          -DSLIC3R_STATIC=ON \
+          -DSLIC3R_BUILD_TESTS=OFF \
+          -DSLIC3R_DESKTOP_INTEGRATION=OFF \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DFLATPAK=ON \
+          -DBBL_RELEASE_TO_PUBLIC=1 \
+          -DCMAKE_PREFIX_PATH=/app \
+          -DCMAKE_INSTALL_PREFIX=/app
+        CXXFLAGS=-std=gnu++20 cmake --build . --target install -j$FLATPAK_BUILDER_N_JOBS
+
+    cleanup:
+      - /include
+
+    post-install:
+
+      - | # Desktop Integration files
+        install -Dm644 -t /app/share/icons/hicolor/scalable/apps/ resources/images/OrcaSlicer.svg
+        install -Dm644 ${FLATPAK_ID}.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
+        mv /app/share/applications/OrcaSlicer.desktop /app/share/applications/${FLATPAK_ID}.desktop
+        desktop-file-edit --set-key=Exec --set-value="entrypoint %U" /app/share/applications/${FLATPAK_ID}.desktop
+        install -Dm755 set-dark-theme-variant.py /app/bin
+        install -Dm755 entrypoint /app/bin
+        install -Dm755 umount /app/bin
+
+    sources:
+      # -
+      # Section bellow fetches all OrcaSlicer dependencies before the build process and stores them in external-packages/*/* .
+      # -DDEP_DOWNLOAD_DIR is set in the build process which has to match with dest.
+      #
+      # NOTE: The url, dest folder name and sha256 must match from OrcaSlicer's cmake scripts and folder names in OrcaSlicer/deps/
+      # -
+
+      # OrcaSlicer Source Archive
+      - type: dir 
+        path: ../
+
+      # AppData metainfo for Gnome Software & Co.
+      - type: file
+        path: io.github.softfever.OrcaSlicer.metainfo.xml
+
+      # script to set dark theme variant
+      - type: file
+        path: set-dark-theme-variant.py
+
+      # start-up script
+      # README: workaround for the following issues, also enables dark theme variant:
+      # SEE: https://github.com/flathub/com.bambulab.BambuStudio/issues/27
+      # SEE: https://github.com/flathub/com.bambulab.BambuStudio/issues/3
+      # SEE: https://github.com/prusa3d/PrusaSlicer/issues/2365
+      - type: file
+        path: entrypoint
+
+      # umount wrapper used to redirect umount calls to udisk2
+      - type: file
+        path: umount
--- a/flatpak/set-dark-theme-variant.py
+++ b/flatpak/set-dark-theme-variant.py
@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+
+import Xlib
+import Xlib.display
+import time
+import subprocess
+import os
+import sys
+
+
+disp = Xlib.display.Display()
+root = disp.screen().root
+
+NET_CLIENT_LIST = disp.intern_atom('_NET_CLIENT_LIST')
+
+
+def set_theme_variant_by_window_id(id, variant):
+    # Use subprocess to call
+    # xprop and set the variant from id.
+    try:
+        s = subprocess.call(['xprop', '-f', '_GTK_THEME_VARIANT', '8u', '-set', '_GTK_THEME_VARIANT', variant, '-id', str(id)],
+                            stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        if s == 0:
+            return True
+        return False
+    except Exception as ex:
+        return False
+
+
+def set_theme_variant_from_win_id_collection(win_id_collection, variant):
+    # Loop though all of the collected
+    # window ids and set theme variant
+    for win_id in win_id_collection:
+        set_theme_variant_by_window_id(win_id, variant)
+
+
+def collection_win_id_from_wm_class_name(win_class_name):
+
+    collect = []
+
+    # Loop though all of the windows
+    # and collect id's those that match
+    # win_class: prusa-slicer
+    for win_id in root.get_full_property(NET_CLIENT_LIST, Xlib.X.AnyPropertyType).value:
+        try:
+            win = disp.create_resource_object('window', win_id)
+            if not win.get_wm_transient_for():
+                win_class = win.get_wm_class()
+                if win_id and win_class_name in win_class:
+                    collect.append(
+                        win_id) if win_id not in collect else collect
+        except Xlib.error.BadWindow:
+            pass
+
+    return collect
+
+
+if __name__ == '__main__':
+
+    if os.environ.get('PRUSA_SLICER_DARK_THEME', 'false') != 'true':
+        sys.exit(0)
+
+    # Listen for X Property Change events.
+    root.change_attributes(event_mask=Xlib.X.PropertyChangeMask)
+    # the class name of the slicer window
+    win_class_name = 'prusa-slicer'
+    # the variant to set
+    variant = 'dark'
+
+    start = time.time()
+
+    while True:
+        # collect all of the window ids
+        collect = collection_win_id_from_wm_class_name(win_class_name)
+        # give PrusaSlicer window 2 secs to
+        # collect the wanted window ids
+        # set the theme variant and exit
+        if time.time() - start <= 2:
+            # disp.next_event() blocks if no events are
+            # queued. In combination with while True
+            # it creates a very simple event loop.
+            disp.next_event()
+            set_theme_variant_from_win_id_collection(collect, variant)
+        else:
+            break
--- a/flatpak/umount
+++ b/flatpak/umount
@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+if [ $# -eq 0 ]; then
+    echo "No arguments supplied"
+    exit 1
+fi
+
+DEVICE=$(basename $(findmnt -oSOURCE -n "$@") )
+
+exec /usr/bin/gdbus call -y -d org.freedesktop.UDisks2 -o /org/freedesktop/UDisks2/block_devices/$DEVICE -m org.freedesktop.UDisks2.Filesystem.Unmount "{'b': <'false'>}" 1> /dev/null
+
--- a/localization/i18n/OrcaSlicer.pot
+++ b/localization/i18n/OrcaSlicer.pot
--- a/localization/i18n/ca/OrcaSlicer_ca.po
+++ b/localization/i18n/ca/OrcaSlicer_ca.po
--- a/localization/i18n/cs/OrcaSlicer_cs.po
+++ b/localization/i18n/cs/OrcaSlicer_cs.po
--- a/localization/i18n/de/OrcaSlicer_de.po
+++ b/localization/i18n/de/OrcaSlicer_de.po
--- a/localization/i18n/en/OrcaSlicer_en.po
+++ b/localization/i18n/en/OrcaSlicer_en.po
--- a/localization/i18n/es/OrcaSlicer_es.po
+++ b/localization/i18n/es/OrcaSlicer_es.po
--- a/localization/i18n/fr/OrcaSlicer_fr.po
+++ b/localization/i18n/fr/OrcaSlicer_fr.po
--- a/localization/i18n/hu/OrcaSlicer_hu.po
+++ b/localization/i18n/hu/OrcaSlicer_hu.po
--- a/localization/i18n/it/OrcaSlicer_it.po
+++ b/localization/i18n/it/OrcaSlicer_it.po
--- a/localization/i18n/ja/OrcaSlicer_ja.po
+++ b/localization/i18n/ja/OrcaSlicer_ja.po
--- a/localization/i18n/ko/OrcaSlicer_ko.po
+++ b/localization/i18n/ko/OrcaSlicer_ko.po
--- a/localization/i18n/list.txt
+++ b/localization/i18n/list.txt
@ -53,6 +53,11 @@ src/slic3r/GUI/BBLTopbar.cpp
 src/slic3r/GUI/DownloadProgressDialog.cpp
 src/slic3r/GUI/RecenterDialog.cpp
 src/slic3r/GUI/BackgroundSlicingProcess.cpp
+src/slic3r/GUI/MultiMachinePage.cpp
+src/slic3r/GUI/MultiMachineManagerPage.cpp
+src/slic3r/GUI/MultiMachine.cpp
+src/slic3r/GUI/MultiTaskManagerPage.cpp
+src/slic3r/GUI/SendMultiMachinePage.cpp
 src/slic3r/GUI/BedShapeDialog.cpp
 src/slic3r/GUI/BedShapeDialog.hpp
 src/slic3r/GUI/ConfigManipulation.cpp
@ -105,8 +110,10 @@ src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/GUI/Auxiliary.cpp
 src/slic3r/GUI/UpdateDialogs.cpp
 src/slic3r/GUI/UnsavedChangesDialog.cpp
+src/slic3r/GUI/ObjColorDialog.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
 src/slic3r/GUI/wxExtensions.cpp
+src/slic3r/GUI/wxMediaCtrl2.cpp
 src/slic3r/GUI/WebUserLoginDialog.cpp
 src/slic3r/GUI/WebGuideDialog.cpp
 src/slic3r/GUI/KBShortcutsDialog.hpp
--- a/localization/i18n/nl/OrcaSlicer_nl.po
+++ b/localization/i18n/nl/OrcaSlicer_nl.po
--- a/localization/i18n/pl/OrcaSlicer_pl.po
+++ b/localization/i18n/pl/OrcaSlicer_pl.po
--- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
+++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
--- a/localization/i18n/ru/OrcaSlicer_ru.po
+++ b/localization/i18n/ru/OrcaSlicer_ru.po
--- a/localization/i18n/sv/OrcaSlicer_sv.po
+++ b/localization/i18n/sv/OrcaSlicer_sv.po
--- a/localization/i18n/tr/OrcaSlicer_tr.po
+++ b/localization/i18n/tr/OrcaSlicer_tr.po
--- a/localization/i18n/uk/OrcaSlicer_uk.po
+++ b/localization/i18n/uk/OrcaSlicer_uk.po
--- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
+++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
--- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
+++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
--- a/resources/handy_models/3DBenchy.3mf
+++ b/resources/handy_models/3DBenchy.3mf
--- a/resources/handy_models/3DBenchy.stl
+++ b/resources/handy_models/3DBenchy.stl
--- a/resources/handy_models/OrcaCube_v2.3mf
+++ b/resources/handy_models/OrcaCube_v2.3mf
--- a/resources/handy_models/Orca_stringhell.3mf
+++ b/resources/handy_models/Orca_stringhell.3mf
--- a/resources/handy_models/Orca_stringhell.stl
+++ b/resources/handy_models/Orca_stringhell.stl
--- a/resources/handy_models/Stanford_Bunny.3mf
+++ b/resources/handy_models/Stanford_Bunny.3mf
--- a/resources/handy_models/Stanford_Bunny.stl
+++ b/resources/handy_models/Stanford_Bunny.stl
--- a/resources/handy_models/Voron_Design_Cube_v7.3mf
+++ b/resources/handy_models/Voron_Design_Cube_v7.3mf
--- a/resources/handy_models/Voron_Design_Cube_v7.stl
+++ b/resources/handy_models/Voron_Design_Cube_v7.stl
--- a/resources/handy_models/ksr_fdmtest_v4.3mf
+++ b/resources/handy_models/ksr_fdmtest_v4.3mf
--- a/resources/handy_models/ksr_fdmtest_v4.stl
+++ b/resources/handy_models/ksr_fdmtest_v4.stl
--- a/resources/images/add.svg
+++ b/resources/images/add.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v12a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm3-6h3m2,0h3m-4-4v8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v12a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm3-6h3m2,0h3m-4-4v8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
--- a/resources/images/add_copies.svg
+++ b/resources/images/add_copies.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V3.5a1,1,0,0,1,1-1h10a1,1,0,0,1,1,1v10a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm13-1a1,1,0,0,0,1-1V1.5a1,1,0,0,0-1-1H3.5a1,1,0,0,0-1,1m0,7h3m2,0h3m-4,4v-8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V3.5a1,1,0,0,1,1-1h10a1,1,0,0,1,1,1v10a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm13-1a1,1,0,0,0,1-1V1.5a1,1,0,0,0-1-1H3.5a1,1,0,0,0-1,1m0,7h3m2,0h3m-4,4v-8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
--- a/resources/images/check_half.svg
+++ b/resources/images/check_half.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#009688"/><line x1="3.5" y1="8.5" x2="13.5" y2="8.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0" y="1" width="15" height="15" rx="1.5" style="fill:#009688"/><line x1="2.5" y1="8.5" x2="12.5" y2="8.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/check_half_disabled.svg
+++ b/resources/images/check_half_disabled.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#b3b3b3;opacity:0.3"/><line x1="3.5" y1="8.5" x2="13.5" y2="8.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0.5" y="1.5" width="14" height="14" rx="1.5" style="stroke:#DBDBDB;fill:#F0F0F1;opacity:1"/><line x1="2.5" y1="8.5" x2="12.5" y2="8.5" style="fill:none;stroke:#262E30;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/></svg>
--- a/resources/images/check_half_focused.svg
+++ b/resources/images/check_half_focused.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#4db6ac"/><line x1="3.5" y1="8.5" x2="13.5" y2="8.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0" y="1" width="15" height="15" rx="1.5" style="fill:#4db6ac"/><line x1="2.5" y1="8.5" x2="12.5" y2="8.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/check_off.svg
+++ b/resources/images/check_off.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1.5" y="1.5" width="14" height="14" rx="1" style="fill:none;stroke:#949494;stroke-miterlimit:10;opacity:0.3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0.5" y="1.5" width="14" height="14" rx="1" style="fill:none;stroke:#DBDBDB;stroke-miterlimit:10;opacity:1"/></svg>
--- a/resources/images/check_off_disabled.svg
+++ b/resources/images/check_off_disabled.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#b3b3b3;opacity:0.3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0.5" y="1.5" width="14" height="14" rx="1" style="fill:#F0F0F1;stroke:#DBDBDB;stroke-miterlimit:10;opacity:1"/></svg>
--- a/resources/images/check_off_focused.svg
+++ b/resources/images/check_off_focused.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1.5" y="1.5" width="14" height="14" rx="1" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0.5" y="1.5" width="14" height="14" rx="1" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/></svg>
--- a/resources/images/check_on.svg
+++ b/resources/images/check_on.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#009688"/><polyline points="13.5 6.5 6.5 11.5 3.5 7.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0" y="1" width="15" height="15" rx="1.5" style="fill:#009688"/><polyline points="12.5 6.5 5.5 11.5 2.5 7.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/check_on_disabled.svg
+++ b/resources/images/check_on_disabled.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#b3b3b3;opacity:0.3"/><polyline points="13.5 6.5 6.5 11.5 3.5 7.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0.5" y="1.5" width="14" height="14" rx="1" style="stroke:#DBDBDB;fill:#F0F0F1;opacity:1"/><polyline points="12.5 6.5 5.5 11.5 2.5 7.5" style="fill:none;stroke:#262E30;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/></svg>
--- a/resources/images/check_on_focused.svg
+++ b/resources/images/check_on_focused.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="1" y="1" width="15" height="15" rx="1.5" style="fill:#4db6ac"/><polyline points="13.5 6.5 6.5 11.5 3.5 7.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><rect x="0" y="1" width="15" height="15" rx="1.5" style="fill:#4db6ac"/><polyline points="12.5 6.5 5.5 11.5 2.5 7.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/checked.svg
+++ b/resources/images/checked.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><polyline points="13.5 6.5 6.5 11.5 3.5 7.5" style="fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><polyline points="14.5 6.5 7.5 11.5 4.5 7.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/></svg>
--- a/resources/images/cross.svg
+++ b/resources/images/cross.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v12a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm3-6h8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v12a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm3-6h8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
--- a/resources/images/custom-gcode_support.svg
+++ b/resources/images/custom-gcode_support.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="2.5" y1="3.5" x2="2.5" y2="12.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="4.5" y1="3.5" x2="4.5" y2="12.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="6.5" y1="3.5" x2="6.5" y2="12.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><rect x="0.5" y="3.5" width="8" height="9" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M13.5.5H1.5a1,1,0,0,0-1,1v2h10a1,1,0,0,1,1,1v8h2a1,1,0,0,0,1-1V1.5A1,1,0,0,0,13.5.5Z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="0.5" y1="14.5" x2="14.5" y2="14.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="2.5" y1="3.5" x2="2.5" y2="12.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="4.5" y1="3.5" x2="4.5" y2="12.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><rect x="0.5" y="3.5" width="6" height="9" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M13.5.5H1.5a1,1,0,0,0-1,1v2h10a1,1,0,0,1,1,1v8h2a1,1,0,0,0,1-1V1.5A1,1,0,0,0,13.5.5Z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="0.5" y1="14.5" x2="14.5" y2="14.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_circle.svg
+++ b/resources/images/cut_circle.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="6.5" style="fill:none;stroke:#54545a;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_circle_dark.svg
+++ b/resources/images/cut_circle_dark.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="6.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_hexagon.svg
+++ b/resources/images/cut_hexagon.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polygon points="4.25 14.5 11.75 14.5 15.5 8 11.75 1.5 4.25 1.5 0.5 8 4.25 14.5" style="fill:none;stroke:#54545a;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_hexagon_dark.svg
+++ b/resources/images/cut_hexagon_dark.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polygon points="4.25 14.5 11.75 14.5 15.5 8 11.75 1.5 4.25 1.5 0.5 8 4.25 14.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_square.svg
+++ b/resources/images/cut_square.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1.5" y="1.5" width="13" height="13" style="fill:none;stroke:#54545a;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_square_dark.svg
+++ b/resources/images/cut_square_dark.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="1.5" y="1.5" width="13" height="13" style="fill:none;stroke:#cfcfcf;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_triangle.svg
+++ b/resources/images/cut_triangle.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polygon points="8 1.5 0.5 14.5 15.5 14.5 8 1.5" style="fill:none;stroke:#54545a;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/cut_triangle_dark.svg
+++ b/resources/images/cut_triangle_dark.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polygon points="8 1.5 0.5 14.5 15.5 14.5 8 1.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/delete.svg
+++ b/resources/images/delete.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v12a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm3-6h8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v12a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm3-6h8" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
--- a/resources/images/drop_down.svg
+++ b/resources/images/drop_down.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><polyline points="17.5 10.5 12.5 13.5 7.5 10.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polyline points="11.5 6.5 6.5 9.5 1.5 6.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/edit.svg
+++ b/resources/images/edit.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,6.5v7a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1V1.5a1,1,0,0,1,1-1h7m-5,9v2h2l8.586-8.586a1.414,1.414,0,0,0-2-2Z" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,6.5v7a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1V1.5a1,1,0,0,1,1-1h7m-5,9v2h2l8.586-8.586a1.414,1.414,0,0,0-2-2Z" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
--- a/resources/images/edit_button.svg
+++ b/resources/images/edit_button.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,6.5v7a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1V1.5a1,1,0,0,1,1-1h7m-5,9v2h2l8.586-8.586a1.414,1.414,0,0,0-2-2Z" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,6.5v7a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1V1.5a1,1,0,0,1,1-1h7m-5,9v2h2l8.586-8.586a1.414,1.414,0,0,0-2-2Z" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
--- a/resources/images/fill_paint.svg
+++ b/resources/images/fill_paint.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M11.5.5H.5v11a11,11,0,0,0,11-11" style="fill:#009688"/><path d="M10.5,15.5h5v-5a5,5,0,0,0-5,5" style="fill:#009688"/><path d="M.5,11.5a11,11,0,0,0,11-11" style="fill:none;stroke:#54545a;stroke-miterlimit:10"/><path d="M15.5,10.5a5,5,0,0,0-5,5" style="fill:none;stroke:#54545a;stroke-miterlimit:10"/><rect x="0.5" y="0.5" width="15" height="15" transform="translate(16 16) rotate(180)" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polyline points="15 11 7 15 3 9 14 9 15 11" style="fill:#009688"/><polygon points="1.5 5.5 10.5 0.5 15.5 10.5 6.5 15.5 1.5 5.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="8.5" y1="6.5" x2="13.5" y2="0.5" style="fill:none;stroke:#54545a;stroke-linecap:round;stroke-linejoin:round"/><path d="M1.5,11S3,13,3,14c0,2-.948,2-1.5,2S0,16,0,14C0,13,1.5,11,1.5,11Z" style="fill:#009688"/></svg>
--- a/resources/images/fill_paint_dark.svg
+++ b/resources/images/fill_paint_dark.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M10.5,15.5h5v-5a5,5,0,0,0-5,5" style="fill:#009688"/><path d="M11.5.5H.5v11a11,11,0,0,0,11-11" style="fill:#009688"/><path d="M15.5,10.5a5,5,0,0,0-5,5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><path d="M.5,11.5a11,11,0,0,0,11-11" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><rect x="0.5" y="0.5" width="15" height="15" transform="translate(16 16) rotate(180)" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polyline points="15 11 7 15 3 9 14 9 15 11" style="fill:#009688"/><polygon points="1.5 5.5 10.5 0.5 15.5 10.5 6.5 15.5 1.5 5.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="8.5" y1="6.5" x2="13.5" y2="0.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:round;stroke-linejoin:round"/><path d="M1.5,11S3,13,3,14c0,2-.948,2-1.5,2S0,16,0,14C0,13,1.5,11,1.5,11Z" style="fill:#009688"/></svg>
--- a/resources/images/gap_fill.svg
+++ b/resources/images/gap_fill.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="0.5" y1="3.5" x2="4.5" y2="3.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="11.5" y1="3.5" x2="15.5" y2="3.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="6.5" y1="3.5" x2="9.5" y2="3.5" style="fill:none;stroke:#009689;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="9.5" x2="2.5" y2="9.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="8.5" y1="9.5" x2="15.5" y2="9.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="4.5" y1="9.5" x2="6.5" y2="9.5" style="fill:none;stroke:#009689;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="12.5" x2="8.5" y2="12.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.5" y1="12.5" x2="15.5" y2="12.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="10.5" y1="12.5" x2="12.5" y2="12.5" style="fill:none;stroke:#009689;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="6.5" x2="15.5" y2="6.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="0.5" x2="15.5" y2="0.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="15.5" x2="15.5" y2="15.5" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polygon points="8 0 0 0 0 6 8 0" style="fill:#009688"/><polygon points="16 7 10 0 7 6 16 7" style="fill:#009688"/><polygon points="2 8 13 11 5 16 2 8" style="fill:#009688"/><rect x="0.5" y="0.5" width="15" height="15" transform="translate(16 16) rotate(180)" style="fill:none;stroke:#54545a;stroke-linecap:square;stroke-linejoin:round"/></svg>
--- a/resources/images/gap_fill_dark.svg
+++ b/resources/images/gap_fill_dark.svg
@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="0.5" y1="3.5" x2="4.5" y2="3.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="11.5" y1="3.5" x2="15.5" y2="3.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="6.5" y1="3.5" x2="9.5" y2="3.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="9.5" x2="2.5" y2="9.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="8.5" y1="9.5" x2="15.5" y2="9.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="4.5" y1="9.5" x2="6.5" y2="9.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="12.5" x2="8.5" y2="12.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.5" y1="12.5" x2="15.5" y2="12.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="10.5" y1="12.5" x2="12.5" y2="12.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="6.5" x2="15.5" y2="6.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="0.5" x2="15.5" y2="0.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/><line x1="0.5" y1="15.5" x2="15.5" y2="15.5" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polygon points="8 0 0 0 0 6 8 0" style="fill:#009688"/><polygon points="16 7 10 0 7 6 16 7" style="fill:#009688"/><polygon points="2 8 13 11 5 16 2 8" style="fill:#009688"/><rect x="0.5" y="0.5" width="15" height="15" transform="translate(16 16) rotate(180)" style="fill:none;stroke:#cfcfcf;stroke-linecap:square;stroke-linejoin:round"/></svg>
--- a/resources/images/inputbox_x.svg
+++ b/resources/images/inputbox_x.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="4.5" y1="3.5" x2="10.5" y2="12.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="10.5" y1="3.5" x2="4.5" y2="12.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/inputbox_y.svg
+++ b/resources/images/inputbox_y.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="4.5" y1="3.5" x2="7.5" y2="8.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="10.5" y1="3.5" x2="7.5" y2="8.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="7.5" y1="8.5" x2="7.5" y2="12.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
--- a/resources/images/measure_edit.svg
+++ b/resources/images/measure_edit.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15"><path d="M14.5,6.5v7a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1V1.5a1,1,0,0,1,1-1h7m-5,9v2h2l8.586-8.586a1.414,1.414,0,0,0-2-2Z" style="fill:none;stroke:#000;stroke-linecap:square;stroke-linejoin:round;opacity:0.6000000000000001"/></svg>
--- a/resources/images/mesh_boolean_a.svg
+++ b/resources/images/mesh_boolean_a.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M12,1a3,3,0,0,1,3,3v8a3,3,0,0,1-3,3H4a3,3,0,0,1-3-3V4A3,3,0,0,1,4,1h8m0-1H4A4,4,0,0,0,0,4v8a4,4,0,0,0,4,4h8a4,4,0,0,0,4-4V4a4,4,0,0,0-4-4Z" style="fill:#949494"/><line x1="5.5" y1="11.5" x2="5.5" y2="5.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="6.5" y1="4.5" x2="9.5" y2="4.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="6.5" y1="8.5" x2="9.5" y2="8.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="10.5" y1="5.5" x2="10.5" y2="11.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/></svg>
--- a/resources/images/mesh_boolean_b.svg
+++ b/resources/images/mesh_boolean_b.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M12,1a3,3,0,0,1,3,3v8a3,3,0,0,1-3,3H4a3,3,0,0,1-3-3V4A3,3,0,0,1,4,1h8m0-1H4A4,4,0,0,0,0,4v8a4,4,0,0,0,4,4h8a4,4,0,0,0,4-4V4a4,4,0,0,0-4-4Z" style="fill:#949494"/><line x1="5.5" y1="11.5" x2="5.5" y2="5.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="5.5" y1="4.5" x2="8.5" y2="4.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="5.5" y1="7.5" x2="9.5" y2="7.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="6.5" y1="11.5" x2="9.5" y2="11.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="9.5" y1="5.5" x2="9.5" y2="6.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="10.5" y1="8.5" x2="10.5" y2="10.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/></svg>
--- a/resources/images/mesh_boolean_difference.svg
+++ b/resources/images/mesh_boolean_difference.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M15,5V15H5V5H15m0-1H5A1,1,0,0,0,4,5V15a1,1,0,0,0,1,1H15a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1Z" style="fill:#54545a"/><path d="M11,1V4H6A2,2,0,0,0,4,6v5H1V1H11m0-1H1A1,1,0,0,0,0,1V11a1,1,0,0,0,1,1H5V6A1,1,0,0,1,6,5h6V1a1,1,0,0,0-1-1Z" style="fill:#54545a"/><g style="opacity:0.4"><path d="M11,1H1V11H4V5A1,1,0,0,1,5,4h6Z" style="fill:#54545a"/></g></svg>
--- a/resources/images/mesh_boolean_difference_dark.svg
+++ b/resources/images/mesh_boolean_difference_dark.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M15,5V15H5V5H15m0-1H5A1,1,0,0,0,4,5V15a1,1,0,0,0,1,1H15a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1Z" style="fill:#cfcfcf"/><path d="M11,1V4H6A2,2,0,0,0,4,6v5H1V1H11m0-1H1A1,1,0,0,0,0,1V11a1,1,0,0,0,1,1H5V6A1,1,0,0,1,6,5h6V1a1,1,0,0,0-1-1Z" style="fill:#cfcfcf"/><g style="opacity:0.4"><path d="M11,1H1V11H4V5A1,1,0,0,1,5,4h6Z" style="fill:#cfcfcf"/></g></svg>
--- a/resources/images/mesh_boolean_intersection.svg
+++ b/resources/images/mesh_boolean_intersection.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M11,1V11H1V1H11m0-1H1A1,1,0,0,0,0,1V11a1,1,0,0,0,1,1H11a1,1,0,0,0,1-1V1a1,1,0,0,0-1-1Z" style="fill:#54545a"/><path d="M15,5V15H5V5H15m0-1H5A1,1,0,0,0,4,5V15a1,1,0,0,0,1,1H15a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1Z" style="fill:#54545a"/><g style="opacity:0.4"><rect x="5" y="5" width="6" height="6" style="fill:#54545a"/></g></svg>
--- a/resources/images/mesh_boolean_intersection_dark.svg
+++ b/resources/images/mesh_boolean_intersection_dark.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M11,1V11H1V1H11m0-1H1A1,1,0,0,0,0,1V11a1,1,0,0,0,1,1H11a1,1,0,0,0,1-1V1a1,1,0,0,0-1-1Z" style="fill:#cfcfcf"/><path d="M15,5V15H5V5H15m0-1H5A1,1,0,0,0,4,5V15a1,1,0,0,0,1,1H15a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1Z" style="fill:#cfcfcf"/><g style="opacity:0.4"><rect x="5" y="5" width="6" height="6" style="fill:#cfcfcf"/></g></svg>
--- a/resources/images/mesh_boolean_keep.svg
+++ b/resources/images/mesh_boolean_keep.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g style="opacity:0.4"><path d="M15,5V15H5V5H15m0-1H5A1,1,0,0,0,4,5V15a1,1,0,0,0,1,1H15a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1Z" style="fill:#949494"/></g><path d="M5,4A1,1,0,0,0,4,5v7H1a1,1,0,0,1-1-1V1A1,1,0,0,1,1,0H11a1,1,0,0,1,1,1V4Z" style="fill:#949494"/></svg>
--- a/resources/images/mesh_boolean_subtract.svg
+++ b/resources/images/mesh_boolean_subtract.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M15,5V15H5V5H15m0-1H5A1,1,0,0,0,4,5V15a1,1,0,0,0,1,1H15a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1Z" style="fill:#949494"/><g style="opacity:0.4"><path d="M5,4A1,1,0,0,0,4,5v7H1a1,1,0,0,1-1-1V1A1,1,0,0,1,1,0H11a1,1,0,0,1,1,1V4Z" style="fill:#949494"/></g><line x1="7.5" y1="7.5" x2="12.5" y2="12.5" style="fill:none;stroke:#949494;stroke-miterlimit:10"/><line x1="12.5" y1="7.5" x2="7.5" y2="12.5" style="fill:none;stroke:#949494;stroke-miterlimit:10"/></svg>
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="6.5" style="fill:none;stroke:#54545a;stroke-linecap:round;stroke-linejoin:round"/></svg>`
				`@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="4.5" y1="3.5" x2="10.5" y2="12.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="10.5" y1="3.5" x2="4.5" y2="12.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>`
				`@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M12,1a3,3,0,0,1,3,3v8a3,3,0,0,1-3,3H4a3,3,0,0,1-3-3V4A3,3,0,0,1,4,1h8m0-1H4A4,4,0,0,0,0,4v8a4,4,0,0,0,4,4h8a4,4,0,0,0,4-4V4a4,4,0,0,0-4-4Z" style="fill:#949494"/><line x1="5.5" y1="11.5" x2="5.5" y2="5.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="6.5" y1="4.5" x2="9.5" y2="4.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="6.5" y1="8.5" x2="9.5" y2="8.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/><line x1="10.5" y1="5.5" x2="10.5" y2="11.5" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-miterlimit:10"/></svg>