Fix preview legend window size (#3363)

Fix issue that the legend window expands to all available horizontal space if scrollbar is displayed

(cherry picked from commit a8ade1554f)

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-{
-	"name": "OrcaSlicer",
-	"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04",
-	"runArgs": ["--env-file", "/tmp/devcontainer.env"],
-    "features": {
-        "ghcr.io/devcontainers/features/desktop-lite:1": {
-			"password": "orca"
-		}
-    },
-	"customizations": {
-		"vscode": {
-			"settings": { 
-				"cmake.configureArgs": [
-					"-DSLIC3R_GTK=3",
-					"-DBBL_RELEASE_TO_PUBLIC=1",
-					"-DBBL_INTERNAL_TESTING=0",
-					"-DSLIC3R_STATIC=1",
-					"-DCMAKE_PREFIX_PATH=${workspaceFolder}/deps/build/destdir/usr/local"
-				],
-				"cmake.buildToolArgs": [
-					"-l${containerEnv:CORES}"
-				]
-			},
-			
-			// Add the IDs of extensions you want installed when the container is created.
-			"extensions": [
-				"ms-vscode.cmake-tools",
-				"ms-vscode.cpptools-extension-pack"
-			]
-		}
-	},
-	
-    "forwardPorts": [6080],
-	"portsAttributes": {
-		"6080": {
-			"label": "VNC web client (noVNC)",
-			"onAutoForward": "silent"
-		}
-    },
-	"otherPortsAttributes": {
-		"onAutoForward": "ignore"
-	},
-	
-	"initializeCommand": {
-		"Setup Temporary Env File": "echo \"CORES=`nproc --all`\" > /tmp/devcontainer.env"
-	},
-	"onCreateCommand": {
-		"Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh"
-	},
-	"postCreateCommand": "sudo .devcontainer/postCreate.sh"
-}

.devcontainer/postCreate.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-# Update and upgrade all system packages
-apt update
-apt upgrade -y          
-
-echo "-----------------------------------------"	
-echo "Running BuildLinux.sh with update flag..."
-echo "-----------------------------------------"	
-./BuildLinux.sh -u
-
-echo "------------------------------"
-echo "Installing missing packages..."
-echo "------------------------------"
-apt install -y libgl1-mesa-dev m4 autoconf libtool

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,58 +1,36 @@
-name: 🐞 Bug Report
+name: Bug Report
 description: File a bug report
-labels: ["bug"]
+labels: bug
 body:
   - type: markdown
     attributes:
       value: |
         **Thank you for using Orca Slicer and wanting to report a bug.**
-        
-        Please note that this is not the place to make feature requests or ask for help.
-        For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
-        
         Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this problem?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
   - type: input
     id: version
     attributes:
       label: OrcaSlicer Version
       description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`.
-      placeholder: e.g. 1.9.0
-    validations:
-      required: true
-  - type: dropdown
-    id: os_type
-    attributes:
-      label: "Operating System (OS)"
-      description: "What OSes are you are experiencing issues on?"
-      multiple: true
-      options:
-        - Linux
-        - macOS
-        - Windows
+      placeholder: e.g. 1.6.6
     validations:
       required: true
   - type: input
-    id: os_version
+    id: os_info
     attributes:
-      label: "OS Version"
-      description: "What OS version does this relate to?"
-      placeholder: "i.e. OS: Windows 7/8/10/11 ..., Ubuntu 22.04/Fedora 36 ..., macOS 10.15/11.1/12.3 ..."
+      label: OS version
+      description: Which OS version are you using?
+      placeholder: |
+        OS: Windows 7/8/10/11 ... , Ubuntu 22.04/Fedora 36 ... , macOS 10.15/11.1/12.3 ...
     validations:
       required: true
   - type: textarea
     id: system_info
     attributes:
       label: Additional system information
-      description: For the performance issue, please also show the CPU, Memory information; For the 3D Rendering issue, please also show the Display Card information.
+      description: For the performance issue, please also show the CPU、Memory information; For the 3D Rendering issue, please also show the Display Card information.
       placeholder: |
-        CPU: 11th gen Intel r core tm i7-1185g7/AMD Ryzen 7 6800h/...
+        CPU: 11th gen intel r core tm i7-1185g7/amd ryzen 7 6800h/...
         Memory: 32/16 GB...
         Display Card: NVIDIA Quadro P400/...
     validations:
@@ -72,8 +50,8 @@ body:
       description: Please described the detailed steps to reproduce this issue
       placeholder: |
         1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
         4. See error
     validations:
       required: true
@@ -122,12 +100,3 @@ body:
       options:
         - label: Log file
         - label: Project file
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Screenshots? References? Anything that will give us more context about the issue you are encountering!
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Community Support (Discord channel)
-    url: https://discord.gg/P4VE9UY9gJ
-    about: Please ask and answer support "how do I?"questions here.
-  - name: Discussion Forum
-    url: https://github.com/SoftFever/OrcaSlicer/discussions
-    about: Please raise ideas and feature suggestions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Which printers will be beneficial to this feature**
+E.g. Voron/Klipper based printer/etc...
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,66 +0,0 @@
-name: 🚀 Feature Request / Enhancement
-description: Suggest an improvement to make Orca Slicer even better!
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request!
-
-        If your idea is still at the formulation stage, or you're not sure it would
-        be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/OrcaSlicer/discussions/categories/ideas)
-        or you can raise it on the [Discord server](https://discord.gg/P4VE9UY9gJ).
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this feature request?
-      description: |
-        Please search to see if an issue already exists for a feature, or perhaps one similar.
-        You can then comment and react so that we know know much interest there is in the feature request.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem?
-      description: A clear and concise description of what the problem is.
-      placeholder: I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Which printers will be beneficial to this feature?
-      description: Select affected printer firmware type.
-      multiple: true
-      options: 
-        - Klipper
-        - Marlin
-        - Others
-        - All
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-      placeholder: It should do [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-      placeholder: |
-        1. [...]
-        2. [...]
-        3. [...]
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: |
-        Add any other context, diagrams, illustations or screenshots about the feature request here.
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false

.github/pull_request_template.md

@@ -1,21 +0,0 @@
-# Description
-
-<!--
-> Please provide a summary of the changes made in this PR. Include details such as:
-  > * What issue does this PR address or fix?
-  > * What new features or enhancements does this PR introduce?
-  > * Are there any breaking changes or dependencies that need to be considered?
--->
-
-# Screenshots/Recordings/Graphs
-
-<!--
-> Please attach relevant screenshots to showcase the UI changes.
-> Please attach images that can help explain the changes.
--->
-
-## Tests
-
-<!--
-> Please describe the tests that you have conducted to verify the changes made in this PR.
--->

.github/workflows/build_all.yml

@@ -24,9 +24,6 @@ on:
      - '**/CMakeLists.txt'
      - 'version.inc'
      - ".github/workflows/build_*.yml"
-     - 'BuildLinux.sh'
-     - 'build_release_vs2022.bat'
-     - 'build_release_macos.sh'
 
   workflow_dispatch: # allows for manual dispatch
     inputs:
@@ -58,21 +55,4 @@ jobs:
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
-    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 }}
+    secrets: inherit

.github/workflows/build_check_cache.yml

@@ -23,9 +23,7 @@ jobs:
       valid-cache: ${{ steps.cache_deps.outputs.cache-hit }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          lfs: 'true'
+        uses: actions/checkout@v3
         
       - name: set outputs
         id: set_outputs
@@ -40,7 +38,7 @@ jobs:
             
       - name: load cache
         id: cache_deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ${{ steps.set_outputs.outputs.cache-path }}
           key: ${{ steps.set_outputs.outputs.cache-key }}

.github/workflows/build_deps.yml

@@ -28,34 +28,32 @@ jobs:
     env:
       date:
     steps:
-
+      
       # Setup the environment
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          lfs: 'true'
-
+        uses: actions/checkout@v3
+        
       - name: load cached deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ${{ inputs.cache-path }}
           key: ${{ inputs.cache-key }}
 
       - name: setup dev on Windows
         if: inputs.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Get the date on Ubuntu and macOS
         if: inputs.os != 'windows-latest'
         run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
-
+        
       - name: Get the date on Windows
         if: inputs.os == 'windows-latest'
         run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
         shell: pwsh
 
-
+        
       # Build Dependencies
       - name: Build on Windows
         if: inputs.os == 'windows-latest'
@@ -72,12 +70,12 @@ jobs:
         if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-            brew install cmake git gettext automake texinfo ninja
+            brew install cmake git gettext automake
             brew list
             mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
             mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
             brew uninstall --ignore-dependencies zstd
-            ./build_release_macos.sh -dpx -a ${{ inputs.arch }} -t 10.15
+            ./build_release_macos.sh -dp -a ${{ inputs.arch }} -t 10.15
             brew install zstd
 
 
@@ -90,7 +88,7 @@ jobs:
             libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \
             libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-4.0-dev \
             libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \
-            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev texinfo
+            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev
             mkdir -p ${{ github.workspace }}/deps/build
             mkdir -p ${{ github.workspace }}/deps/build/destdir
             sudo ./BuildLinux.sh -ur
@@ -98,30 +96,30 @@ jobs:
             ./BuildLinux.sh -dr
             cd deps/build
             tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
-
-
+      
+            
       # Upload Artifacts
       - name: Upload Mac ${{ inputs.arch }} artifacts
         if: inputs.os == 'macos-12'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
           path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz
 
       - name: Upload Windows artifacts
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_dep_win64_${{ env.date }}
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
 
       - name: Upload Ubuntu artifacts
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' }}
-        uses: actions/upload-artifact@v4
+        if: inputs.os == 'ubuntu-20.04'
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_dep_ubuntu_${{ env.date }}
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
-
+          
   build_orca:
     name: Build OrcaSlicer
     needs: [build_deps]
@@ -133,3 +131,4 @@ jobs:
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
     secrets: inherit
+        

.github/workflows/build_orca.yml

@@ -21,32 +21,23 @@ jobs:
     env:
       date:
       ver:
-      ver_pure:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          lfs: 'true'
-
-      - name: load cached deps
-        uses: actions/cache@v4
-        with:
-          path: ${{ inputs.cache-path }}
-          key: ${{ inputs.cache-key }}
-          fail-on-cache-miss: true
+        uses: actions/checkout@v3
 
       - name: Get the version and date on Ubuntu and macOS
         if: inputs.os != 'windows-latest'
         run: |
-          ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            ver="PR-${{ github.event.number }}"
+          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
+            ver="nightly$(date +'%y%m%d')"
+          elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            ver="PR${{ github.event.number }}"
           else
-            ver=V$ver_pure
+            ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
+            ver=V$ver
           fi
           echo "ver=$ver" >> $GITHUB_ENV
-          echo "ver_pure=$ver_pure" >> $GITHUB_ENV
           echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
 
@@ -57,8 +48,10 @@ jobs:
           $ref = "${{ github.ref }}"
           $eventName = "${{ github.event_name }}"
           $prNumber = "${{ github.event.number }}"
-
-          if ($eventName -eq 'pull_request') {
+      
+          if ($ref -eq 'refs/heads/main') {
+              $ver = "nightly" + $date.Substring(2)
+          } elseif ($eventName -eq 'pull_request') {
               $ver = "PR" + $prNumber
           } else {
               $versionContent = Get-Content version.inc -Raw
@@ -67,17 +60,23 @@ jobs:
               }
               $ver = "V$ver"
           }
-
+      
           echo "ver=$ver" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
           echo "date=$date" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
           echo "date: ${{ env.date }} version: ${{ env.ver }}"
         shell: pwsh
-
+      
+      - name: load cached deps
+        uses: actions/cache@v3
+        with:
+          path: ${{ inputs.cache-path }}
+          key: ${{ inputs.cache-key }}
+        
 #   Mac
       - name: Install tools mac
         if: inputs.os == 'macos-12'
         run: |
-          brew install cmake git gettext tree ninja
+          brew install cmake git gettext tree
           brew list
           mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
           mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
@@ -87,7 +86,7 @@ jobs:
         if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-          ./build_release_macos.sh -s -n -x -a ${{inputs.arch}} -t 10.15
+          ./build_release_macos.sh -s -n -a ${{inputs.arch}} -t 10.15
 
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
@@ -125,26 +124,15 @@ jobs:
 
       - name: Upload artifacts mac
         if: inputs.os == 'macos-12'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
           path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
 
-      - name: Deploy Mac release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-12'
-        uses: WebFreak001/deploy-nightly@v3.1.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-          asset_content_type: application/octet-stream
-          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
-
 # Windows
       - name: setup MSVC
         if: inputs.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Install nsis
         if: inputs.os == 'windows-latest'
@@ -174,50 +162,28 @@ jobs:
         working-directory: ${{ github.workspace }}/build/src/Release
         shell: cmd
         run: '"C:/Program Files/7-Zip/7z.exe" a -m0=lzma2 -mx9 Debug_PDB_${{ env.ver }}_for_developers_only.7z  *.pdb'
-
+          
       - name: Upload artifacts Win zip
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Windows_${{ env.ver }}_portable
           path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
 
       - name: Upload artifacts Win installer
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/OrcaSlicer*.exe
 
       - name: Upload artifacts Win PDB
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: PDB
           path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
 
-      - name: Deploy Windows release portable
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
-        uses: WebFreak001/deploy-nightly@v3.1.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
-          asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip
-          asset_content_type: application/x-zip-compressed
-          max_releases: 1
-
-      - name: Deploy Windows release installer
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
-        uses: WebFreak001/deploy-nightly@v3.1.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
-          asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
-          asset_content_type: application/x-msdownload
-          max_releases: 1
-
 # Ubuntu
       - name: Install dependencies
         if: inputs.os == 'ubuntu-20.04'
@@ -244,43 +210,11 @@ jobs:
         shell: bash
         run: |
           ./BuildLinux.sh -isr
-          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
-          chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
-
-      - name: Build orca_custom_preset_tests
-        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
-        working-directory: ${{ github.workspace }}/build/src
-        shell: bash
-        run: |
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -g 1
-          cd ${{ github.workspace }}/resources/profiles
-          zip -r orca_custom_preset_tests.zip user/
-
+          chmod +x ./build/OrcaSlicer_ubu64.AppImage
+        
       - name: Upload artifacts Ubuntu
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' }}
-        uses: actions/upload-artifact@v4
+        if: inputs.os == 'ubuntu-20.04'
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Linux_${{ env.ver }}
-          path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage'
-
-      - name: Deploy Ubuntu release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }}
-        uses: WebFreak001/deploy-nightly@v3.1.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
-          asset_name: OrcaSlicer_Linux_${{ env.ver }}.AppImage
-          asset_content_type: application/octet-stream
-          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
-
-      - name: Deploy orca_custom_preset_tests
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }}
-        uses: WebFreak001/deploy-nightly@v3.1.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip
-          asset_name: orca_custom_preset_tests.zip
-          asset_content_type: application/octet-stream
-          max_releases: 1
+          path: './build/OrcaSlicer_ubu64.AppImage'

.github/workflows/check_locale.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:  
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Install gettext 
         run: |

.github/workflows/check_profiles.yml

@@ -1,39 +0,0 @@
-name: Check profiles
-on: 
-    pull_request:
-      branches: 
-       - main 
-      paths:
-       - 'resources/profiles/**'
-       - ".github/workflows/check_profiles.yml"
-
-jobs:
-  check_translation:
-    name: Check profiles
-    runs-on: ubuntu-22.04
-    steps:  
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # download
-      - name: Download 
-        working-directory: ${{ github.workspace }}
-        run: |
-          curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/OrcaSlicer_profile_validator
-          chmod +x ./OrcaSlicer_profile_validator
-
-      # validate profiles
-      - name: validate system profiles
-        run: |
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
-
-      - name: validate custom presets
-        working-directory: ${{ github.workspace }}
-        run: |
-          curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
-          unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
-
-
-
-        

.github/workflows/orca_bot.yml

@@ -4,62 +4,23 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  stale:
+  close-issues:
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
-      contents: write # only for delete-branch option
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v5
         with:
-          # PAT for GitHub API authentication
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          # Max number of operations per run
-          operations-per-run: 1000
-          # Order to get issues/PRs
-          ascending: true
-
-          # ISSUES
-          # Do not auto-close an issue if it is assigned to a milestone
-          exempt-all-issue-milestones: true
-          # Exempt all issues with assignees from stale
-          exempt-all-issue-assignees: true
-          # Idle number of days before marking issues stale
           days-before-issue-stale: 90
-          # Idle number of days before marking issues close
           days-before-issue-close: 7
-          # Label to apply on staled issues
+          operations-per-run: 1000
           stale-issue-label: "stale"
-          # Issue close reason
-          close-issue-reason: not_planned
-          # Remove stale label from issues on updates
-          remove-issue-stale-when-updated: true
-          # Issue stale message
-          stale-issue-message: "Orca bot: this issue is stale because it has been open for 90 days with no activity."
-          # Issue closure message
-          close-issue-message: "Orca bot: This issue was closed because it has been inactive for 7 days since being marked as stale."
-
-          # PRs
-          # Do not auto-close a PR if it is assigned to a milestone
-          exempt-all-pr-milestones: true
-          # Exempt all PRs with assignees from stale
-          exempt-all-pr-assignees: true
-          # Skip the stale action for draft PRs
-          exempt-draft-pr: true
-          # Idle number of days before marking PRs stale
+          ascending: true
+          stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity."
+          close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 7 days since being marked as stale."
           days-before-pr-stale: -1
-          # Idle number of days before marking PRs close
           days-before-pr-close: -1
-          # Label to apply on staled PRs
-          stale-pr-label: "stale"
-          # Label to apply on closed PRs
-          close-pr-label: not_planned
-          # Remove stale label from PRs on updates
-          remove-pr-stale-when-updated: true
-          # PR stale message
-          stale-pr-message: "Orca bot: this PR is stale because it has been open for XX days with no activity."
-          # PR closure message
-          close-pr-message: "Orca bot: This PR was closed because it has been inactive for X days since being marked as stale."
-          # Delete branch after closing a stale PR
-          delete-branch: true
+          remove-issue-stale-when-updated: true
+          remove-pr-stale-when-updated: true 
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish_docs_to_wiki.yml

@@ -16,12 +16,11 @@ env:
 
 jobs:
   publish_docs_to_wiki:
-    if: ${{ !env.ACT }} # Skip if using `act`
     name: Publish docs to Wiki
     runs-on: ubuntu-latest
     steps:  
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       # 1. Clone the current wiki master branch to a folder named `tmp_wiki`
       - name: Pull content from wiki

.gitignore

@@ -1,7 +1,7 @@
 Build
 Build.bat
 /build*/
-deps/build*
+deps/build
 MYMETA.json
 MYMETA.yml
 _build
@@ -30,7 +30,4 @@ src/OrcaSlicer-doc/
 **/process_full/
 **/machine_full/
 **/filament_full/
-/deps/DL_CACHE/
-/deps/DL_CACHE
-**/.flatpak-builder/
-resources/profiles/user/default
+/deps/DL_CACHE/

BuildLinux.sh

@@ -1,11 +1,15 @@
 #!/bin/bash
 
-export ROOT=$(dirname $(readlink -f ${0}))
+export ROOT=`pwd`
+export NCORES=`nproc --all`
+export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES}
+FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
+FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
 
 set -e # exit on first error
 
 function check_available_memory_and_disk() {
-    FREE_MEM_GB=$(free -g -t | grep 'Mem' | rev | cut -d" " -f1 | rev)
+    FREE_MEM_GB=$(free -g -t | grep 'Mem:' | rev | cut -d" " -f1 | rev)
     MIN_MEM_GB=10
 
     FREE_DISK_KB=$(df -k . | tail -1 | awk '{print $4}')
@@ -17,172 +21,232 @@ function check_available_memory_and_disk() {
         exit 2
     fi
 
-    if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then
-        echo -e "\nERROR: Orca Slicer Builder requires at least $(echo ${MIN_DISK_KB} |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
+    if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then 
+        echo -e "\nERROR: Orca Slicer Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
         echo && df -h . && echo
         exit 1
     fi
 }
 
 function usage() {
-    echo "Usage: ./BuildLinux.sh [-1][-b][-c][-d][-i][-r][-s][-u]"
-    echo "   -1: limit builds to 1 core (where possible)"
-    echo "   -b: build in debug mode"
-    echo "   -c: force a clean build"
-    echo "   -d: build deps (optional)"
-    echo "   -h: this help output"
+    echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
     echo "   -i: Generate appimage (optional)"
-    echo "   -r: skip ram and disk checks (low ram compiling)"
+    echo "   -g: force gtk2 build"
+    echo "   -b: build in debug mode"
+    echo "   -d: build deps (optional)"
     echo "   -s: build orca-slicer (optional)"
-    echo "   -u: update and build dependencies (optional and need sudo)"
+    echo "   -u: only update clock & dependency packets (optional and need sudo)"
+    echo "   -r: skip free ram check (low ram compiling)"
     echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
     echo "   and then './BuildLinux.sh -dsi'"
 }
 
 unset name
-while getopts ":1bcdghirsu" opt; do
+while getopts ":dsiuhgbr" opt; do
   case ${opt} in
-    1 )
-        export CMAKE_BUILD_PARALLEL_LEVEL=1
-        ;;
-    b )
-        BUILD_DEBUG="1"
-        ;;
-    c )
-        CLEAN_BUILD=1
-        ;;
-    d )
-        BUILD_DEPS="1"
-        ;;
-    h ) usage
-        exit 0
+    u )
+        UPDATE_LIB="1"
         ;;
     i )
         BUILD_IMAGE="1"
         ;;
-    r )
-	    SKIP_RAM_CHECK="1"
-	;;
+    d )
+        BUILD_DEPS="1"
+        ;;
     s )
         BUILD_ORCA="1"
         ;;
-    u )
-        UPDATE_LIB="1"
+    b )
+        BUILD_DEBUG="1"
+        ;;
+    g )
+        FOUND_GTK3=""
+        ;;
+    r )
+	SKIP_RAM_CHECK="1"
+	;;
+    h ) usage
+        exit 0
         ;;
   esac
 done
 
-if [ ${OPTIND} -eq 1 ]
+if [ $OPTIND -eq 1 ]
 then
     usage
     exit 0
 fi
 
-DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release)
-# treat ubuntu as debian
-if [ "${DISTRIBUTION}" == "ubuntu" ]
-then
-    DISTRIBUTION="debian"
+# Addtional Dev packages for OrcaSlicer
+export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
+# libwebkit2gtk-4.1-dev ??
+export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
+if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then
+    sudo apt install -y ${REQUIRED_DEV_PACKAGES} git cmake wget file gettext
 fi
-if [ ! -f ./linux.d/${DISTRIBUTION} ]
-then
-    echo "Your distribution does not appear to be currently supported by these build scripts"
-    exit 1
-fi
-source ./linux.d/${DISTRIBUTION}
 
-echo "FOUND_GTK3=${FOUND_GTK3}"
-if [[ -z "${FOUND_GTK3_DEV}" ]]
+#FIXME: require root for -u option
+if [[ -n "$UPDATE_LIB" ]]
+then
+    echo -n -e "Updating linux ...\n"
+    # hwclock -s # DeftDawg: Why does SuperSlicer want to do this?
+    apt update
+    if [[ -z "$FOUND_GTK3" ]]
+    then
+        echo -e "\nInstalling: libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
+        apt install -y libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git
+    else
+        echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
+        apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git
+    fi
+    # for ubuntu 22+ and 23+:
+    ubu_major_version="$(grep VERSION_ID /etc/os-release | cut -d "=" -f 2 | cut -d "." -f 1 | tr -d /\"/)"
+    if [ $ubu_major_version == "22" ] || [ $ubu_major_version == "23" ]
+    then
+        apt install -y curl libfuse-dev libssl-dev libcurl4-openssl-dev m4
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        echo -e "\nInstalling: libssl-dev libcurl4-openssl-dev\n"
+        apt install -y libssl-dev libcurl4-openssl-dev
+    fi
+    echo -e "done\n"
+    exit 0
+fi
+
+FOUND_GTK2_DEV=$(dpkg -l libgtk* | grep gtk2.0-dev || echo '')
+FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')
+echo "FOUND_GTK2=$FOUND_GTK2)"
+if [[ -z "$FOUND_GTK2_DEV" ]]
+then
+if [[ -z "$FOUND_GTK3_DEV" ]]
 then
     echo "Error, you must install the dependencies before."
     echo "Use option -u with sudo"
-    exit 1
+    exit 0
+fi
 fi
 
-echo "Changing date in version..."
+echo "[1/9] Updating submodules..."
+{
+    # update submodule profiles
+    pushd resources/profiles
+    git submodule update --init
+    popd
+}
+
+echo "[2/9] Changing date in version..."
 {
     # change date in version
     sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
 }
 echo "done"
 
-
-if ! [[ -n "${SKIP_RAM_CHECK}" ]]
+# mkdir in deps
+if [ ! -d "deps/build" ]
 then
-    check_available_memory_and_disk
+    mkdir deps/build
 fi
 
-if [[ -n "${BUILD_DEPS}" ]]
+if ! [[ -n "$SKIP_RAM_CHECK" ]]
 then
-    echo "Configuring dependencies..."
-    BUILD_ARGS="-DDEP_WX_GTK3=ON"
-    if [[ -n "${CLEAN_BUILD}" ]]
+check_available_memory_and_disk
+fi
+
+if [[ -n "$BUILD_DEPS" ]]
+then
+    echo "[3/9] Configuring dependencies..."
+    BUILD_ARGS=""
+    if [[ -n "$FOUND_GTK3_DEV" ]]
     then
-        rm -fr deps/build
+        BUILD_ARGS="-DDEP_WX_GTK3=ON"
     fi
-    if [ ! -d "deps/build" ]
+    if [[ -n "$BUILD_DEBUG" ]]
     then
-        mkdir deps/build
-    fi
-    if [[ -n "${BUILD_DEBUG}" ]]
-    then
-        # have to build deps with debug & release or the cmake won't find everything it needs
+        # have to build deps with debug & release or the cmake won't find evrything it needs
         mkdir deps/build/release
-        cmake -S deps -B deps/build/release -G Ninja -DDESTDIR="../destdir" ${BUILD_ARGS}
-        cmake --build deps/build/release
+        pushd deps/build/release
+            cmake ../.. -DDESTDIR="../destdir" $BUILD_ARGS
+            make -j$NCORES
+        popd
         BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
     fi
+    
+    # cmake deps
+    pushd deps/build
+        cmake .. $BUILD_ARGS
+        echo "done"
+        
+        # make deps
+        echo "[4/9] Building dependencies..."
+        make deps -j$NCORES
+        echo "done"
 
-    echo "cmake -S deps -B deps/build -G Ninja ${BUILD_ARGS}"
-    cmake -S deps -B deps/build -G Ninja ${BUILD_ARGS}
-    cmake --build deps/build
+        # rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
+        # echo "[5/9] Renaming wxscintilla library..."
+        # pushd destdir/usr/local/lib
+        #     if [[ -z "$FOUND_GTK3_DEV" ]]
+        #     then
+        #         cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a
+        #     else
+        #         cp libwxscintilla-3.1.a libwx_gtk3u_scintilla-3.1.a
+        #     fi
+        # popd
+        # echo "done"
+
+        # FIXME: only clean deps if compiling succeeds; otherwise reruns waste tonnes of time!
+        # clean deps
+        # echo "[6/9] Cleaning dependencies..."
+        # rm -rf dep_*
+    popd
+    echo "done"
 fi
 
-
-if [[ -n "${BUILD_ORCA}" ]]
+# Create main "build" directory
+if [ ! -d "build" ]
 then
-    echo "Configuring OrcaSlicer..."
-    if [[ -n "${CLEAN_BUILD}" ]]
-    then
-        rm -fr build
-    fi
+    mkdir build
+fi
+
+if [[ -n "$BUILD_ORCA" ]]
+then
+    echo "[7/9] Configuring Slic3r..."
     BUILD_ARGS=""
-    if [[ -n "${FOUND_GTK3_DEV}" ]]
+    if [[ -n "$FOUND_GTK3_DEV" ]]
     then
         BUILD_ARGS="-DSLIC3R_GTK=3"
     fi
-    if [[ -n "${BUILD_DEBUG}" ]]
+    if [[ -n "$BUILD_DEBUG" ]]
     then
         BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
     else
         BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0"
     fi
-    echo -e "cmake -S . -B build -G Ninja -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}"
-    cmake -S . -B build -G Ninja \
-        -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" \
-        -DSLIC3R_STATIC=1 \
-        -DORCA_TOOLS=ON \
-        ${BUILD_ARGS}
-    echo "done"
-    echo "Building OrcaSlicer ..."
-    cmake --build build --target OrcaSlicer
-    echo "Building OrcaSlicer_profile_validator .."
-    cmake --build build --target OrcaSlicer_profile_validator
+    
+    # cmake
+    pushd build
+        cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}
+        echo "done"
+        
+        # make Slic3r
+        echo "[8/9] Building Slic3r..."
+        make -j$NCORES OrcaSlicer # Slic3r
+    popd
     ./run_gettext.sh
     echo "done"
 fi
 
-if [[ -e ${ROOT}/build/src/BuildLinuxImage.sh ]]; then
+if [[ -e $ROOT/build/src/BuildLinuxImage.sh ]]; then
 # Give proper permissions to script
-chmod 755 ${ROOT}/build/src/BuildLinuxImage.sh
+chmod 755 $ROOT/build/src/BuildLinuxImage.sh
 
 echo "[9/9] Generating Linux app..."
     pushd build
-        if [[ -n "${BUILD_IMAGE}" ]]
+        if [[ -n "$BUILD_IMAGE" ]]
         then
-            ${ROOT}/build/src/BuildLinuxImage.sh -i
+            $ROOT/build/src/BuildLinuxImage.sh -i
         else
-            ${ROOT}/build/src/BuildLinuxImage.sh
+            $ROOT/build/src/BuildLinuxImage.sh
         fi
     popd
 echo "done"

CMakeLists.txt

@@ -3,9 +3,8 @@ cmake_minimum_required(VERSION 3.13)
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
     endif ()
-    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
 endif ()
 
 project(OrcaSlicer)
@@ -61,6 +60,7 @@ if (APPLE)
     if (CMAKE_MACOSX_BUNDLE)
         set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
     endif()
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
 
     message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
@@ -69,7 +69,6 @@ endif ()
 # Proposal for C++ unit tests and sandboxes
 option(SLIC3R_BUILD_SANDBOXES   "Build development sandboxes" OFF)
 option(SLIC3R_BUILD_TESTS       "Build unit tests" OFF)
-option(ORCA_TOOLS       "Build Orca tools" OFF)
 
 if (IS_CROSS_COMPILE)
     message("Detected cross compilation setup. Tests and encoding checks will be forcedly disabled!")
@@ -262,27 +261,14 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
         add_compile_options(-Wno-deprecated-declarations)
     endif()
 
-    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
-        add_compile_options(-Wno-error=enum-constexpr-conversion)
-    endif()
-
     #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:
     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)
@@ -329,7 +315,7 @@ if(WIN32)
     add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
     if(MSVC)
         # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
-        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
+        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 )
         # Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
         add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
         add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -391,7 +377,9 @@ 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
-find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options)
+set(MINIMUM_BOOST_VERSION "1.66.0")
+set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams")
+find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
 
 add_library(boost_libs INTERFACE)
 add_library(boost_headeronly INTERFACE)
@@ -417,8 +405,28 @@ function(slic3r_remap_configs targets from_Cfg to_Cfg)
     endif()
 endfunction()
 
-target_include_directories(boost_headeronly INTERFACE ${Boost_INCLUDE_DIRS})
-target_link_libraries(boost_libs INTERFACE boost_headeronly ${Boost_LIBRARIES})
+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()
+
+
 
 # Find and configure intel-tbb
 if(SLIC3R_STATIC)
@@ -764,7 +772,7 @@ set (CPACK_PACKAGE_VENDOR "SoftFever")
 set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
 set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
 set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
-set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}")
+set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_${SoftFever_VERSION}")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
 set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})

DockerBuild.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-PROJECT_ROOT=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
-
-set -x
-
-# Wishlist hint:  For developers, creating a Docker Compose 
-# setup with persistent volumes for the build & deps directories
-# would speed up recompile times significantly.  For end users,
-# the simplicity of a single Docker image and a one-time compilation
-# seems better.
-docker build -t orcaslicer \
-  --build-arg USER=$USER \
-  --build-arg UID=$(id -u) \
-  --build-arg GID=$(id -g) \
-  --build-arg NCORES=$NCORES \
-  $PROJECT_ROOT

DockerRun.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-set -x
-# Just in case, here's some other things that might help:
-#  Force the container's hostname to be the same as your workstation
-#  -h $HOSTNAME \
-#  If there's problems with the X display, try this
-#  -v /tmp/.X11-unix:/tmp/.X11-unix \
-docker run \
-  `# Use the hosts networking.  Printer wifi and also dbus communication` \
-  --net=host \
-  `# Some X installs will not have permissions to talk to sockets for shared memory` \
-  --ipc host \
-  `# Run as your workstations username to keep permissions the same` \
-  -u $USER \
-  `# Bind mount your home directory into the container for loading/saving files` \
-  -v $HOME:/home/$USER \
-  `# Pass the X display number to the container` \
-  -e DISPLAY=$DISPLAY \
-  `# It seems that libGL and dbus things need privileged mode` \
-  --privileged=true \
-  `# Attach tty for running orca slicer with command line things` \
-  -ti \
-  `# Clean up after yourself` \
-  --rm \
-  `# Pass all parameters from this script to the orca slicer  ENTRYPOINT binary` \
-  orcaslicer $* 
-  

Dockerfile

@@ -1,95 +0,0 @@
-FROM docker.io/ubuntu:22.04
-LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
-
-# Disable interactive package configuration
-RUN apt-get update && \
-    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-# Add a deb-src
-RUN echo deb-src http://archive.ubuntu.com/ubuntu \
-    $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list 
-
-RUN apt-get update && apt-get install  -y \
-    autoconf \
-    build-essential \
-    cmake \
-    curl \
-    eglexternalplatform-dev \
-    extra-cmake-modules \
-    file \
-    git \
-    gstreamer1.0-plugins-bad \
-    gstreamer1.0-libav \
-    libcairo2-dev \
-    libcurl4-openssl-dev \
-    libdbus-1-dev \
-    libglew-dev \ 
-    libglu1-mesa-dev \
-    libglu1-mesa-dev \
-    libgstreamer1.0-dev \
-    libgstreamerd-3-dev \ 
-    libgstreamer-plugins-base1.0-dev \
-    libgstreamer-plugins-good1.0-dev \
-    libgtk-3-dev \
-    libgtk-3-dev \
-    libosmesa6-dev \
-    libsecret-1-dev \
-    libsoup2.4-dev \
-    libssl3 \
-    libssl-dev \
-    libtool \
-    libudev-dev \
-    libwayland-dev \
-    libwebkit2gtk-4.0-dev \
-    libxkbcommon-dev \
-    locales \
-    locales-all \
-    m4 \
-    pkgconf \
-    sudo \
-    wayland-protocols \
-    wget
-
-# Change your locale here if you want.  See the output
-# of `locale -a` to pick the correct string formatting.
-ENV LC_ALL=en_US.utf8
-RUN locale-gen $LC_ALL
-
-# Set this so that Orca Slicer doesn't complain about
-# the CA cert path on every startup
-ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-
-COPY ./ OrcaSlicer
-
-WORKDIR OrcaSlicer
-
-# These can run together, but we run them seperate for podman caching
-# Update System dependencies
-RUN ./BuildLinux.sh -u
-
-# Build dependencies in ./deps
-RUN ./BuildLinux.sh -d
-
-# Build slic3r
-RUN ./BuildLinux.sh -s
-
-# Build AppImage
-ENV container podman
-RUN ./BuildLinux.sh -i
-
-# It's easier to run Orca Slicer as the same username,
-# UID and GID as your workstation.  Since we bind mount
-# your home directory into the container, it's handy
-# to keep permissions the same.  Just in case, defaults
-# are root.
-SHELL ["/bin/bash", "-l", "-c"]
-ARG USER=root
-ARG UID=0
-ARG GID=0
-RUN [[ "$UID" != "0" ]] \
-  && groupadd -f -g $GID $USER \
-  && useradd -u $UID -g $GID $USER
-
-# Using an entrypoint instead of CMD because the binary
-# accepts several command line arguments.
-ENTRYPOINT ["/OrcaSlicer/build/package/bin/orca-slicer"]

README.md

@@ -1,7 +1,7 @@
 [![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
 # Orca Slicer     
 Orca Slicer is an open source slicer for FDM printers.   
-
+You can download Orca Slicer here: [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).  
 ![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/P4VE9UY9gJ)   
 
 # Main features
@@ -13,29 +13,19 @@ Orca Slicer is an open source slicer for FDM printers.
 - More granular controls
 - More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
 
-
-# Download
-
-### Stable Release
-📥 **[Download the Latest Stable Release](https://github.com/SoftFever/OrcaSlicer/releases/latest)**  
-Visit our GitHub Releases page for the latest stable version of Orca Slicer, recommended for most users.
-
-### Nightly Builds
-🌙 **[Download the Latest Nightly Build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds)**  
-Explore the latest developments in Orca Slicer with our nightly builds. Feedback on these versions is highly appreciated.
-
+### Some background
+OrcaSlicer is fork of 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
+Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
 
 # How to install
 **Windows**: 
-1.  Download the installer for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
-    - *For convenience there is also a portable build available.*
+1.  Install and run  
     - *If you have troubles to run the build, you might need to install following runtimes:*
-      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
-          - [Details of this runtime](https://aka.ms/webview2)
-          - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
-      - [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
-          -  [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
-          -  This file may already be available on your computer if you've installed visual studio.  Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
+      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)  
+      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)  
 
 **Mac**:
 1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.  
@@ -60,31 +50,17 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback
     
 **Linux(Ubuntu)**:
  1. If you run into trouble to execute it, try this command in terminal:  
-    `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage`
-    
+    `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
 # How to compile
 - Windows 64-bit  
-  - Tools needed: Visual Studio 2019, Cmake, git, git-lfs, Strawberry Perl.
-      - You will require cmake version 3.14 or later, which is available [on their website](https://cmake.org/download/).
-      - Strawberry Perl is [available on their github repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/).
+  - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
   - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
-  - Note: Don't forget to run `git lfs pull` after cloning the repository to download tools on Windows
 
 - Mac 64-bit  
-  - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf, texinfo
-      - You can install most of them by running `brew install cmake gettext libtool automake autoconf texinfo`
+  - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf
   - run `build_release_macos.sh`
-  - To build and debug in XCode:
-      - run `XCode.app`
-      - open ``build_`arch`/OrcaSlicer.xcodeproj``
-      - menu bar: Product => Scheme => OrcaSlicer
-      - menu bar: Product => Scheme => Edit Scheme...
-          - Run => Info tab => Build Configuration: `RelWithDebInfo`
-          - Run => Options tab => Document Versions: uncheck `Allow debugging when browsing versions`
-      - menu bar: Product => Run
 
-- Ubuntu 
-  - Dependencies **Will be auto installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git texinfo`
+- Ubuntu  
   - run 'sudo ./BuildLinux.sh -u'
   - run './BuildLinux.sh -dsir'
 
@@ -113,33 +89,25 @@ Thank you! :)
     <img src="SoftFever_doc\sponsor_logos\peopoly-standard-logo.png" alt="Peopoly" width="64" height="">
 </a>
 </td> 
+</tr>
+<tr>
+<td> </td>
+</tr>
+<tr>
 <td>
 <a href="https://qidi3d.com/">
     <img src="SoftFever_doc\sponsor_logos\QIDI.png" alt="QIDI" width="64" height="">
 </a>
 </td>
-<td>
-<a href="https://phrozen3d.com/">
-    <img src="SoftFever_doc\sponsor_logos\Phrozen_Logo圓_.png" alt="Phrozen Technology" width="64" height="">
-</a>
-</td>
 </tr>
 </table>
 
 ### Backers:  
-Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/files/14855600/sponsors.csv)
+Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/wiki/OrcaSlicer-backers-%E2%80%90-28-Oct-2023)
 
 Support me  
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP)
 
-## Some background
-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
-Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
-
-
 # License
 Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
 

SECURITY.md

@@ -1,32 +0,0 @@
-POLICY: Our security policy is to avoid leaving the ecosystem worse than we found it. Meaning we are not planning to introduce vulnerabilities into the ecosystem.
-The OrcaSlicer team and community take all security bugs in OrcaSlicer seriously. Thank you for improving the security of OrcaSlicer. We appreciate your efforts to disclose the issue responsibly, and will make every effort to acknowledge your contributions.
-
-Report security bugs by emailing the lead maintainer at softfeverever@gmail.com and include the word "SECURITY" in the subject line.
-
-The lead maintainer will acknowledge your email within a week (7 days), and will send a more detailed response up to 48 hours after that indicating the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the progress towards a fix and an announcement. We may ask for additional information or guidance.
-
-OrcaSlicer will confirm the problem and determine the affected versions.
-OrcaSlicer will audit code to find any similar problems.
-OrcaSlicer will prepare fixes for all releases still under maintenance. These fixes will be released as fast as possible.
-Report security bugs in third-party modules to the person or team maintaining the module.
-
-SECURITY DISCLOSURE: Your responsibility is to report vulnerabilities to us using the guidelines outlined below.
-Please give detailed steps on how to disclose the vulnerability. Keep these OWASP guidelines in mind ( https://www.owasp.org/index.php/Vulnerability_Disclosure_Cheat_Sheet ) when creating your disclosure policy.
-
-Below are some recommendations for security disclosures:
-
-OrcaSlicer security contact { contact: mailto:softfeverever@gmail.com] }
-When disclosing vulnerabilities please do the following:
-Your name and affiliation (if any).
-Include scope of vulnerability. Let us know who could use this exploit.
-Document steps to identify the vulnerability. It is important that we can reproduce your findings.
-Show how to exploit vulnerability, give us an attack scenario.
-OrcaSlicer Checklist: Security Recommendations
-Follow these steps to improve security when using OrcaSlicer.
-
-...SEE SOMETHING
-...SAY SOMETHING
-1)...SEE SOMETHING
-We suggest you goto #2 if this happens.
-
-Why? Through experience we have found it is best to goto #2 in this situation.

build_release.bat

@@ -1,50 +1,26 @@
 set WP=%CD%
-
-set debug=OFF
-set debuginfo=OFF
-if "%1"=="debug" set debug=ON
-if "%2"=="debug" set debug=ON
-if "%1"=="debuginfo" set debuginfo=ON
-if "%2"=="debuginfo" set debuginfo=ON
-if "%debug%"=="ON" (
-    set build_type=Debug
-    set build_dir=build-dbg
-) else (
-    if "%debuginfo%"=="ON" (
-        set build_type=RelWithDebInfo
-        set build_dir=build-dbginfo
-    ) else (
-        set build_type=Release
-        set build_dir=build
-    )
-)
-echo build type set to %build_type%
-
 cd deps
-mkdir %build_dir%
-cd %build_dir%
+mkdir build
+cd build
 set DEPS=%CD%/OrcaSlicer_dep
 if "%1"=="slicer" (
     GOTO :slicer
 )
 echo "building deps.."
-
-echo cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
-cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
-cmake --build . --config %build_type% --target deps -- -m
+cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
+cmake --build . --config Release --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir %build_dir%
-cd %build_dir%
+mkdir build 
+cd build
 
-echo cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
-cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
-cmake --build . --config %build_type% --target ALL_BUILD -- -m
+cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
+cmake --build . --config Release --target ALL_BUILD -- -m
 cd ..
 call run_gettext.bat
-cd %build_dir%
-cmake --build . --target install --config %build_type%
+cd build
+cmake --build . --target install --config Release

build_release_macos.sh

@@ -1,10 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-set -e
-set -o pipefail
-
-while getopts ":dpa:snt:xbc:h" opt; do
-  case "${opt}" in
+while getopts ":a:sdpt:hn" opt; do
+  case ${opt} in
     d )
         export BUILD_TARGET="deps"
         ;;
@@ -23,72 +20,25 @@ while getopts ":dpa:snt:xbc:h" opt; do
     t )
         export OSX_DEPLOYMENT_TARGET="$OPTARG"
         ;;
-    x )
-        export SLICER_CMAKE_GENERATOR="Ninja"
-        export SLICER_BUILD_TARGET="all"
-        export DEPS_CMAKE_GENERATOR="Ninja"
-        ;;
-    b )
-        export BUILD_ONLY="1"
-        ;;
-    c )
-        export BUILD_CONFIG="$OPTARG"
-        ;;
     h ) echo "Usage: ./build_release_macos.sh [-d]"
         echo "   -d: Build deps only"
         echo "   -a: Set ARCHITECTURE (arm64 or x86_64)"
         echo "   -s: Build slicer only"
         echo "   -n: Nightly build"
         echo "   -t: Specify minimum version of the target platform, default is 11.3"
-        echo "   -x: Use Ninja CMake generator, default is Xcode"
-        echo "   -b: Build without reconfiguring CMake"
-        echo "   -c: Set CMake build configuration, default is Release"
         exit 0
         ;;
-    * )
-        ;;
   esac
 done
 
-# Set defaults
-
-if [ -z "$ARCH" ]; then
-  ARCH="$(uname -m)"
-  export ARCH
+if [ -z "$ARCH" ]
+then
+  export ARCH=$(uname -m)
 fi
 
-if [ -z "$BUILD_CONFIG" ]; then
-  export BUILD_CONFIG="Release"
-fi
-
-if [ -z "$BUILD_TARGET" ]; then
-  export BUILD_TARGET="all"
-fi
-
-if [ -z "$SLICER_CMAKE_GENERATOR" ]; then
-  export SLICER_CMAKE_GENERATOR="Xcode"
-fi
-
-if [ -z "$SLICER_BUILD_TARGET" ]; then
-  export SLICER_BUILD_TARGET="ALL_BUILD"
-fi
-
-if [ -z "$DEPS_CMAKE_GENERATOR" ]; then
-  export DEPS_CMAKE_GENERATOR="Unix Makefiles"
-fi
-
-if [ -z "$OSX_DEPLOYMENT_TARGET" ]; then
-  export OSX_DEPLOYMENT_TARGET="11.3"
-fi
-
-echo "Build params:"
-echo " - ARCH: $ARCH"
-echo " - BUILD_CONFIG: $BUILD_CONFIG"
-echo " - BUILD_TARGET: $BUILD_TARGET"
-echo " - CMAKE_GENERATOR: $SLICER_CMAKE_GENERATOR for Slicer, $DEPS_CMAKE_GENERATOR for deps"
-echo " - OSX_DEPLOYMENT_TARGET: $OSX_DEPLOYMENT_TARGET"
-echo
-
+echo "Arch: $ARCH"
+echo "BUILD_TARGET: $BUILD_TARGET"
+echo "OSX_DEPLOYMENT_TARGET: $OSX_DEPLOYMENT_TARGET"
 # if which -s brew; then
 # 	brew --prefix libiconv
 # 	brew --prefix zstd
@@ -102,122 +52,57 @@ echo
 # 	exit 1
 # fi
 
-PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
-DEPS_DIR="$PROJECT_DIR/deps"
-DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
-DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
 
-# Fix for Multi-config generators
-if [ "$SLICER_CMAKE_GENERATOR" == "Xcode" ]; then
-    export BUILD_DIR_CONFIG_SUBDIR="/$BUILD_CONFIG"
-else
-    export BUILD_DIR_CONFIG_SUBDIR=""
+WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd $WD/deps
+mkdir -p build_$ARCH
+cd build_$ARCH
+DEPS=$PWD/OrcaSlicer_dep_$ARCH
+mkdir -p $DEPS
+if [ "slicer." != $BUILD_TARGET. ]; 
+then
+    echo "building deps..."
+    echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}"
+    cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-${ARCH}-cc" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}
+    cmake --build . --config Release --target deps 
+    if [ "1." == "$PACK_DEPS". ];
+    then
+        tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz OrcaSlicer_dep_$ARCH
+    fi
 fi
 
-function build_deps() {
-    echo "Building deps..."
-    (
-        set -x
-        mkdir -p "$DEPS"
-        cd "$DEPS_BUILD_DIR"
-        if [ "1." != "$BUILD_ONLY". ]; then
-            cmake .. \
-                -G "${DEPS_CMAKE_GENERATOR}" \
-                -DDESTDIR="$DEPS" \
-                -DOPENSSL_ARCH="darwin64-${ARCH}-cc" \
-                -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-                -DCMAKE_OSX_ARCHITECTURES:STRING="${ARCH}" \
-                -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
-        fi
-        cmake --build . --config "$BUILD_CONFIG" --target deps
-    )
-}
 
-function pack_deps() {
-    echo "Packing deps..."
-    (
-        set -x
-        mkdir -p "$DEPS"
-        cd "$DEPS_BUILD_DIR"
-        tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "OrcaSlicer_dep_$ARCH"
-    )
-}
-
-function build_slicer() {
-    echo "Building slicer..."
-    (
-        set -x
-        mkdir -p "$PROJECT_BUILD_DIR"
-        cd "$PROJECT_BUILD_DIR"
-        if [ "1." != "$BUILD_ONLY". ]; then
-            cmake .. \
-                -G "${SLICER_CMAKE_GENERATOR}" \
-                -DBBL_RELEASE_TO_PUBLIC=1 \
-                -DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
-                -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \
-                -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-                -DCMAKE_MACOSX_RPATH=ON \
-                -DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
-                -DCMAKE_MACOSX_BUNDLE=ON \
-                -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
-                -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
-        fi
-        cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
-    )
-
-    echo "Verify localization with gettext..."
-    (
-        cd "$PROJECT_DIR"
-        ./run_gettext.sh
-    )
-
-    echo "Fix macOS app package..."
-    (
-        cd "$PROJECT_BUILD_DIR"
-        mkdir -p OrcaSlicer
-        cd OrcaSlicer
-        # remove previously built app
-        rm -rf ./OrcaSlicer.app
-        # fully copy newly built app
-        cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app
-        # fix resources
-        resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
-        rm ./OrcaSlicer.app/Contents/Resources
-        cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
-        # delete .DS_Store file
-        find ./OrcaSlicer.app/ -name '.DS_Store' -delete
-    )
-
-    # extract version
-    # export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
-    # ver="_V${ver//\"}"
-    # echo $PWD
-    # if [ "1." != "$NIGHTLY_BUILD". ];
-    # then
-    #     ver=${ver}_dev
-    # fi
-
-    # zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
-}
-
-case "${BUILD_TARGET}" in
-    all)
-        build_deps
-        build_slicer
-        ;;
-    deps)
-        build_deps
-        ;;
-    slicer)
-        build_slicer
-        ;;
-    *)
-        echo "Unknown target: $BUILD_TARGET. Available targets: deps, slicer, all."
-        exit 1
-        ;;
-esac
-
-if [ "1." == "$PACK_DEPS". ]; then
-    pack_deps
+if [ "deps." == "$BUILD_TARGET". ];
+then
+    exit 0
 fi
+
+cd $WD
+mkdir -p build_$ARCH
+cd build_$ARCH
+echo "building slicer..."
+cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}
+cmake --build . --config Release --target ALL_BUILD 
+cd ..
+./run_gettext.sh
+cd build_$ARCH
+mkdir -p OrcaSlicer
+cd OrcaSlicer
+rm -r ./OrcaSlicer.app
+cp -pR ../src/Release/OrcaSlicer.app ./OrcaSlicer.app
+resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
+rm ./OrcaSlicer.app/Contents/Resources
+cp -R $resources_path ./OrcaSlicer.app/Contents/Resources
+# delete .DS_Store file
+find ./OrcaSlicer.app/ -name '.DS_Store' -delete
+# extract version
+# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+# ver="_V${ver//\"}"
+# echo $PWD
+# if [ "1." != "$NIGHTLY_BUILD". ];
+# then
+#     ver=${ver}_dev
+# fi
+
+
+# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app

build_release_vs2022.bat

@@ -13,30 +13,10 @@ if "%1"=="pack" (
     exit /b 0
 )
 
-set debug=OFF
-set debuginfo=OFF
-if "%1"=="debug" set debug=ON
-if "%2"=="debug" set debug=ON
-if "%1"=="debuginfo" set debuginfo=ON
-if "%2"=="debuginfo" set debuginfo=ON
-if "%debug%"=="ON" (
-    set build_type=Debug
-    set build_dir=build-dbg
-) else (
-    if "%debuginfo%"=="ON" (
-        set build_type=RelWithDebInfo
-        set build_dir=build-dbginfo
-    ) else (
-        set build_type=Release
-        set build_dir=build
-    )
-)
-echo build type set to %build_type%
-
 setlocal DISABLEDELAYEDEXPANSION 
 cd deps
-mkdir %build_dir%
-cd %build_dir%
+mkdir build
+cd build
 set DEPS=%CD%/OrcaSlicer_dep
 
 if "%1"=="slicer" (
@@ -44,22 +24,22 @@ if "%1"=="slicer" (
 )
 echo "building deps.."
 
-echo cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
-cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
-cmake --build . --config %build_type% --target deps -- -m
+
+cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
+cmake --build . --config Release --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir %build_dir%
-cd %build_dir%
+mkdir build 
+cd build
 
-echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
-cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
-cmake --build . --config %build_type% --target ALL_BUILD -- -m
+echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release
+cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
+cmake --build . --config Release --target ALL_BUILD -- -m
 cd ..
 call run_gettext.bat
-cd %build_dir%
-cmake --build . --target install --config %build_type%
+cd build
+cmake --build . --target install --config Release

cmake/modules/MacOSXBundleInfo.plist.in

@@ -26,19 +26,6 @@
 	<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>OrcaSlicer Downloads</string>
-        <key>CFBundleURLSchemes</key>
-        <array>
-          <string>orcaslicer</string>
-        </array>
-      </dict>
-    </array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -48,7 +35,7 @@
 			<string>STL</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/stl.icns</string>
+			<string>stl.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -65,7 +52,7 @@
 			<string>OBJ</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/OrcaSlicer.icns</string>
+			<string>OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -82,7 +69,7 @@
 			<string>AMF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/OrcaSlicer.icns</string>
+			<string>OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>AMF</string>
 			<key>CFBundleTypeRole</key>
@@ -99,7 +86,7 @@
 			<string>3MF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/OrcaSlicer.icns</string>
+			<string>OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>3MF</string>
 			<key>CFBundleTypeRole</key>
@@ -116,7 +103,7 @@
 			<string>GCODE</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/gcode.icns</string>
+			<string>gcode.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>GCODE</string>
 			<key>CFBundleTypeRole</key>

deps/Boost/Boost.cmake

@@ -1,25 +1,203 @@
+include(ExternalProject)
 
-set(_context_abi_line "")
-set(_context_arch_line "")
-if (APPLE AND CMAKE_OSX_ARCHITECTURES)
-    if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
-        set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
-    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
-        set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
+# Use boost 1.78 for Windows, to support VS2022
+if (WIN32)
+	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz")
+	set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7)
+    set(_bootstrap_cmd bootstrap.bat)
+    set(_build_cmd  b2.exe)
+else()
+	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz")
+	set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A)
+    set(_bootstrap_cmd ./bootstrap.sh)
+    set(_build_cmd ./b2)
+endif()
+
+set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
+    set(_boost_toolset gcc)
+    set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
+    if (MSVC_VERSION EQUAL 1800)
+    # 1800      = VS 12.0 (v120 toolset)
+        set(_boost_toolset "msvc-12.0")
+    elseif (MSVC_VERSION EQUAL 1900)
+    # 1900      = VS 14.0 (v140 toolset)
+        set(_boost_toolset "msvc-14.0")
+    elseif (MSVC_VERSION LESS 1920)
+    # 1910-1919 = VS 15.0 (v141 toolset)
+        set(_boost_toolset "msvc-14.1")
+    elseif (MSVC_VERSION LESS 1930)
+    # 1920-1929 = VS 16.0 (v142 toolset)
+        set(_boost_toolset "msvc-14.2")
+    elseif (MSVC_VERSION LESS 1940)
+    # 1930-1939 = VS 17.0 (v143 toolset)
+        set(_boost_toolset "msvc-14.3")
+    else ()
+        message(FATAL_ERROR "Unsupported MSVC version")
     endif ()
-    set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    if (WIN32)
+        set(_boost_toolset "clang-win")
+    else()
+        set(_boost_toolset "clang")
+    endif()
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    set(_boost_toolset "intel")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    set(_boost_toolset "clang")
+endif()
+
+message(STATUS "Deduced boost toolset: ${_boost_toolset} based on ${CMAKE_CXX_COMPILER_ID} compiler")
+
+set(_libs "")
+foreach(_comp ${DEP_Boost_COMPONENTS})
+    list(APPEND _libs "--with-${_comp}")
+endforeach()
+
+if (BUILD_SHARED_LIBS)
+    set(_link shared)
+else()
+    set(_link static)
+endif()
+
+set(_bits "")
+if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+    set(_bits 64)
+elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+    set(_bits 32)
 endif ()
 
-orcaslicer_add_cmake_project(Boost
-    URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
-    URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
-    LIST_SEPARATOR |
-    CMAKE_ARGS
-        -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
-        -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros
-        -DBUILD_TESTING:BOOL=OFF
-        "${_context_abi_line}"
-        "${_context_arch_line}"
+include(ProcessorCount)
+ProcessorCount(NPROC)
+file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
+
+
+set(_boost_variants "")
+if(CMAKE_BUILD_TYPE)
+    list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
+    list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
+endif()
+list(FIND CMAKE_CONFIGURATION_TYPES "Release" _cfg_rel)
+list(FIND CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" _cfg_relwdeb)
+list(FIND CMAKE_CONFIGURATION_TYPES "MinSizeRel" _cfg_minsizerel)
+list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _cfg_deb)
+
+if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1)
+    list(APPEND _boost_variants release)
+endif()
+
+if (MSVC AND ${DEP_DEBUG} )
+    list(APPEND _boost_variants debug)
+endif()
+
+if (NOT _boost_variants)
+    set(_boost_variants release)
+endif()
+
+if (IS_CROSS_COMPILE AND APPLE)
+    if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
+        message(STATUS "Compiling Boost for arm64.")
+        message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
+        message(STATUS "Compiling Boost with libs ${_libs}.")
+        message(STATUS "Compiling Boost with variant ${_boost_variants}.")
+        message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
+        message(STATUS "_boost_linkflags = ${_boost_linkflags}")
+        set(_arch_flags "-arch arm64")
+        set(_boost_linkflags "linkflags=${_arch_flags}")
+        message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
+    elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
+        message(STATUS "Compiling Boost for x86_64.")
+        set(_arch_flags "-arch x86_64")
+    endif()
+    set(_boost_linkflags "linkflags=${_arch_flags}")
+endif ()
+
+set(_boost_flags "")
+if(APPLE)
+    set(_boost_flags 
+        "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") 
+elseif (UNIX)
+    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
+endif()
+
+set(_build_cmd ${_build_cmd}
+               ${_boost_flags}
+               ${_boost_linkflags}
+               -j${NPROC}
+               ${_libs}
+               --layout=versioned
+               --debug-configuration
+               toolset=${_boost_toolset}
+               address-model=${_bits}
+               link=${_link}
+               threading=multi
+               boost.locale.icu=off
+               --disable-icu
+               ${_boost_variants}
+               stage)
+
+set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
+
+if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
+    message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
+    message(STATUS "Standard boost build with patch command '${_patch_command}'")
+    message(STATUS "Standard boost build with build command '${_build_cmd}'")
+    message(STATUS "Standard boost build with install command '${_install_cmd}'")
+ExternalProject_Add(
+    dep_Boost
+	URL ${_boost_url}
+    URL_HASH SHA256=${_boost_hash}
+    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
+    CONFIGURE_COMMAND "${_bootstrap_cmd}"
+    PATCH_COMMAND ${_patch_command}
+    BUILD_COMMAND "${_build_cmd}"
+    BUILD_IN_SOURCE    ON
+    INSTALL_COMMAND "${_install_cmd}"
 )
 
-set(DEP_Boost_DEPENDS ZLIB)
+else()
+
+ExternalProject_Add(
+    dep_Boost
+	URL ${_boost_url}
+    URL_HASH SHA256=${_boost_hash}
+    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
+    CONFIGURE_COMMAND ./bootstrap.sh
+        --with-toolset=clang
+        --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
+        "--prefix=${DESTDIR}/usr/local"
+#    PATCH_COMMAND ${_patch_command}
+    BUILD_COMMAND "${_build_cmd}"
+    BUILD_IN_SOURCE    ON
+    INSTALL_COMMAND "${_install_cmd}"
+)
+endif()
+
+if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+    message(STATUS "Patch the boost::polygon library with a custom one.")
+    # Patch the boost::polygon library with a custom one.
+    ExternalProject_Add(dep_boost_polygon
+        EXCLUDE_FROM_ALL ON
+        # GIT_REPOSITORY "https://github.com/prusa3d/polygon"
+        # GIT_TAG prusaslicer_gmp
+        URL https://github.com/prusa3d/polygon/archive/refs/heads/prusaslicer_gmp.zip
+        URL_HASH SHA256=abeb9710f0a7069fb9b22181ae5c56f6066002f125db210e7ffb27032aed6824
+        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/boost_polygon
+        DEPENDS dep_Boost
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        ${_cmake_args_osx_arch}
+        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
+            "${DESTDIR}/usr/local/include/boost/polygon"
+    )
+    # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
+    list(APPEND _dep_list "dep_boost_polygon")
+endif ()

deps/CMakeLists.txt

@@ -24,10 +24,8 @@ cmake_minimum_required(VERSION 3.2)
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
     endif ()
-    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
-
 endif ()
 
 project(OrcaSlicer-deps)
@@ -42,17 +40,8 @@ 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)
-
-if (_is_multi)
-    option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
-    option(ORCA_INCLUDE_DEBUG_INFO "Includes debug information in a release build (like RelWithDebInfo) in a way that works with multi-configuration generators and incompatible dependencies. DEP_DEBUG option takes priority over this." OFF)
-endif ()
+option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
@@ -96,6 +85,8 @@ find_package(Git REQUIRED)
 # The default command line for patching. Only works for newer 
 set(PATCH_CMD ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix)
 
+get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
 if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
     message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.")
@@ -106,11 +97,7 @@ function(orcaslicer_add_cmake_project projectname)
 
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
     if (_is_multi OR MSVC)
-        if (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
-            set(_configs_line "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-        else ()
-            set(_configs_line "")
-        endif ()
+        set(_configs_line "")
     endif ()
 
     set(_gen "")
@@ -124,13 +111,13 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
     ExternalProject_Add(
         dep_${projectname}
         EXCLUDE_FROM_ALL    ON
-        INSTALL_DIR         ${DESTDIR}
+        INSTALL_DIR         ${DESTDIR}/usr/local
         DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
         ${_gen}
         CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
             -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
             -DCMAKE_DEBUG_POSTFIX:STRING=d
             -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
             -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
@@ -144,49 +131,16 @@ 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
     )
-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}
-        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
-        ${_gen}
-        CMAKE_ARGS
-            -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}"
-            ${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
-       # 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}
+        INSTALL_DIR         ${DESTDIR}/usr/local
         DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
         ${_gen}
         CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
             -DBUILD_SHARED_LIBS:BOOL=OFF
             ${_cmake_osx_arch}
             "${_configs_line}"
@@ -194,7 +148,7 @@ else()
             ${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 
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
 
 endif()
@@ -216,6 +170,7 @@ if (MSVC)
     endif ()
 elseif (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     if (CMAKE_OSX_DEPLOYMENT_TARGET)
         set(DEP_OSX_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}")
         message("OS X Deployment Target: ${DEP_OSX_TARGET}")
@@ -240,20 +195,6 @@ 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)
@@ -265,7 +206,6 @@ 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)
@@ -278,7 +218,6 @@ include(Boost/Boost.cmake)
 include(Cereal/Cereal.cmake)
 include(Qhull/Qhull.cmake)
 include(GLEW/GLEW.cmake)
-
 include(GLFW/GLFW.cmake)
 include(OpenCSG/OpenCSG.cmake)
 
@@ -294,69 +233,32 @@ 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 OPENSSL_FOUND OR NOT CURL_FOUND)
+if (NOT CURL_FOUND)
     include(CURL/CURL.cmake)
     set(CURL_PKG dep_CURL)
 endif ()
 
-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(JPEG/JPEG.cmake)
+include(TIFF/TIFF.cmake)
+include(wxWidgets/wxWidgets.cmake)
 include(OCCT/OCCT.cmake)
-include(OpenCV/OpenCV.cmake)
+include(FREETYPE/FREETYPE.cmake)
 
 set(_dep_list
     dep_Boost
     dep_TBB
-    ${OPENSSL_PKG}
     ${CURL_PKG}
-    ${WXWIDGETS_PKG}
+    dep_wxWidgets
     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}
@@ -371,6 +273,9 @@ 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

deps/CURL/CURL.cmake

@@ -72,10 +72,9 @@ orcaslicer_add_cmake_project(CURL
     ${_curl_platform_flags}
 )
 
-if(NOT OPENSSL_FOUND)
-  # (openssl may or may not be built)
-  add_dependencies(dep_CURL ${OPENSSL_PKG})
-endif()
+# if (APPLE OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
+  add_dependencies(dep_CURL dep_OpenSSL)
+# endif ()
 
 if (MSVC)
     add_debug_dep(dep_CURL)

deps/GMP/GMP.cmake

@@ -1,16 +1,17 @@
 
 set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/gmp)
+set(_dstdir ${DESTDIR}/usr/local)
 
 if (MSVC)
-    set(_output  ${DESTDIR}/include/gmp.h 
-                 ${DESTDIR}/lib/libgmp-10.lib 
-                 ${DESTDIR}/bin/libgmp-10.dll)
+    set(_output  ${_dstdir}/include/gmp.h 
+                 ${_dstdir}/lib/libgmp-10.lib 
+                 ${_dstdir}/bin/libgmp-10.dll)
 
     add_custom_command(
         OUTPUT  ${_output}
-        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/
+        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/
     )
     
     add_custom_target(dep_GMP SOURCES ${_output})
@@ -60,8 +61,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}" ${_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}/usr/local" ${_gmp_build_tgt}
         BUILD_COMMAND     make -j
         INSTALL_COMMAND   make install
     )
-endif ()
+endif ()

deps/MPFR/MPFR.cmake

@@ -1,17 +1,18 @@
 set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/mpfr)
+set(_dstdir ${DESTDIR}/usr/local)
 
 if (MSVC)
-    set(_output  ${DESTDIR}/include/mpfr.h
-                 ${DESTDIR}/include/mpf2mpfr.h
-                 ${DESTDIR}/lib/libmpfr-4.lib 
-                 ${DESTDIR}/bin/libmpfr-4.dll)
+    set(_output  ${_dstdir}/include/mpfr.h
+                 ${_dstdir}/include/mpf2mpfr.h
+                 ${_dstdir}/lib/libmpfr-4.lib 
+                 ${_dstdir}/bin/libmpfr-4.dll)
 
     add_custom_command(
         OUTPUT  ${_output}
-        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/
+        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/
     )
 
     add_custom_target(dep_MPFR SOURCES ${_output})
@@ -25,12 +26,12 @@ else ()
     endif ()
 
     ExternalProject_Add(dep_MPFR
-        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
-        URL_HASH SHA256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
+        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
+        URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
         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} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR} ${_gmp_build_tgt}
+                          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}
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         DEPENDS dep_GMP

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 ${FREETYPE_PKG}
+    #DEPENDS dep_FREETYPE
     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 ${FREETYPE_PKG})
+add_dependencies(dep_OCCT dep_FREETYPE)

deps/OpenCV/0001-vs2022.patch

@@ -1,52 +0,0 @@
-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
-

deps/OpenCV/OpenCV.cmake

@@ -1,73 +0,0 @@
-if (MSVC)
-    set(_use_IPP "-DWITH_IPP=ON")
-else ()
-    set(_use_IPP "-DWITH_IPP=OFF")
-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
-       -DBUILD_TESTS=OFF
-       -DBUILD_opencv_python_tests=OFF
-       -DBUILD_EXAMPLES=OFF
-       -DBUILD_JASPER=OFF
-       -DBUILD_JAVA=OFF
-       -DBUILD_JPEG=ON
-       -DBUILD_APPS_LIST=version
-       -DBUILD_opencv_apps=OFF
-       -DBUILD_opencv_java=OFF
-       -DBUILD_OPENEXR=OFF
-       -DBUILD_PNG=ON
-       -DBUILD_TBB=OFF
-       -DBUILD_WEBP=OFF
-       -DBUILD_ZLIB=OFF
-       -DWITH_1394=OFF
-       -DWITH_CUDA=OFF
-       -DWITH_EIGEN=OFF
-       ${_use_IPP}
-       -DWITH_ITT=OFF
-       -DWITH_FFMPEG=OFF
-       -DWITH_GPHOTO2=OFF
-       -DWITH_GSTREAMER=OFF
-       -DOPENCV_GAPI_GSTREAMER=OFF
-       -DWITH_GTK_2_X=OFF
-       -DWITH_JASPER=OFF
-       -DWITH_LAPACK=OFF
-       -DWITH_MATLAB=OFF
-       -DWITH_MFX=OFF
-       -DWITH_DIRECTX=OFF
-       -DWITH_DIRECTML=OFF
-       -DWITH_OPENCL=OFF
-       -DWITH_OPENCL_D3D11_NV=OFF
-       -DWITH_OPENCLAMDBLAS=OFF
-       -DWITH_OPENCLAMDFFT=OFF
-       -DWITH_OPENEXR=OFF
-       -DWITH_OPENJPEG=OFF
-       -DWITH_QUIRC=OFF
-       -DWITH_VTK=OFF
-       -DWITH_WEBP=OFF
-       -DENABLE_PRECOMPILED_HEADERS=OFF
-       -DINSTALL_TESTS=OFF
-       -DINSTALL_C_EXAMPLES=OFF
-       -DINSTALL_PYTHON_EXAMPLES=OFF
-       -DOPENCV_GENERATE_SETUPVARS=OFF
-       -DOPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=OFF
-       -DBUILD_opencv_python2=OFF
-       -DBUILD_opencv_python3=OFF
-       -DWITH_OPENVINO=OFF
-       -DWITH_INF_ENGINE=OFF
-       -DWITH_NGRAPH=OFF
-       -DBUILD_WITH_STATIC_CRT=OFF#set /MDd /MD
-       -DBUILD_LIST=core,imgcodecs,imgproc,world
-       -DBUILD_opencv_highgui=OFF
-       -DWITH_ADE=OFF
-       -DBUILD_opencv_world=ON
-       -DWITH_PROTOBUF=OFF
-       -DWITH_WIN32UI=OFF
-       -DHAVE_WIN32UI=FALSE
-)
-

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}
+        INSTALL_DIR         ${DESTDIR}/usr/local
         DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/OpenEXR
         ${_openxr_list_sep}
         CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
             -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 ()

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}"
-        "--prefix=${DESTDIR}"
+        "--openssldir=${DESTDIR}/usr/local"
+        "--prefix=${DESTDIR}/usr/local"
         ${_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}${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
     WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
 )

deps/TBB/GNU.cmake

@@ -1,79 +0,0 @@
-# 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)

deps/TBB/TBB.cmake

@@ -1,14 +1,8 @@
-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_command}
+    #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-TBB-GCC13.patch
     CMAKE_ARGS          
         -DTBB_BUILD_SHARED=OFF
         -DTBB_BUILD_TESTS=OFF

deps/TIFF/TIFF.cmake

@@ -11,7 +11,6 @@ if (APPLE)
             -Dwebp:BOOL=OFF
             -Djbig:BOOL=OFF
             -Dzstd:BOOL=OFF
-            -Dlibdeflate:BOOL=OFF
             -Dpixarlog:BOOL=OFF
     )
 else()

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 1950)
-# 1930-1949 = VS 17.0 (v143 toolset)
+elseif (MSVC_VERSION LESS 1940)
+# 1930-1939 = VS 17.0 (v143 toolset)
     set(DEP_VS_VER "17")
     set(DEP_BOOST_TOOLSET "msvc-14.3")
 else ()

deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch

@@ -0,0 +1,683 @@
+From f4fef135f0a58ca2916c45cd539923ab096935b6 Mon Sep 17 00:00:00 2001
+From: Ocraftyone <Ocraftyone@users.noreply.github.com>
+Date: Thu, 30 Nov 2023 03:25:54 -0500
+Subject: [PATCH] patch v3.2.1 for OrcaSlicer
+
+---
+ build/cmake/lib/webview/CMakeLists.txt |  4 +-
+ include/wx/fontutil.h                  | 15 +++++++-
+ include/wx/gdicmn.h                    |  3 ++
+ include/wx/generic/grid.h              |  4 +-
+ include/wx/msw/font.h                  |  2 +-
+ include/wx/msw/tooltip.h               |  4 +-
+ include/wx/osx/app.h                   |  2 +-
+ src/common/combocmn.cpp                | 11 +++++-
+ src/common/datavcmn.cpp                |  6 ++-
+ src/common/dcbufcmn.cpp                |  6 +++
+ src/common/gdicmn.cpp                  | 14 +++++++
+ src/common/image.cpp                   |  6 +--
+ src/generic/grid.cpp                   | 50 ++++++++++++++++++++-----
+ src/msw/bmpcbox.cpp                    |  9 ++++-
+ src/msw/font.cpp                       | 14 +++----
+ src/msw/menuitem.cpp                   |  2 +
+ src/msw/window.cpp                     | 52 +++++++++++++++++---------
+ src/osx/cocoa/dataview.mm              | 26 +++++++++++--
+ src/osx/cocoa/settings.mm              |  6 +--
+ src/osx/cocoa/window.mm                |  4 ++
+ 20 files changed, 184 insertions(+), 56 deletions(-)
+
+diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
+index 085381d785..62146abc04 100644
+--- a/build/cmake/lib/webview/CMakeLists.txt
++++ b/build/cmake/lib/webview/CMakeLists.txt
+@@ -46,9 +46,9 @@ if(APPLE)
+ elseif(WXMSW)
+     if(wxUSE_WEBVIEW_EDGE)
+         # Update the following variables if updating WebView2 SDK
+-        set(WEBVIEW2_VERSION "1.0.705.50")
++        set(WEBVIEW2_VERSION "1.0.1418.22")
+         set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
+-        set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
++        set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99")
+ 
+         set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
+ 
+diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
+index 30529db8ce..e6a12366d5 100644
+--- a/include/wx/fontutil.h
++++ b/include/wx/fontutil.h
+@@ -294,7 +294,11 @@ public:
+     wxFontEncoding GetEncoding() const;
+ 
+     void SetPointSize(int pointsize);
+-    void SetFractionalPointSize(double pointsize);
++    void SetFractionalPointSize(double pointsize
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	);
+     void SetPixelSize(const wxSize& pixelSize);
+     void SetStyle(wxFontStyle style);
+     void SetNumericWeight(int weight);
+@@ -307,12 +311,19 @@ public:
+ 
+     // Helper used in many ports: use the normal font size if the input is
+     // negative, as we handle -1 as meaning this for compatibility.
+-    void SetSizeOrDefault(double size)
++    void SetSizeOrDefault(double size
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	)
+     {
+         SetFractionalPointSize
+         (
+             size < 0 ? wxNORMAL_FONT->GetFractionalPointSize()
+                      : size
++#if defined(__WXMSW__)
++            ,window
++#endif
+         );
+     }
+ 
+diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
+index 2f5f8ee99f..39e9317d40 100644
+--- a/include/wx/gdicmn.h
++++ b/include/wx/gdicmn.h
+@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion;
+ class WXDLLIMPEXP_FWD_BASE wxString;
+ class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+ class WXDLLIMPEXP_FWD_CORE wxPoint;
++class WXDLLIMPEXP_FWD_CORE wxWindow;
+ 
+ // ---------------------------------------------------------------------------
+ // constants
+@@ -1106,7 +1107,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth();
+ 
+ // get the display size
+ extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
++extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
++extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window);
+ extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();
+diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
+index 1bd58bbf04..903cb81319 100644
+--- a/include/wx/generic/grid.h
++++ b/include/wx/generic/grid.h
+@@ -3029,9 +3029,11 @@ private:
+     // Update the width/height of the column/row being drag-resized.
+     // Should be only called when m_dragRowOrCol != -1, i.e. dragging is
+     // actually in progress.
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     void DoGridDragResize(const wxPoint& position,
+                           const wxGridOperations& oper,
+-                          wxGridWindow* gridWindow);
++                          wxGridWindow* gridWindow,
++                          CursorMode mode);
+ 
+     // process different clicks on grid cells
+     void DoGridCellLeftDown(wxMouseEvent& event,
+diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
+index 0f9768b44e..094d774918 100644
+--- a/include/wx/msw/font.h
++++ b/include/wx/msw/font.h
+@@ -23,7 +23,7 @@ public:
+     // ctors and such
+     wxFont() { }
+ 
+-    wxFont(const wxFontInfo& info);
++    wxFont(const wxFontInfo& info, const wxWindow *window = nullptr);
+ 
+     wxFont(int size,
+            wxFontFamily family,
+diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
+index 4c3be08cec..96fb378d01 100644
+--- a/include/wx/msw/tooltip.h
++++ b/include/wx/msw/tooltip.h
+@@ -91,10 +91,10 @@ private:
+     // the one and only one tooltip control we use - never access it directly
+     // but use GetToolTipCtrl() which will create it when needed
+     static WXHWND ms_hwndTT;
+-
++public:
+     // create the tooltip ctrl if it doesn't exist yet and return its HWND
+     static WXHWND GetToolTipCtrl();
+-
++private:
+     // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop
+     static void DeleteToolTipCtrl();
+ 
+diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
+index 317a0ca96f..58014ec1d4 100644
+--- a/include/wx/osx/app.h
++++ b/include/wx/osx/app.h
+@@ -161,7 +161,7 @@ private:
+ 
+ public:
+     bool                OSXInitWasCalled() { return m_inited; }
+-    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
++    virtual void        OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
+     void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
+     void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
+ #endif
+diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
+index 80408c6677..aa07caebdc 100644
+--- a/src/common/combocmn.cpp
++++ b/src/common/combocmn.cpp
+@@ -2061,6 +2061,9 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     SetFocus();
+ 
++    //int displayIdx = wxDisplay::GetFromWindow(this);
++    //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
++
+     // Space above and below
+     int screenHeight;
+     wxPoint scrPos;
+@@ -2183,9 +2186,13 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     int showFlags = CanDeferShow;
+ 
+-    if ( spaceBelow < szp.y )
++    int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN);
++    if (// Pop up as asked for by the library user.
++        (anchorSideVertical & wxUP) ||
++        // Automatic: Pop up if it does not fit down.
++        (anchorSideVertical == 0 && spaceBelow < szp.y ))
+     {
+-        popupY = scrPos.y - szp.y;
++        popupY = scrPos.y - szp.y + displayRect.GetTop();
+         showFlags |= ShowAbove;
+     }
+ 
+diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
+index 0a1e43ad51..6c492aedab 100644
+--- a/src/common/datavcmn.cpp
++++ b/src/common/datavcmn.cpp
+@@ -1334,7 +1334,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const
+ 
+     wxDataViewItemArray selections;
+     GetSelections(selections);
+-    return selections[0];
++    // BBS
++    if (!selections.empty())
++        return selections[0];
++    else
++        return wxDataViewItem(0);
+ }
+ 
+ namespace
+diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
+index 9b1c1f3159..ef5865ed4b 100644
+--- a/src/common/dcbufcmn.cpp
++++ b/src/common/dcbufcmn.cpp
+@@ -83,9 +83,15 @@ private:
+         const double scale = dc ? dc->GetContentScaleFactor() : 1.0;
+         wxBitmap* const buffer = new wxBitmap;
+ 
++#if __WXMSW__
++        // we must always return a valid bitmap but creating a bitmap of
++        // size 0 would fail, so create a 1*1 bitmap in this case
++        buffer->Create(wxMax(w, 1), wxMax(h, 1), 24);
++#else
+         // we must always return a valid bitmap but creating a bitmap of
+         // size 0 would fail, so create a 1*1 bitmap in this case
+         buffer->CreateWithDIPSize(wxMax(w, 1), wxMax(h, 1), scale);
++#endif
+ 
+         return buffer;
+     }
+diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
+index db8a01f961..162c1ce2dc 100644
+--- a/src/common/gdicmn.cpp
++++ b/src/common/gdicmn.cpp
+@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height)
+         *height = size.y;
+ }
+ 
++void wxDisplaySize(const wxWindow *window, int *width, int *height)
++{
++    const wxSize size = wxGetDisplaySize(window);
++    if ( width )
++        *width = size.x;
++    if ( height )
++        *height = size.y;    
++}
++
+ wxSize wxGetDisplaySize()
+ {
+     return wxDisplay().GetGeometry().GetSize();
+ }
+ 
++wxSize wxGetDisplaySize(const wxWindow *window)
++{
++    return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize();
++}
++
+ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+ {
+     const wxRect rect = wxGetClientDisplayRect();
+diff --git a/src/common/image.cpp b/src/common/image.cpp
+index 19fe34ec91..a449b60930 100644
+--- a/src/common/image.cpp
++++ b/src/common/image.cpp
+@@ -390,11 +390,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
+                     unsigned char red = pixel[0] ;
+                     unsigned char green = pixel[1] ;
+                     unsigned char blue = pixel[2] ;
+-                    unsigned char alpha = 255  ;
+-                    if ( source_alpha )
+-                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                     if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                     {
++                        unsigned char alpha = 255  ;
++                        if ( source_alpha )
++                            alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                         if ( alpha > 0 )
+                         {
+                             avgRed += red ;
+diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
+index ed3d988994..d71cda122d 100644
+--- a/src/generic/grid.cpp
++++ b/src/generic/grid.cpp
+@@ -4068,7 +4068,8 @@ void wxGrid::ProcessRowColLabelMouseEvent( const wxGridOperations &oper, wxMouse
+         {
+             if ( m_cursorMode == oper.GetCursorModeResize() )
+             {
+-                DoGridDragResize(event.GetPosition(), oper, gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), oper, gridWindow, m_cursorMode);
+             }
+             else if ( m_cursorMode == oper.GetCursorModeSelect() && line >=0 )
+             {
+@@ -4691,12 +4692,14 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event,
+ 
+         case WXGRID_CURSOR_RESIZE_ROW:
+             if ( m_dragRowOrCol != -1 )
+-                DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+             break;
+ 
+         case WXGRID_CURSOR_RESIZE_COL:
+             if ( m_dragRowOrCol != -1 )
+-                DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+             break;
+ 
+         default:
+@@ -4791,6 +4794,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                             case wxGridSelectCells:
+                             case wxGridSelectRowsOrColumns:
+                                 // nothing to do in these cases
++                                //BBS: select this cell when first click
++                                m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event);
+                                 break;
+ 
+                             case wxGridSelectRows:
+@@ -5049,9 +5054,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG
+     }
+ }
+ 
++//BBS: add cursor mode for DoGridDragResize's paremeters
+ void wxGrid::DoGridDragResize(const wxPoint& position,
+                               const wxGridOperations& oper,
+-                              wxGridWindow* gridWindow)
++                              wxGridWindow* gridWindow,
++                              CursorMode mode)
+ {
+     wxCHECK_RET( m_dragRowOrCol != -1,
+                  "shouldn't be called when not drag resizing" );
+@@ -5064,10 +5071,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position,
+     // orthogonal direction.
+     const int linePos = oper.Dual().Select(logicalPos);
+ 
+-    const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+-    oper.SetLineSize(this, m_dragRowOrCol,
++    //BBS: add logic for resize multiplexed cols
++    if (mode == WXGRID_CURSOR_RESIZE_COL) {
++        int col_to_resize = m_dragRowOrCol;
++        int num_rows, num_cols;
++        this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols);
++        if (num_cols < 1)
++            col_to_resize = m_dragRowOrCol - 1;
++
++        const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol);
++        const int lineSize = oper.GetLineSize(this, col_to_resize);
++        int size = linePos - lineEnd + lineSize;
++        oper.SetLineSize(this, col_to_resize,
++                     wxMax(size,
++                           oper.GetMinimalLineSize(this, col_to_resize)));
++    }
++    else {
++        const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
++
++        oper.SetLineSize(this, m_dragRowOrCol,
+                      wxMax(linePos - lineStart,
+                            oper.GetMinimalLineSize(this, m_dragRowOrCol)));
++    }
+ 
+     // TODO: generate RESIZING event, see #10754, if the size has changed.
+ }
+@@ -5090,7 +5115,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const
+ 
+ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+ 
+     SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, event);
+ 
+@@ -5099,7 +5125,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin
+ 
+ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+ 
+     SendGridSizeEvent(wxEVT_GRID_COL_SIZE, m_dragRowOrCol, event);
+ 
+@@ -5113,9 +5140,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col)
+ 
+ void wxGrid::DoHeaderDragResizeCol(int width)
+ {
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     DoGridDragResize(GetPositionForResizeEvent(width),
+                      wxGridColumnOperations(),
+-                     m_gridWin);
++                     m_gridWin, WXGRID_CURSOR_RESIZE_COL);
+ }
+ 
+ void wxGrid::DoHeaderEndDragResizeCol(int width)
+@@ -6013,6 +6041,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
+                     DisableCellEditControl();
+ 
+                     MoveCursorDown( event.ShiftDown() );
++                    //BBS: select this cell when first click
++                    m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             event);
+                 }
+                 break;
+ 
+diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
+index 011bd4f534..17e7f18740 100644
+--- a/src/msw/bmpcbox.cpp
++++ b/src/msw/bmpcbox.cpp
+@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl()
+ 
+     wxComboBox::DoClear();
+ 
+-    HWND hwnd = GetHwnd();
++    WNDPROC wndproc_edit = nullptr;
++	WinStruct<COMBOBOXINFO> combobox_info;
++	HWND hwnd = GetHwnd();
++if (::GetComboBoxInfo(hwnd, &combobox_info))
++		wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem);
+     DissociateHandle();
+     ::DestroyWindow(hwnd);
+ 
+     if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )
+         return;
+ 
++if (::GetComboBoxInfo(GetHwnd(), &combobox_info))
++    wxSetWindowProc(combobox_info.hwndItem, wndproc_edit);
++
+     // initialize the controls contents
+     for ( i = 0; i < numItems; i++ )
+     {
+diff --git a/src/msw/font.cpp b/src/msw/font.cpp
+index 434876939c..91d4603018 100644
+--- a/src/msw/font.cpp
++++ b/src/msw/font.cpp
+@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;
+ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+ {
+ public:
+-    wxFontRefData(const wxFontInfo& info = wxFontInfo());
++    wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr);
+ 
+     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+     {
+@@ -324,7 +324,7 @@ protected:
+ // wxFontRefData
+ // ----------------------------------------------------------------------------
+ 
+-wxFontRefData::wxFontRefData(const wxFontInfo& info)
++wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window)
+ {
+     m_hFont = NULL;
+ 
+@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info)
+     }
+     else
+     {
+-        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize());
++        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window);
+     }
+ 
+     SetStyle(info.GetStyle());
+@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
+     return wxGetFontEncFromCharSet(lf.lfCharSet);
+ }
+ 
+-void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew)
++void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window)
+ {
+     // We don't have the correct DPI to use here, so use that of the
+     // primary screen and rely on WXAdjustToPPI() changing it later if
+     // necessary.
+-    const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
++    const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+     lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi);
+ 
+     pointSize = pointSizeNew;
+@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc)
+         (void)Create(info);
+ }
+ 
+-wxFont::wxFont(const wxFontInfo& info)
++wxFont::wxFont(const wxFontInfo& info, const wxWindow *window)
+ {
+-    m_refData = new wxFontRefData(info);
++    m_refData = new wxFontRefData(info, window);
+ }
+ 
+ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
+diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
+index 0bd017a36a..3b98bf1678 100644
+--- a/src/msw/menuitem.cpp
++++ b/src/msw/menuitem.cpp
+@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window)
+         // native menu uses small top margin for separator
+         if ( SeparatorMargin.cyTopHeight >= 2 )
+             SeparatorMargin.cyTopHeight -= 2;
++
++        SeparatorSize.cy = 0;
+     }
+     else
+ #endif // wxUSE_UXTHEME
+diff --git a/src/msw/window.cpp b/src/msw/window.cpp
+index c529a4fa3b..7e547c64df 100644
+--- a/src/msw/window.cpp
++++ b/src/msw/window.cpp
+@@ -4809,33 +4809,49 @@ static wxSize GetWindowDPI(HWND hwnd)
+ }
+ 
+ /*extern*/
+-int wxGetSystemMetrics(int nIndex, const wxWindow* window)
++int wxGetSystemMetrics(int nIndex, const wxWindow* win)
+ {
+ #if wxUSE_DYNLIB_CLASS
+-    if ( !window )
+-        window = wxApp::GetMainTopWindow();
++    const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win;
+ 
+-    if ( window )
++    if (window)
+     {
+-        typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
+-        static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
+-        static bool s_initDone = false;
+-
+-        if ( !s_initDone )
+-        {
+-            wxLoadedDLL dllUser32("user32.dll");
+-            wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
+-            s_initDone = true;
++#if 1
++        if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) {
++            HDC hdc = GetDC(window->GetHWND());
++#if 0
++            double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES);
++            ReleaseDC(window->GetHWND(), hdc);
++            wxSize dpi = window->GetDPI();
++            dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y);
++            return int(dim + 0.5);
++#else
++            return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES));
++#endif
+         }
+-
+-        if ( s_pfnGetSystemMetricsForDpi )
++        else
++#endif
+         {
+-            const int dpi = window->GetDPI().y;
+-            return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
++            static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
++            static bool s_initDone = false;
++
++            if ( !s_initDone )
++            {
++                wxLoadedDLL dllUser32("user32.dll");
++                wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
++                s_initDone = true;
++            }
++
++            if ( s_pfnGetSystemMetricsForDpi )
++            {
++                const int dpi = window->GetDPI().y;
++                return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            }
+         }
+     }
+ #else
+-    wxUnusedVar(window);
++    wxUnusedVar(win);
+ #endif // wxUSE_DYNLIB_CLASS
+ 
+     return ::GetSystemMetrics(nIndex);
+diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
+index f188e61089..7b867002d1 100644
+--- a/src/osx/cocoa/dataview.mm
++++ b/src/osx/cocoa/dataview.mm
+@@ -1604,6 +1604,15 @@ outlineView:(NSOutlineView*)outlineView
+     }
+ }
+ 
++//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl,
++// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl
++// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though.
++- (void)mouseMoved:(NSEvent *)event
++{
++if (! implementation->DoHandleMouseEvent(event))
++        [super mouseMoved:event];
++}
++
+ //
+ // contextual menus
+ //
+@@ -2006,7 +2015,8 @@ void wxCocoaDataViewControl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd
+         if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) )
+             wxWidgetCocoaImpl::keyEvent(event, slf, _cmd);
+     }
+-    else
++    //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working.
++    else if (! DoHandleKeyEvent(event))
+     {
+         wxWidgetCocoaImpl::keyEvent(event, slf, _cmd);  // all other keys
+     }
+@@ -2540,12 +2550,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent)
+ 
+ void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+ {
+-    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point);
++    NSTableHeaderView *headerView = [m_OutlineView headerView];
++    if (headerView && point.y < headerView.visibleRect.size.height) {
++    // The point is inside the header area.
++            columnPtr = NULL;
++            item      = wxDataViewItem();
++    return;
++        }
++    // Convert from the window coordinates to the virtual scrolled view coordinates.
++    NSScrollView *scrollView = [m_OutlineView enclosingScrollView];
++    const NSRect &visibleRect = scrollView.contentView.visibleRect;
++    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),
++    wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y));
+ 
+     int indexColumn;
+     int indexRow;
+ 
+-
+     indexColumn = [m_OutlineView columnAtPoint:nativePoint];
+     indexRow    = [m_OutlineView rowAtPoint:   nativePoint];
+     if ((indexColumn >= 0) && (indexRow >= 0))
+diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
+index c819deeb0c..dc3c3b0b53 100644
+--- a/src/osx/cocoa/settings.mm
++++ b/src/osx/cocoa/settings.mm
+@@ -222,7 +222,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+ // ----------------------------------------------------------------------------
+ 
+ // Get a system metric, e.g. scrollbar size
+-int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
++int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win)
+ {
+     int value;
+ 
+@@ -257,11 +257,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN
+         // TODO case wxSYS_WINDOWMIN_Y:
+ 
+         case wxSYS_SCREEN_X:
+-            wxDisplaySize(&value, NULL);
++            wxDisplaySize(win, &value, NULL);
+             return value;
+ 
+         case wxSYS_SCREEN_Y:
+-            wxDisplaySize(NULL, &value);
++            wxDisplaySize(win, NULL, &value);
+             return value;
+ 
+         // TODO case wxSYS_FRAMESIZE_X:
+diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
+index 635ea286d4..42ae67e27a 100644
+--- a/src/osx/cocoa/window.mm
++++ b/src/osx/cocoa/window.mm
+@@ -191,6 +191,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
+ - (BOOL)isEnabled;
+ - (void)setEnabled:(BOOL)flag;
+ 
++- (BOOL)clipsToBounds;
++- (void)setClipsToBounds:(BOOL)clipsToBounds;
++
+ - (void)setImage:(NSImage *)image;
+ - (void)setControlSize:(NSControlSize)size;
+ 
+@@ -2559,6 +2562,7 @@ wxWidgetImpl( peer, flags )
+     if ( m_osxView )
+         CFRetain(m_osxView);
+     [m_osxView release];
++    m_osxView.clipsToBounds = YES;
+ }
+ 
+ 
+-- 
+2.42.0.windows.2
+

deps/wxWidgets/0001-wx-3.1.5-patch-for-Orca.patch

@@ -0,0 +1,743 @@
+From 5e82980ed1762338794d06b3f9f22fa10e050622 Mon Sep 17 00:00:00 2001
+From: SoftFever <softfeverever@gmail.com>
+Date: Sat, 23 Dec 2023 20:08:41 +0800
+Subject: [PATCH] wx 3.1.5 patch for Orca
+
+---
+ build/cmake/init.cmake                 |  4 ++
+ build/cmake/lib/webview/CMakeLists.txt |  4 +-
+ include/wx/fontutil.h                  | 15 +++++++-
+ include/wx/gdicmn.h                    |  3 ++
+ include/wx/generic/grid.h              |  4 +-
+ include/wx/msw/font.h                  |  2 +-
+ include/wx/msw/tooltip.h               |  4 +-
+ include/wx/osx/app.h                   |  2 +-
+ src/common/combocmn.cpp                | 13 +++++--
+ src/common/datavcmn.cpp                |  6 ++-
+ src/common/dcbufcmn.cpp                |  8 +++-
+ src/common/gdicmn.cpp                  | 14 +++++++
+ src/common/image.cpp                   |  6 +--
+ src/common/intl.cpp                    |  7 ++++
+ src/generic/grid.cpp                   | 53 +++++++++++++++++++++-----
+ src/msw/bmpcbox.cpp                    |  9 ++++-
+ src/msw/font.cpp                       | 14 +++----
+ src/msw/menuitem.cpp                   |  2 +
+ src/msw/window.cpp                     | 52 ++++++++++++++++---------
+ src/osx/cocoa/dataview.mm              | 26 +++++++++++--
+ src/osx/cocoa/settings.mm              |  6 +--
+ src/osx/cocoa/window.mm                |  4 ++
+ 22 files changed, 199 insertions(+), 59 deletions(-)
+
+diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
+index 0bc4f934b9..479431a69c 100644
+--- a/build/cmake/init.cmake
++++ b/build/cmake/init.cmake
+@@ -413,7 +413,11 @@ if(wxUSE_GUI)
+         else()
+             find_package(OpenGL)
+             if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL)
++                if(UNIX AND NOT APPLE)
++                set(OPENGL_LIBRARIES OpenGL EGL)
++                else()
+                 set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::EGL)
++                endif()
+                 find_package(WAYLANDEGL)
+                 if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
+                     list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})
+diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
+index cc3298ff33..aa103ae474 100644
+--- a/build/cmake/lib/webview/CMakeLists.txt
++++ b/build/cmake/lib/webview/CMakeLists.txt
+@@ -56,9 +56,9 @@ if(APPLE)
+ elseif(WXMSW)
+     if(wxUSE_WEBVIEW_EDGE)
+         # Update the following variables if updating WebView2 SDK
+-        set(WEBVIEW2_VERSION "1.0.705.50")
++        set(WEBVIEW2_VERSION "1.0.1418.22")
+         set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
+-        set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
++        set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99")
+ 
+         set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
+ 
+diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
+index 09ad8c8ef3..c228e167d7 100644
+--- a/include/wx/fontutil.h
++++ b/include/wx/fontutil.h
+@@ -294,7 +294,11 @@ public:
+     wxFontEncoding GetEncoding() const;
+ 
+     void SetPointSize(int pointsize);
+-    void SetFractionalPointSize(double pointsize);
++    void SetFractionalPointSize(double pointsize
++#if defined(__WXMSW__)
++	, const wxWindow *window = nullptr
++#endif
++	);
+     void SetPixelSize(const wxSize& pixelSize);
+     void SetStyle(wxFontStyle style);
+     void SetNumericWeight(int weight);
+@@ -307,12 +311,19 @@ public:
+ 
+     // Helper used in many ports: use the normal font size if the input is
+     // negative, as we handle -1 as meaning this for compatibility.
+-    void SetSizeOrDefault(double size)
++    void SetSizeOrDefault(double size
++#if defined(__WXMSW__)
++	, const wxWindow *window = nullptr
++#endif
++	)
+     {
+         SetFractionalPointSize
+         (
+             size < 0 ? wxNORMAL_FONT->GetFractionalPointSize()
+                      : size
++#if defined(__WXMSW__)
++            ,window
++#endif
+         );
+     }
+ 
+diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
+index e29a77627c..dc48cf9451 100644
+--- a/include/wx/gdicmn.h
++++ b/include/wx/gdicmn.h
+@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion;
+ class WXDLLIMPEXP_FWD_BASE wxString;
+ class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+ class WXDLLIMPEXP_FWD_CORE wxPoint;
++class WXDLLIMPEXP_FWD_CORE wxWindow;
+ 
+ // ---------------------------------------------------------------------------
+ // constants
+@@ -1092,7 +1093,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth();
+ 
+ // get the display size
+ extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
++extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
++extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window);
+ extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();
+diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
+index d7a3890764..e4dee51d5a 100644
+--- a/include/wx/generic/grid.h
++++ b/include/wx/generic/grid.h
+@@ -2951,9 +2951,11 @@ private:
+                          wxGridWindow* gridWindow);
+ 
+     // Update the width/height of the column/row being drag-resized.
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     void DoGridDragResize(const wxPoint& position,
+                           const wxGridOperations& oper,
+-                          wxGridWindow* gridWindow);
++                          wxGridWindow* gridWindow,
++                          CursorMode mode);
+ 
+     // process different clicks on grid cells
+     void DoGridCellLeftDown(wxMouseEvent& event,
+diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
+index 0f9768b44e..094d774918 100644
+--- a/include/wx/msw/font.h
++++ b/include/wx/msw/font.h
+@@ -23,7 +23,7 @@ public:
+     // ctors and such
+     wxFont() { }
+ 
+-    wxFont(const wxFontInfo& info);
++    wxFont(const wxFontInfo& info, const wxWindow *window = nullptr);
+ 
+     wxFont(int size,
+            wxFontFamily family,
+diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
+index 4c3be08cec..96fb378d01 100644
+--- a/include/wx/msw/tooltip.h
++++ b/include/wx/msw/tooltip.h
+@@ -91,10 +91,10 @@ private:
+     // the one and only one tooltip control we use - never access it directly
+     // but use GetToolTipCtrl() which will create it when needed
+     static WXHWND ms_hwndTT;
+-
++public:
+     // create the tooltip ctrl if it doesn't exist yet and return its HWND
+     static WXHWND GetToolTipCtrl();
+-
++private:
+     // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop
+     static void DeleteToolTipCtrl();
+ 
+diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
+index 317a0ca96f..58014ec1d4 100644
+--- a/include/wx/osx/app.h
++++ b/include/wx/osx/app.h
+@@ -161,7 +161,7 @@ private:
+ 
+ public:
+     bool                OSXInitWasCalled() { return m_inited; }
+-    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
++    virtual void        OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
+     void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
+     void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
+ #endif
+diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
+index b61aac35bf..7cfc97d2f8 100644
+--- a/src/common/combocmn.cpp
++++ b/src/common/combocmn.cpp
+@@ -2141,7 +2141,7 @@ void wxComboCtrlBase::CreatePopup()
+         #if !USES_GENERICTLW
+             m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
+         #else
+-            int tlwFlags = wxNO_BORDER;
++            int tlwFlags = wxNO_BORDER | wxSTAY_ON_TOP;
+           #ifdef wxCC_GENERIC_TLW_IS_FRAME
+             tlwFlags |= wxFRAME_NO_TASKBAR;
+           #endif
+@@ -2285,6 +2285,9 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     SetFocus();
+ 
++    //int displayIdx = wxDisplay::GetFromWindow(this);
++    //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
++
+     // Space above and below
+     int screenHeight;
+     wxPoint scrPos;
+@@ -2407,9 +2410,13 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     int showFlags = CanDeferShow;
+ 
+-    if ( spaceBelow < szp.y )
++    int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN);
++    if (// Pop up as asked for by the library user.
++        (anchorSideVertical & wxUP) ||
++        // Automatic: Pop up if it does not fit down.
++        (anchorSideVertical == 0 && spaceBelow < szp.y ))
+     {
+-        popupY = scrPos.y - szp.y;
++        popupY = scrPos.y - szp.y + displayRect.GetTop();
+         showFlags |= ShowAbove;
+     }
+ 
+diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
+index 1f5fd4d66b..14ea2f8ef1 100644
+--- a/src/common/datavcmn.cpp
++++ b/src/common/datavcmn.cpp
+@@ -1322,7 +1322,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const
+ 
+     wxDataViewItemArray selections;
+     GetSelections(selections);
+-    return selections[0];
++    // BBS
++    if (!selections.empty())
++        return selections[0];
++    else
++        return wxDataViewItem(0);
+ }
+ 
+ namespace
+diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
+index 74958fce10..59844f4526 100644
+--- a/src/common/dcbufcmn.cpp
++++ b/src/common/dcbufcmn.cpp
+@@ -82,9 +82,15 @@ private:
+         const double scale = dc ? dc->GetContentScaleFactor() : 1.0;
+         wxBitmap* const buffer = new wxBitmap;
+ 
++#if __WXMSW__
+         // we must always return a valid bitmap but creating a bitmap of
+         // size 0 would fail, so create a 1*1 bitmap in this case
+-        buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale);
++        buffer->Create(wxMax(w, 1), wxMax(h, 1), 24);
++#else
++		// we must always return a valid bitmap but creating a bitmap of
++		// size 0 would fail, so create a 1*1 bitmap in this case
++		buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale);
++#endif
+ 
+         return buffer;
+     }
+diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
+index 20442bbc73..bc2c35bee6 100644
+--- a/src/common/gdicmn.cpp
++++ b/src/common/gdicmn.cpp
+@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height)
+         *height = size.y;
+ }
+ 
++void wxDisplaySize(const wxWindow *window, int *width, int *height)
++{
++    const wxSize size = wxGetDisplaySize(window);
++    if ( width )
++        *width = size.x;
++    if ( height )
++        *height = size.y;
++}
++
+ wxSize wxGetDisplaySize()
+ {
+     return wxDisplay().GetGeometry().GetSize();
+ }
+ 
++wxSize wxGetDisplaySize(const wxWindow *window)
++{
++    return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize();
++}
++
+ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+ {
+     const wxRect rect = wxGetClientDisplayRect();
+diff --git a/src/common/image.cpp b/src/common/image.cpp
+index 78fe5b82a3..46db8722ce 100644
+--- a/src/common/image.cpp
++++ b/src/common/image.cpp
+@@ -383,11 +383,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
+                     unsigned char red = pixel[0] ;
+                     unsigned char green = pixel[1] ;
+                     unsigned char blue = pixel[2] ;
+-                    unsigned char alpha = 255  ;
+-                    if ( source_alpha )
+-                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                     if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                     {
++                        unsigned char alpha = 255  ;
++                        if ( source_alpha )
++                            alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                         if ( alpha > 0 )
+                         {
+                             avgRed += red ;
+diff --git a/src/common/intl.cpp b/src/common/intl.cpp
+index 0b0d8798f4..294f542b1f 100644
+--- a/src/common/intl.cpp
++++ b/src/common/intl.cpp
+@@ -1628,6 +1628,12 @@ GetInfoFromLCID(LCID lcid,
+             {
+                 str = buf;
+ 
++//FIXME Vojtech: We forcefully set the locales for a decimal point to "C", but this
++// is not possible for the Win32 locales, therefore there is a discrepancy.
++// It looks like we live with the discrepancy for at least half a year, so we will
++// suppress the assert until we fix Slic3r to properly switch to "C" locales just
++// for file import / export.
++#if 0
+                 // As we get our decimal point separator from Win32 and not the
+                 // CRT there is a possibility of mismatch between them and this
+                 // can easily happen if the user code called setlocale()
+@@ -1641,6 +1647,7 @@ GetInfoFromLCID(LCID lcid,
+                     "Decimal separator mismatch -- did you use setlocale()?"
+                     "If so, use wxLocale to change the locale instead."
+                 );
++#endif
+             }
+             break;
+ 
+diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
+index 41fd4524cf..f4a15cb839 100644
+--- a/src/generic/grid.cpp
++++ b/src/generic/grid.cpp
+@@ -3824,7 +3824,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event, wxGridRowLabelWindo
+             {
+                 case WXGRID_CURSOR_RESIZE_ROW:
+                 {
+-                    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++                    //BBS: add cursor mode for DoGridDragResize's paremeters
++                    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+                 }
+                 break;
+ 
+@@ -4166,7 +4167,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event, wxGridColLabelWindo
+             switch ( m_cursorMode )
+             {
+                 case WXGRID_CURSOR_RESIZE_COL:
+-                    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++                    //BBS: add cursor mode for DoGridDragResize's paremeters
++                    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+                 break;
+ 
+                 case WXGRID_CURSOR_SELECT_COL:
+@@ -4708,11 +4710,13 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event,
+             return DoGridCellDrag(event, coords, isFirstDrag);
+ 
+         case WXGRID_CURSOR_RESIZE_ROW:
+-            DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++            //BBS: add cursor mode for DoGridDragResize's paremeters
++            DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+             break;
+ 
+         case WXGRID_CURSOR_RESIZE_COL:
+-            DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++            //BBS: add cursor mode for DoGridDragResize's paremeters
++            DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+             break;
+ 
+         default:
+@@ -4803,6 +4807,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                             case wxGridSelectCells:
+                             case wxGridSelectRowsOrColumns:
+                                 // nothing to do in these cases
++                                //BBS: select this cell when first click
++                                m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event);
+                                 break;
+ 
+                             case wxGridSelectRows:
+@@ -5044,9 +5050,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG
+     }
+ }
+ 
++//BBS: add cursor mode for DoGridDragResize's paremeters
+ void wxGrid::DoGridDragResize(const wxPoint& position,
+                               const wxGridOperations& oper,
+-                              wxGridWindow* gridWindow)
++                              wxGridWindow* gridWindow,
++                              CursorMode mode)
+ {
+     // Get the logical position from the physical one we're passed.
+     const wxPoint
+@@ -5056,10 +5064,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position,
+     // orthogonal direction.
+     const int linePos = oper.Dual().Select(logicalPos);
+ 
+-    const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+-    oper.SetLineSize(this, m_dragRowOrCol,
++    //BBS: add logic for resize multiplexed cols
++    if (mode == WXGRID_CURSOR_RESIZE_COL) {
++        int col_to_resize = m_dragRowOrCol;
++        int num_rows, num_cols;
++        this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols);
++        if (num_cols < 1)
++            col_to_resize = m_dragRowOrCol - 1;
++
++        const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol);
++        const int lineSize = oper.GetLineSize(this, col_to_resize);
++        int size = linePos - lineEnd + lineSize;
++        oper.SetLineSize(this, col_to_resize,
++                     wxMax(size,
++                           oper.GetMinimalLineSize(this, col_to_resize)));
++    }
++    else {
++        const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
++
++        oper.SetLineSize(this, m_dragRowOrCol,
+                      wxMax(linePos - lineStart,
+                            oper.GetMinimalLineSize(this, m_dragRowOrCol)));
++    }
+ 
+     // TODO: generate RESIZING event, see #10754, if the size has changed.
+ }
+@@ -5082,7 +5108,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const
+ 
+ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+ 
+     SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event);
+ 
+@@ -5091,7 +5118,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin
+ 
+ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+ 
+     SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event);
+ 
+@@ -5105,9 +5133,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col)
+ 
+ void wxGrid::DoHeaderDragResizeCol(int width)
+ {
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     DoGridDragResize(GetPositionForResizeEvent(width),
+                      wxGridColumnOperations(),
+-                     m_gridWin);
++                     m_gridWin, WXGRID_CURSOR_RESIZE_COL);
+ }
+ 
+ void wxGrid::DoHeaderEndDragResizeCol(int width)
+@@ -5891,6 +5920,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
+                     DisableCellEditControl();
+ 
+                     MoveCursorDown( event.ShiftDown() );
++                    //BBS: select this cell when first click
++                    m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             event);
+                 }
+                 break;
+ 
+diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
+index 0a2d167ad7..0aeba45ea9 100644
+--- a/src/msw/bmpcbox.cpp
++++ b/src/msw/bmpcbox.cpp
+@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl()
+ 
+     wxComboBox::DoClear();
+ 
+-    HWND hwnd = GetHwnd();
++    WNDPROC wndproc_edit = nullptr;
++	WinStruct<COMBOBOXINFO> combobox_info;
++	HWND hwnd = GetHwnd();
++if (::GetComboBoxInfo(hwnd, &combobox_info))
++		wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem);
+     DissociateHandle();
+     ::DestroyWindow(hwnd);
+ 
+     if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )
+         return;
+ 
++if (::GetComboBoxInfo(GetHwnd(), &combobox_info))
++    wxSetWindowProc(combobox_info.hwndItem, wndproc_edit);
++
+     // initialize the controls contents
+     for ( i = 0; i < numItems; i++ )
+     {
+diff --git a/src/msw/font.cpp b/src/msw/font.cpp
+index 0bd240d79f..d38b1b00f5 100644
+--- a/src/msw/font.cpp
++++ b/src/msw/font.cpp
+@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;
+ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+ {
+ public:
+-    wxFontRefData(const wxFontInfo& info = wxFontInfo());
++    wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr);
+ 
+     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+     {
+@@ -324,7 +324,7 @@ protected:
+ // wxFontRefData
+ // ----------------------------------------------------------------------------
+ 
+-wxFontRefData::wxFontRefData(const wxFontInfo& info)
++wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window)
+ {
+     m_hFont = NULL;
+ 
+@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info)
+     }
+     else
+     {
+-        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize());
++        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window);
+     }
+ 
+     SetStyle(info.GetStyle());
+@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
+     return wxGetFontEncFromCharSet(lf.lfCharSet);
+ }
+ 
+-void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew)
++void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window)
+ {
+     // We don't have the correct DPI to use here, so use that of the
+     // primary screen and rely on WXAdjustToPPI() changing it later if
+     // necessary.
+-    const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
++    const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+     lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi);
+ 
+     pointSize = pointSizeNew;
+@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc)
+         (void)Create(info);
+ }
+ 
+-wxFont::wxFont(const wxFontInfo& info)
++wxFont::wxFont(const wxFontInfo& info, const wxWindow *window)
+ {
+-    m_refData = new wxFontRefData(info);
++    m_refData = new wxFontRefData(info, window);
+ }
+ 
+ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
+diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
+index 9bb397d472..30af7154a7 100644
+--- a/src/msw/menuitem.cpp
++++ b/src/msw/menuitem.cpp
+@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window)
+         // native menu uses small top margin for separator
+         if ( SeparatorMargin.cyTopHeight >= 2 )
+             SeparatorMargin.cyTopHeight -= 2;
++
++        SeparatorSize.cy = 0;
+     }
+     else
+ #endif // wxUSE_UXTHEME
+diff --git a/src/msw/window.cpp b/src/msw/window.cpp
+index eadc2f5700..f64fea4446 100644
+--- a/src/msw/window.cpp
++++ b/src/msw/window.cpp
+@@ -4773,33 +4773,49 @@ static wxSize GetWindowDPI(HWND hwnd)
+ }
+ 
+ /*extern*/
+-int wxGetSystemMetrics(int nIndex, const wxWindow* window)
++int wxGetSystemMetrics(int nIndex, const wxWindow* win)
+ {
+ #if wxUSE_DYNLIB_CLASS
+-    if ( !window )
+-        window = wxApp::GetMainTopWindow();
++    const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win;
+ 
+-    if ( window )
++    if (window)
+     {
+-        typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
+-        static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
+-        static bool s_initDone = false;
+-
+-        if ( !s_initDone )
+-        {
+-            wxLoadedDLL dllUser32("user32.dll");
+-            wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
+-            s_initDone = true;
++#if 1
++        if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) {
++            HDC hdc = GetDC(window->GetHWND());
++#if 0
++            double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES);
++            ReleaseDC(window->GetHWND(), hdc);
++            wxSize dpi = window->GetDPI();
++            dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y);
++            return int(dim + 0.5);
++#else
++            return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES));
++#endif
+         }
+-
+-        if ( s_pfnGetSystemMetricsForDpi )
++        else
++#endif
+         {
+-            const int dpi = window->GetDPI().y;
+-            return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
++            static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
++            static bool s_initDone = false;
++
++            if ( !s_initDone )
++            {
++                wxLoadedDLL dllUser32("user32.dll");
++                wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
++                s_initDone = true;
++            }
++
++            if ( s_pfnGetSystemMetricsForDpi )
++            {
++                const int dpi = window->GetDPI().y;
++                return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            }
+         }
+     }
+ #else
+-    wxUnusedVar(window);
++    wxUnusedVar(win);
+ #endif // wxUSE_DYNLIB_CLASS
+ 
+     return ::GetSystemMetrics(nIndex);
+diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
+index 6ff0cc3088..4943f3ea38 100644
+--- a/src/osx/cocoa/dataview.mm
++++ b/src/osx/cocoa/dataview.mm
+@@ -1734,12 +1734,22 @@ outlineView:(NSOutlineView*)outlineView
+         if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) )
+             [super keyDown:event];
+     }
+-    else
++    //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working.
++    else if (! implementation->DoHandleKeyEvent(event))
+     {
+         [super keyDown:event];  // all other keys
+     }
+ }
+ 
++//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl,
++// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl
++// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though.
++- (void)mouseMoved:(NSEvent *)event
++{
++if (! implementation->DoHandleMouseEvent(event))
++        [super mouseMoved:event];
++}
++
+ //
+ // contextual menus
+ //
+@@ -2672,12 +2682,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent)
+ 
+ void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+ {
+-    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point);
++    NSTableHeaderView *headerView = [m_OutlineView headerView];
++    if (headerView && point.y < headerView.visibleRect.size.height) {
++    // The point is inside the header area.
++            columnPtr = NULL;
++            item      = wxDataViewItem();
++    return;
++        }
++    // Convert from the window coordinates to the virtual scrolled view coordinates.
++    NSScrollView *scrollView = [m_OutlineView enclosingScrollView];
++    const NSRect &visibleRect = scrollView.contentView.visibleRect;
++    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),
++    wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y));
+ 
+     int indexColumn;
+     int indexRow;
+ 
+-
+     indexColumn = [m_OutlineView columnAtPoint:nativePoint];
+     indexRow    = [m_OutlineView rowAtPoint:   nativePoint];
+     if ((indexColumn >= 0) && (indexRow >= 0))
+diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
+index de5f52860c..a9581174a4 100644
+--- a/src/osx/cocoa/settings.mm
++++ b/src/osx/cocoa/settings.mm
+@@ -224,7 +224,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+ // ----------------------------------------------------------------------------
+ 
+ // Get a system metric, e.g. scrollbar size
+-int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
++int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win)
+ {
+     int value;
+ 
+@@ -259,11 +259,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN
+         // TODO case wxSYS_WINDOWMIN_Y:
+ 
+         case wxSYS_SCREEN_X:
+-            wxDisplaySize(&value, NULL);
++            wxDisplaySize(win, &value, NULL);
+             return value;
+ 
+         case wxSYS_SCREEN_Y:
+-            wxDisplaySize(NULL, &value);
++            wxDisplaySize(win, NULL, &value);
+             return value;
+ 
+         // TODO case wxSYS_FRAMESIZE_X:
+diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
+index b322e582c5..79de567333 100644
+--- a/src/osx/cocoa/window.mm
++++ b/src/osx/cocoa/window.mm
+@@ -190,6 +190,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
+ - (BOOL)isEnabled;
+ - (void)setEnabled:(BOOL)flag;
+ 
++- (BOOL)clipsToBounds;
++- (void)setClipsToBounds:(BOOL)clipsToBounds;
++
+ - (void)setImage:(NSImage *)image;
+ - (void)setControlSize:(NSControlSize)size;
+ 
+@@ -2505,6 +2508,7 @@ wxWidgetImpl( peer, flags )
+     if ( m_osxView )
+         CFRetain(m_osxView);
+     [m_osxView release];
++    m_osxView.clipsToBounds = YES;
+ }
+ 
+ 
+-- 
+2.41.0.windows.2
+

deps/wxWidgets/wxWidgets.cmake

@@ -1,13 +1,12 @@
+set(_wx_git_tag v3.1.5)
+
 set(_wx_toolkit "")
-set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(_gtk_ver 2)
-
     if (DEP_WX_GTK3)
         set(_gtk_ver 3)
     endif ()
-
     set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
 endif()
 
@@ -17,16 +16,22 @@ 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.
+if (MSVC)
+    set(_patch_cmd if not exist WXWIDGETS_PATCHED ( "${GIT_EXECUTABLE}" apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch && type nul > WXWIDGETS_PATCHED ) )
+else ()
+    set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch && touch WXWIDGETS_PATCHED)
+endif ()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch)
+endif ()
 
 orcaslicer_add_cmake_project(
     wxWidgets
-    GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
-    GIT_SHALLOW ON
-    DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${TIFF_PKG} ${JPEG_PKG}
+    GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets"
+    GIT_TAG ${_wx_git_tag}
+    PATCH_COMMAND ${_patch_cmd}
+    DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON
         ${_wx_toolkit}
@@ -39,7 +44,6 @@ 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
@@ -53,10 +57,9 @@ 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 ()

doc/Auxiliary-fan.md

@@ -1,6 +1,6 @@
 OrcaSlicer use `M106 P2` command to control auxiliary cooling fan.
 
-If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhaust fan.  
+If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhuast fan.  
 Below is a reference configuration for Klipper.   
 *Note: Don't forget to change the pin name to the actual pin name you are using in the configuration*
 

doc/Calibration.md

@@ -10,13 +10,12 @@
   1. [Max Volumetric speed](#Max-Volumetric-speed)
   2. [VFA]  
 
-**NOTE**: After completing the calibration process, remember to create a new project in order to exit the calibration mode.  
-**NOTE2**: @ItsDeidara has made a webpage to help with the calculation. Check it out if those equations give you a headache [here](https://orcalibrate.com/).
+**NOTE**: After completing the calibration process, remember to create a new project in order to exit the calibration mode.
 # Flow rate
  ##### *NOTE: For Bambulab X1/X1C users, make sure you do not select the 'Flow calibration' option.*  
  ![uncheck](https://user-images.githubusercontent.com/103989404/221345187-3c317a46-4d85-4221-99b9-adb5c7f48026.jpeg)  
 ----------------------------------------
-![flowrate](./images/flow-calibration.gif)
+![flowrate](https://user-images.githubusercontent.com/103989404/210137579-3fd141ad-f2da-4542-a1fd-fc4b4d673908.gif)
 Calibrating the flow rate involves a two-step process.  
 Steps
 1. Select the printer, filament, and process you would like to use for the test.
@@ -30,8 +29,8 @@ Steps
 6. Perform the `Pass 2` calibration. This process is similar to `Pass 1`, but a new project with ten blocks will be generated. The flow rate modifiers for this project will range from `-9 to 0`.
 7. Repeat steps 4 and 5. In this case, if your previous flow ratio was 1.029 and you selected the block with a flow rate modifier of -6, the new value should be calculated as follows: `1.029x(100-6)/100 = 0.96726`. ** Remember ** to save the filament profile.  
 ![pass2](https://user-images.githubusercontent.com/103989404/210139072-f2fa91a6-4e3b-4d2a-81f2-c50155e1ff6d.jpg)
-![-6](https://user-images.githubusercontent.com/103989404/210139131-ee224146-b242-4c1c-ac96-35ef0ca591f1.jpg)  
-![image](./images/flowcalibration_update_flowrate.jpg)  
+![-6](https://user-images.githubusercontent.com/103989404/210139131-ee224146-b242-4c1c-ac96-35ef0ca591f1.jpg)
+![image](https://user-images.githubusercontent.com/103989404/210139721-919be130-fbba-4e3a-aa58-8a563e8c7792.png)
 
 # Pressure Advance
 
@@ -79,7 +78,7 @@ The PA value for this test will be increased by 0.002 for every 1 mm increase in
 Steps:
  1. Select the printer, filament, and process you would like to use for the test.
  2. Examine each corner of the print and mark the height that yields the best overall result.
- 3. I selected a height of 8 mm for this case, so the pressure advance value should be calculated as `PressureAdvanceStart+(PressureAdvanceStep x measured)` example: `0+(0.002 x 8) = 0.016`.
+ 3. I selected a height of 8 mm for this case, so the pressure advance value should be calculated as `0.002x8 = 0.016`.
 ![tower](https://user-images.githubusercontent.com/103989404/210140231-e886b98d-280a-4464-9781-c74ed9b7d44e.jpg)
 
 ![tower_measure](https://user-images.githubusercontent.com/103989404/210140232-885b549b-e3b8-46b9-a24c-5229c9182408.jpg)

doc/Extrusion-rate-smoothing.md

@@ -1,181 +0,0 @@
-<h1>Extrusion rate smoothing</h1>
-
-Extrusion rate smoothing (ERS), also known as pressure equalizer in Prusa Slicer, aims to **limit the rate of extrusion volume change to be below a user set threshold (the ERS value).** It aims to assist the printer firmware internal motion planners, pressure advance in achieving the desired nozzle flow and reducing deviations against the ideal flow. 
-
-This happens by reducing the stresses put on the extrusion system as well as reducing the absolute deviations from the ideal extrusion flow caused by pressure advance smooth time. 
-
-This feature is especially helpful when printing at high accelerations and large flow rates as the deviations are larger in these cases.
-
-![Screenshot 2023-09-18 at 22 44 26](https://github.com/SoftFever/OrcaSlicer/assets/59056762/281b9c78-9f5c-428e-86b9-509de099a3e7)
-
-<h2>Theory</h2>
-
-Enabling this feature creates a small **speed "ramp"** by slowing down and ramping up print speeds prior to and after the features causing a sudden change in extrusion flow rate needs, such as overhangs and overhang perimeters. 
-
-This works by breaking down the printed line segments into smaller "chunks", proportional to the ERS segment length, and reduces the print speed of these segments so that the **requested extrusion volumetric flow rate change is less than or equal to the ERS threshold**.
-
-In summary, **it takes the "edge" off rapid extrusion changes caused by acceleration/deceleration as these are now spread over a longer distance and time.** Therefore, it can reduce wall artefacts that show when the print speeds change suddenly. These artefacts are occuring because the extruder and firmware cannot perfectly adhere to the requested by the slicer flow rates, especially when the extrusion rate is changing rapidly. 
-
-**The example below shows the artefact that is mitigated by ERS.**
-![ERS Disabled](https://github.com/SoftFever/OrcaSlicer/assets/59056762/31fdbf91-2067-4286-8bc1-4f7de4a628b6)
-
-The bulging visible above is due to the extruder not being able to respond fast enough against the required speed change when printing with high accelerations and high speeds and requested to slow down for an overhang. 
-
-In the above scenario, the printer (Bambu Lab X1 Carbon) was requested to slow down from a 200mm/sec print speed to 40mm/sec at an acceleration of 5k/sec2. **The extruder could not keep up with the pressure change, resulting in a slight bump ahead at the point of speed change.**
-
-This parameter interacts with the below printer kinematic settings and physical limits:
-
-
-**1. The limits of the extruder system** - how fast can it change pressure in the nozzle
-
-**2. The configured pressure advance values** - that also affect pressure changes in the nozzle
-
-**3. The acceleration profile of the printer** - higher accelerations mean higher pressure changes
-
-**4. The pressure advance smooth time (klipper)** - higher smooth time means higher deviation from ideal extrusion, hence more opportunity for this feature to be useful.
-
-
-<h3>Acceleration vs. Extrusion rate smoothing</h3>
-A printer's motion system does not exactly follow the speed changes seen in the gcode preview screen of Orca slicer. 
-
-
-When a speed change is requested, the firmware look ahead planner calculates the slow down needed to achieve the target speed. The rate of slowdown is limited by the move's acceleration value. 
-
-**Lets consider an example.** Assume printing an overhang wall with **2k external wall acceleration**, were the printer is called to slow down from **200mm/sec to 40mm/sec**.
-
-This deceleration move would happen over approximately 9.6mm. This is derived from the following equation:
-
-![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/4ba0356b-49ab-428c-ab10-f2c88bcc1bcb)
-
-![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/3958deb5-fbc3-4d07-8903-4575033717fd)
-
-The time taken to decelerate to this new speed would be approx. 0.08 seconds, derived from the following equation:
-
-![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/ea9f19b4-defe-4656-9ecc-a6576c87d8e0)
-
-A printer printing at 200mm/sec with a 0.42 line width and 0.16 layer height would be extruding plastic at approx. 12.16mm3/sec, as can also be seen from the below visual.
-
-![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/83242b26-7174-4da1-b815-d9fcec767bcd)
-
-When the printer is extruding at 40mm/sec with the same line width and layer height as above, the flow rate is 2.43mm3/sec.
-
-So what we are asking the extruder to do in this example is **slow down from 12.16mm3/sec flow to 2.43mm3/sec flow in 0.08 seconds** or an extrusion change rate of 121mm3/sec2. 
-
-**This value is proportional to the acceleration of the printer. At 4k this value doubles, at 1k it is half and is independent of the speed of movement or starting and ending speeds.**
-
-**This value is also proportional to the line width - double the line width will result in double the extrusion rate change and vice versa. Same for layer height.**
-
-So, continuing with the worked example, a 2k acceleration produces an extrusion rate change ramp of 121mm3/sec2. **Therefore, setting a value higher than this would not bring any benefit to the print quality as the motion system would slow down less aggressively based on its acceleration settings.**
-
-**Therefore, the acceleration values act as a meaningfull upper limit to this setting.** An indicative set of values has been provided later in this page.
-
-<h3>Pressure advance vs extrusion rate smoothing</h3>
-
-Then we need to consider pressure advance and smooth time as factors that influence extrusion rate.
-
-**Pressure Advance** adjusts the extruder's speed to account for the pressure changes inside the hot end’s melt zone. When the print head moves and extrudes filament, there's a delay between the movement of the extruder gear and the plastic being extruded due to the compressibility of the molten plastic in the hot end. This delay can cause too much plastic to be extruded when the print head starts moving or not enough plastic when the print head stops, leading to issues like blobbing or under-extrusion.
-
-**Pressure Advance Smooth time** helps to mitigate potential negative effects on print quality due to the rapid changes in extruder flow rate, which are controlled by the Pressure Advance algorithm. This parameter essentially adds a smoothing effect to the adjustments made by Pressure Advance, aiming to prevent sharp or sudden changes in the extrusion rate.
-
-When Pressure Advance adjusts the extruder speed to compensate for the pressure build-up or reduction in the hot end, it can lead to abrupt changes in the flow rate. These abrupt changes can potentially cause issues like:
-
-1. Extruder motor skipping,
-2. Increased wear on the extruder gear and filament,
-3. Visible artifacts on the print surface due to non-uniform extrusion.
-
-The smooth time setting introduces a controlled delay over which the Pressure Advance adjustments are spread out. This results in a more gradual application or reduction of extrusion pressure, leading to smoother transitions in filament flow. 
-
-The trade-off is extrusion accuracy. There is a deviation between the requested extrusion amount and the actual extrusion amount due to this smoothing.
-
-**1. Increasing Smooth Time:** Leads to more gradual changes in extrusion pressure. While this can reduce artifacts and stress on the extruder system, setting it too high may diminish the effectiveness of Pressure Advance, as the compensation becomes too delayed to counteract the pressure dynamics accurately.
-
-**2. Decreasing Smooth Time:** Makes the Pressure Advance adjustments more immediate, which can improve the responsiveness of pressure compensation but may also reintroduce abrupt changes in flow rate, potentially leading to the issues mentioned above.
-
-In essence, p**ressure advance smooth time creates an intentional deviation from the ideal extruder rotation** and, therefore, extrusion amount, to allow the printer's extruder to perform within its mechanical limits. Typically, this value is set to 0.04sec, which means that when Pressure Advance adjusts the extruder's flow rate to compensate for changes in pressure within the hot end, these adjustments are spread out over a period of 0.04 seconds. 
-
-There is a great example of pressure advance smooth time induced deviations [here](https://klipper.discourse.group/t/pressure-advance-smooth-time-skews-pressure-advance/13451) that is worth a read to get more insight in this trade-off.
-
-In the worked example above, **we need to set an Extrusion Rate smoothing value enough to decrease the error introduced by pressure advance smooth time against the produced output flow.** The lower the extrusion rate smoothing value, the lower the changes in flow over time hence the lower the absolute deviation from the ideal extrusion caused by the smooth time algorithm. However, going too low will result in a material decrease in overall print speed, as the print speed will be materially reduced to achieve low extrusion deviations between features, for no real benefit after a point.
-
-**The best way to find what the lower beneficial limit is through experimentation.** Print an object with sharp overhangs that are slowed down because off the overhang print speed settings and observe for extrusion inconsistencies. 
-
-<h2>Finding the ideal Extrusion Rate smoothing value</h2>
-
-**Firstly, this value needs to be lower than the extrusion rate changes resulting from the acceleration profile of the printer.** As, generally, the greatest impact is in external wall finish, use your external perimeter acceleration as a point of reference. 
-
-**Below are some approximate ERS values for 0.42 line width and 0.16 layer height.**
-1. 30mm3/sec for 0.5k acceleration
-2. 60.5mm3/sec for 1k acceleration
-3. 121mm3/sec2 for 2k acceleration
-4. 242mm3/sec2 for 4k acceleration
-
-**Below are some approximate ERS values for 0.42 line width and 0.20 layer height.**
-1. 38mm3/sec for 0.5k acceleration
-2. 76mm3/sec for 1k acceleration
-3. 150mm3/sec2 for 2k acceleration
-4. 300mm3/sec2 for 4k acceleration
-
-**Below are some approximate ERS values for 0.45 line width and 0.16 layer height.**
-1. 32mm3/sec for 0.5k acceleration
-2. 65mm3/sec for 1k acceleration
-3. 129mm3/sec2 for 2k acceleration
-4. 260mm3/sec2 for 4k acceleration
-
-**So, your tuning starting point needs to be an ERS value that is less than this.** A good point experiment with test prints would be **a value of 60-80%** of the above maximum values. This will give some meaningful assistance to pressure advance, reducing the deviation introduced by pressure advance smooth time. The greater the smooth time, the greater the quality benefit will be.
-
-Therefore, for a **0.42 line width and 0.16 layer height**, the below are a recommended set of starting ERS values
-1. 18-25mm3/sec for 0.5k acceleration
-2. 35-50mm3/sec for 1k acceleration
-3. 70-100mm3/sec2 for 2k acceleration
-4. 145-200mm3/sec2 for 4k acceleration
-
-If you are printing with a 0.2 layer height, you can increase these values by 25% and similarly reduce if printing with lower.
-
-**The second factor is your extruder's mechanical abilities.** Direct drive extruders with a good grip on the filament typically are more responsive to extrusion rate changes. Similarly with stiff filaments. So, a Bowden printer or when printing softer material like TPU or soft PLAs like polyterra there is more opportunity for the extruder to slip or deviate from the desired extrusion amount due to mechanical grip or material deformation or just delay in propagating the pressure changes (in a Bowden setup).
-
-**The final factor is the deviation introduced by pressure advance smooth time**, or equivalents in closed source firmware. The higher this value the larger the extrusion deviation from ideal. If you are using a direct drive extruder, reduce this value to 0.02 in your klipper firmware before tuning ERS, as a lower value results in lower deviations to mitigate. Then proceed to experimentaly tune ERS. 
-
-**So where does that leave us?**
-
-Perform a test print with the above ERS settings as a starting point and adjust to your liking! If you notice budging on sharp overhangs where speed changes, like the hull of the benchy, reduce this value by 10% and try again. 
-
-If you're not noticing any artefacts, increase by 10%, but don’t go over the maximum values recommended above because then this feature would have no effect in your print.
-
-<h2>A note for Bowden printers using marlin without pressure advance. </h2>
-If your printer is not equipped with pressure advance and, especially, if you are using a Bowden setup, you don’t have the benefit of pressure advance dynamically adjusting your flow. 
-
-
-In this special case, ERS will be doing all the heavy lifting that pressure advance would typically perform. In this scenario a low value of 8-10mm3/sec is usually recommended, irrespective of your acceleration settings, to smooth out pressure changes in the extrusion system as much as possible without impacting print speed too much. 
-
-<h2>A note on ERS Segment length </h2>
-Ideally you want this value set to 1 to allow for the largest number of steps between each speed transition. However, this may result in a too large of a gcode, with too many commands sent to your MCU per second and it may not be able to keep up. It will also slow down the Orca slicer front end as the sliced model is more complex to render.
-
-
-For Klipper printers, a segment length of 1 works OK as the RPI or similar have enough computational power to handle the gcode command volume. 
-
-Similarly, for a Bambu lab printer, a segment length of 1 works well. **However, if you do notice your printer stuttering or stalling** (which may be the case with the lower powered P1 series printers) **or getting "Timer too close" errors** in Klipper, **increase this value to 2 or 3**. This would reduce the effectiveness of the setting but will present a more manageable load to your printer.
-
-<h2>Limitations</h2>
-
-**This feature can only work where speed changes are induced by the slicer** - for example when transitioning from fast to slow print moves when printing overhangs, bridges and from printing internal features to external features and vice versa. 
-
-However, it will not affect extruder behaviour when the printer is slowing down due to firmware commands - for example when turning around corners. 
-
-In this case, the printer slows down and then accelerates independently of what the slicer has requested. In this case, the slicer is commanding a consistent speed; however, the printer is adjusting this to operate within its printer kinematic limits (SCV/Jerk) and accelerations. As the slicer is not aware of this slow down, it cannot apply pre-emptive extrusion rate smoothing to the feature and instead, the changes are governed by the printer firmware exclusively.
-
-<h2>Credits</h2>
-
-**Original feature authors and creators:** The Prusa Slicer team, including [@bubnikv](https://github.com/bubnikv), [@hejllukas](https://github.com/hejllukas)
-
-**Enhanced by:** [@MGunlogson](https://github.com/MGunlogson), introducing the feature to external perimeters, enhancing it by taking into account travel, retraction and implementing near-contiguous extrusions pressure equalizer adjustments.
-
-**Ported to Orca:** [@igiannakas](https://github.com/igiannakas)
-
-**Enhanced by:** [@noisyfox](https://github.com/Noisyfox), per object pressure equalization and fixing calculation logic bugs
-
-**Wiki page:** [@igiannakas](https://github.com/igiannakas)
-
-**Overall Orca owner and assurance:** [@softfever](https://github.com/SoftFever)
-
-**Community testing and feedback:** [@HakunMatat4](https://github.com/HakunMatat4), [@psiberfunk](https://github.com/psiberfunk), [@u3dreal](https://github.com/u3dreal) and more
-

doc/Seam.md

@@ -1,8 +1,5 @@
 WIP...
 
-### Scarf joint seam
-WIP...
-
 ### Seam gap
 ![image](https://user-images.githubusercontent.com/103989404/215331359-236874c9-ca91-4dd4-b969-3cefc70ebe1b.png)
 

doc/adaptive-bed-mesh.md

@@ -1,44 +0,0 @@
-# Adaptive Bed Mesh Support
-Orca Slicer introduces comprehensive support for adaptive bed meshing across a variety of firmware, including Marlin, Klipper, and RepRapFirmware (RRF).   
-This feature allows users to seamlessly integrate adaptive bed mesh commands within the Machine Start G-code.  
-The implementation is designed to be straightforward, requiring no additional plugins or alterations to firmware settings, thereby enhancing user experience and print quality directly from Orca Slicer.
-
-
-![Screenshot 2024-02-24 104601](https://github.com/SoftFever/OrcaSlicer/assets/103989404/8ab1f26f-987d-4419-942f-b1384270a164)  
-
-## Settings in Orca Slicer:
-`Bed mesh min`: This option sets the min point for the allowed bed mesh area. Due to the probe's XY offset, most printers are unable to probe the entire bed. To ensure the probe point does not go outside the bed area, the minimum and maximum points of the bed mesh should be set appropriately. OrcaSlicer ensures that adaptive_bed_mesh_min/adaptive_bed_mesh_max values do not exceed these min/max points. This information can usually be obtained from your printer manufacturer. The default setting is (-99999, -99999), which means there are no limits, thus allowing probing across the entire bed.
-
-`Bed mesh max`: This option sets the max point for the allowed bed mesh area. Due to the probe's XY offset, most printers are unable to probe the entire bed. To ensure the probe point does not go outside the bed area, the minimum and maximum points of the bed mesh should be set appropriately. OrcaSlicer ensures that adaptive_bed_mesh_min/adaptive_bed_mesh_max values do not exceed these min/max points. This information can usually be obtained from your printer manufacturer. The default setting is (99999, 99999), which means there are no limits, thus allowing probing across the entire bed.
-
-`Probe point distance`: This option sets the preferred distance between probe points (grid size) for the X and Y directions, with the default being 50mm for both X and Y.
-
-`Mesh margin`: This option determines the additional distance by which the adaptive bed mesh area should be expanded in the XY directions. Note for Klipper users: Orca Slicer will adjust adaptive bed mesh area according to the margin. It is recommended to set the margin to 0 in Klipper config or pass 0 when calling BED_MESH_CALIBRATE command(please refer to the example below).
-
-## Available g-code variables for Adaptive Bed Mesh Command  
-`bed_mesh_probe_count`: Represents the probe count in the X and Y directions. This value is calculated based on the size of the adaptive bed mesh area and the distance between probe points.
-
-`adaptive_bed_mesh_min`: Specifies the minimum coordinates of the adaptive bed mesh area, defining the starting point of the mesh.
-
-`adaptive_bed_mesh_max`: Determines the maximum coordinates of the adaptive bed mesh area, indicating the endpoint of the mesh.
-
-`ALGORITHM`: Identifies the algorithm used for adaptive bed mesh interpolation. This variable is useful for Klipper users. If bed_mesh_probe_count is less than 4, the algorithm is set to `lagrange`. Otherwise, it is set to `bicubic`. 
-
-## Example of Adaptive Bed Mesh usage in Orca Slicer:  
-
-### Marlin:
-```
-; Marlin don't support speicify the probe count yet, so we only specify the probe area
-G29 L{adaptive_bed_mesh_min[0]} R{adaptive_bed_mesh_max[0]} F{adaptive_bed_mesh_min[1]} B{adaptive_bed_mesh_max[1]} T V4
-```
-### Klipper:
-```
-; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally
-; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic
-BED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0
-```
-### RRF:
-```
-M557 X{adaptive_bed_mesh_min[0]}:{adaptive_bed_mesh_max[0]} Y{adaptive_bed_mesh_min[1]}:{adaptive_bed_mesh_max[1]} P{bed_mesh_probe_count[0]}:{bed_mesh_probe_count[1]}  
-```  
-![Screenshot 2024-02-24 104759](https://github.com/SoftFever/OrcaSlicer/assets/103989404/ad4a8020-bec6-4361-abb9-4017ca77471f)

doc/air-filtration.md

@@ -1,6 +1,6 @@
-OrcaSlicer use `M106 P3` command to control air-filtration/exhaust fan.
+OrcaSlicer use `M106 P3` command to control air-filtration/exhuast fan.
 
-If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhaust fan.  
+If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhuast fan.  
 Below is a reference configuration for Klipper.   
 *Note: Don't forget to change the pin name to the actual pin name you are using in the configuration*
 

doc/bed-types.md

@@ -1,27 +0,0 @@
-# Multiple bed types
-
-You can enable it in printer settings.
-
-
-Once enabled, you can select the bed type in the drop-down menu, corresponding bed temperature will be set automatically.  
-You can set the bed temperature for each bed type in the filament settings as demonstrated in the following image.  
-![multi_bed](./images/bed-types.gif)  
-
-
-Orca also support `curr_bed_type` variable in custom G-code. 
-For example, the following sample G-codes can detect the selected bed type and adjust the G-code offset accordingly for Klipper:  
-```
-{if curr_bed_type=="Textured PEI Plate"}
-  SET_GCODE_OFFSET Z=-0.05
-{else}
-  SET_GCODE_OFFSET Z=0.0
-{endif}
-```
-
-available bed types are:
-```
-"Cool Plate"
-"Engineering Plate"
-"High Temp Plate"
-"Textured PEI Plate"
-```

flatpak/.gitignore

@@ -1,2 +0,0 @@
-builddir
-.flatpak-builder

flatpak/README.md

@@ -1,3 +0,0 @@
-# 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.

flatpak/entrypoint

@@ -1,15 +0,0 @@
-#!/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) &

flatpak/io.github.softfever.OrcaSlicer.metainfo.xml

@@ -1,48 +0,0 @@
-<?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>

flatpak/io.github.softfever.OrcaSlicer.yml

@@ -1,344 +0,0 @@
-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

flatpak/set-dark-theme-variant.py

@@ -1,85 +0,0 @@
-#!/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

flatpak/umount

@@ -1,10 +0,0 @@
-#!/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
-

linux.d/README.md

@@ -1,3 +0,0 @@
-Files in this directory are named for the **exact** output of `awk -F= '/^ID=/ {print $2}' /etc/os-release` for their respective distribution.
-
-When `BuildLinux.sh` is executed, the respective file for the distribution will be sourced so the distribution specific instructions/logic are used.

linux.d/arch

@@ -1,44 +0,0 @@
-# these are the Arch Linux specific build functions
-FOUND_GTK3=$(pacman -Q gtk3)
-
-# Addtional Dev packages for OrcaSlicer
-export REQUIRED_DEV_PACKAGES=(
-    cmake
-    curl
-    dbus
-    eglexternalplatform
-    extra-cmake-modules
-    file
-    gettext
-    git
-    glew
-    gstreamer
-    gstreamermm
-    gtk3
-    libmspack
-    libsecret
-    mesa
-    ninja
-    openssl
-    texinfo
-    wayland-protocols
-    webkit2gtk
-    wget
-)
-
-if [[ -n "$UPDATE_LIB" ]]
-then
-    echo -n -e "Updating linux ...\n"
-    NEEDED_PKGS=""
-    for PKG in ${REQUIRED_DEV_PACKAGES[@]}; do
-        pacman -Q ${PKG} > /dev/null || NEEDED_PKGS+=" ${PKG}"
-    done
-
-    if [ -n "${NEEDED_PKGS}" ]; then
-        sudo pacman -Syy --noconfirm ${NEEDED_PKGS}
-    fi
-    echo -e "done\n"
-    exit 0
-fi
-
-FOUND_GTK3_DEV=${FOUND_GTK3}

linux.d/debian

@@ -1,51 +0,0 @@
-FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
-
-REQUIRED_DEV_PACKAGES=(
-    autoconf
-    build-essential
-    cmake
-    eglexternalplatform-dev
-    extra-cmake-modules
-    file
-    gettext
-    git
-    libcurl4-openssl-dev
-    libdbus-1-dev
-    libglew-dev
-    libgstreamerd-3-dev
-    libgtk-3-dev
-    libmspack-dev
-    libosmesa6-dev
-    libsecret-1-dev
-    libssl-dev
-    libtool
-    libudev-dev
-    libwebkit2gtk-4.0-dev
-    ninja-build
-    texinfo
-    wget
-)
-
-if [[ -n "$UPDATE_LIB" ]]
-then
-    # for ubuntu 22+ and 23+:
-    ubu_major_version="$(grep VERSION_ID /etc/os-release | cut -d "=" -f 2 | cut -d "." -f 1 | tr -d /\"/)"
-    if [ $ubu_major_version == "22" ] || [ $ubu_major_version == "23" ]
-    then
-        REQUIRED_DEV_PACKAGES+=(curl libfuse-dev libssl-dev libcurl4-openssl-dev m4)
-    fi
-    if [[ -n "$BUILD_DEBUG" ]]
-    then
-        REQUIRED_DEV_PACKAGES+=(libssl-dev libcurl4-openssl-dev)
-    fi
-    # TODO: optimize this by checking which, if any, packages are already installed
-
-    # install them all at once
-    sudo apt update
-    sudo apt install -y ${REQUIRED_DEV_PACKAGES[@]}
-
-    echo -e "done\n"
-    exit 0
-fi
-
-FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')

linux.d/fedora

@@ -1,48 +0,0 @@
-FOUND_GTK3=$(rpm -qa | grep -P '^gtk3' || true)
-
-REQUIRED_DEV_PACKAGES=(
-    autoconf
-    automake
-    cmake
-    dbus-devel
-    eglexternalplatform-devel
-    extra-cmake-modules
-    file
-    gcc
-    gcc-c++
-    gettext
-    git
-    gstreamer1-devel
-    gstreamermm-devel
-    gtk3-devel
-    libmspack-devel
-    libsecret-devel
-    libtool
-    m4
-    mesa-libGLU-devel
-    mesa-libOSMesa-devel
-    ninja-build
-    openssl-devel
-    perl-FindBin
-    texinfo
-    wayland-protocols-devel
-    webkit2gtk4.0-devel
-    wget
-    libcurl-devel
-)
-
-if [[ -n "$UPDATE_LIB" ]]
-then
-    NEEDED_PKGS=""
-    for PKG in ${REQUIRED_DEV_PACKAGES[@]}; do
-        rpm -q ${PKG} > /dev/null || NEEDED_PKGS+=" ${PKG}"
-    done
-
-    if [ -n "${NEEDED_PKGS}" ]; then
-        sudo dnf install -y ${NEEDED_PKGS}
-    fi
-    echo -e "done\n"
-    exit 0
-fi
-
-FOUND_GTK3_DEV=$(rpm -qa | grep -P '^gtk3-devel' || true)

localazy.json

@@ -68,11 +68,6 @@
 				"type": "po",
 				"pattern": "localization/i18n/tr/OrcaSlicer_tr.po",
 				"lang": "tr"
-			},
-			{
-				"type": "po",
-				"pattern": "localization/i18n/tr/OrcaSlicer_pl.po",
-				"lang": "pl"
 			}
 		]
 	},

localization/i18n/list.txt

@@ -53,17 +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
 src/slic3r/GUI/DeviceManager.cpp
 src/slic3r/GUI/ExtraRenderers.cpp
-src/slic3r/GUI/EditGCodeDialog.cpp
 src/slic3r/GUI/Field.cpp
 src/slic3r/GUI/GCodeViewer.cpp
 src/slic3r/GUI/GLCanvas3D.cpp
@@ -110,10 +104,8 @@ 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
@@ -165,10 +157,4 @@ src/slic3r/Utils/Duet.cpp
 src/slic3r/Utils/FlashAir.cpp
 src/slic3r/Utils/MKS.cpp
 src/slic3r/Utils/OctoPrint.cpp
-src/slic3r/Utils/Repetier.cpp
-src/slic3r/Utils/ProfileDescription.hpp
-src/slic3r/Utils/Obico.cpp
-src/slic3r/Utils/SimplyPrint.cpp
-src/slic3r/Utils/Flashforge.cpp
-src/slic3r/GUI/Jobs/OAuthJob.cpp
-src/slic3r/GUI/BackgroundSlicingProcess.cpp
+src/slic3r/Utils/Repetier.cpp