3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 07:56:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feature/fix more colors (#193)

Browse source 
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
SoftFever 2023-01-18 23:06:39 +08:00 • committed by GitHub
parent 948dee01ec
commit 1bdedb1c47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 167 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
name: Build Linux name: Build Linux
on: [push, pull_request] on: [pull_request]
jobs: jobs:
appimage-builder: appimage-builder:

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

@ -1,6 +1,6 @@
name: Build Mac arm64 name: Build Mac arm64
on: [pull_request, push] on: [pull_request]
jobs: jobs:
build_win64: build_win64:

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

@ -1,6 +1,6 @@
name: Build Mac x64 name: Build Mac x64
on: [pull_request, push] on: [pull_request]
jobs: jobs:
build_win64: build_win64:

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

@ -1,6 +1,6 @@
name: Build Win64 name: Build Win64
on: [pull_request,push] on: [pull_request]
jobs: jobs:
build_win64: build_win64:
@ -10,37 +10,37 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
# - name: Install perl - name: Install perl
# run: | run: |
# choco install strawberryperl choco install strawberryperl
- run: mkdir ${{ github.workspace }}/deps/build - run: mkdir ${{ github.workspace }}/deps/build
- run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep - run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep
- name: download deps # - name: download deps
shell: powershell # shell: powershell
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep.zip", "$env:temp\BambuStudio_dep.zip")' # run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep.zip", "$env:temp\BambuStudio_dep.zip")'
- name: extract deps # - name: extract deps
working-directory: ${{ github.workspace }}/deps/build # working-directory: ${{ github.workspace }}/deps/build
shell: cmd # shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep.zip' # run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep.zip'
- run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep" # - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep"
# - name: build deps - name: build deps
# id: cache_deps id: cache_deps
# uses: actions/cache@v3 uses: actions/cache@v3
# env: env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps cache-name: ${{ runner.os }}-cache-bambustudio_deps
# with: with:
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep path: ${{ github.workspace }}/deps/build/BambuStudio_dep
# key: ${{ runner.os }}-build-${{ env.cache-name }} key: ${{ runner.os }}-build-${{ env.cache-name }}
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }} - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
# name: build deps name: build deps
# working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
# continue-on-error: true continue-on-error: true
# run: .\build_release.bat deps run: .\build_release.bat deps
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force
- name: Build studio - name: Build studio
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}

BIN
resources/images/BambuStudio-mac_256px.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Before After
Before After

2
resources/images/check_half_focused.svg
View file

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="1" y="1" width="16" height="16" rx="1" fill="#37EE7C"/> <rect x="1" y="1" width="16" height="16" rx="1" fill="#4db6ac"/>
<path d="M4 9L14 9" stroke="white" stroke-linecap="round"/> <path d="M4 9L14 9" stroke="white" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

Before After
Before After

2
resources/images/check_on_focused.svg
View file

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="1" y="1" width="16" height="16" rx="1" fill="#37EE7C"/> <rect x="1" y="1" width="16" height="16" rx="1" fill="#4db6ac"/>
<path d="M4.35537 8.5374L8.30284 11.9361C8.71855 12.294 9.34501 12.2502 9.70687 11.838L14.8175 6.01521" stroke="white" stroke-width="1.2" stroke-linecap="round"/> <path d="M4.35537 8.5374L8.30284 11.9361C8.71855 12.294 9.34501 12.2502 9.70687 11.838L14.8175 6.01521" stroke="white" stroke-width="1.2" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 331 B

Before After
Before After

8
resources/images/compare.svg
View file

@ -1,6 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.87009 2.23001C6.33009 0.690012 3.83009 0.690012 2.28009 2.23001C0.730091 3.77001 0.740091 6.27001 2.28009 7.82001C3.71009 9.25001 5.97009 9.35001 7.52009 8.13001L8.85009 9.46001C8.85009 9.46001 8.52009 9.79001 8.85009 10.12C9.18009 10.45 12.1401 13.41 12.1401 13.41C12.1401 13.41 12.4701 13.74 12.8001 13.41C13.1301 13.08 13.4601 12.75 13.4601 12.75C13.4601 12.75 13.7901 12.42 13.4601 12.09C13.1301 11.76 10.1701 8.80001 10.1701 8.80001C9.84009 8.47001 9.51009 8.80001 9.51009 8.80001L8.18009 7.47001C9.41009 5.92001 9.30009 3.67001 7.87009 2.23001ZM7.52009 7.47001C6.17009 8.82001 3.98009 8.82001 2.63009 7.47001C1.28009 6.12001 1.28009 3.93001 2.63009 2.58001C3.98009 1.23001 6.17009 1.23001 7.52009 2.58001C8.87009 3.93001 8.87009 6.12001 7.52009 7.47001Z" fill="#73CA94"/> <path d="M7.87009 2.23001C6.33009 0.690012 3.83009 0.690012 2.28009 2.23001C0.730091 3.77001 0.740091 6.27001 2.28009 7.82001C3.71009 9.25001 5.97009 9.35001 7.52009 8.13001L8.85009 9.46001C8.85009 9.46001 8.52009 9.79001 8.85009 10.12C9.18009 10.45 12.1401 13.41 12.1401 13.41C12.1401 13.41 12.4701 13.74 12.8001 13.41C13.1301 13.08 13.4601 12.75 13.4601 12.75C13.4601 12.75 13.7901 12.42 13.4601 12.09C13.1301 11.76 10.1701 8.80001 10.1701 8.80001C9.84009 8.47001 9.51009 8.80001 9.51009 8.80001L8.18009 7.47001C9.41009 5.92001 9.30009 3.67001 7.87009 2.23001ZM7.52009 7.47001C6.17009 8.82001 3.98009 8.82001 2.63009 7.47001C1.28009 6.12001 1.28009 3.93001 2.63009 2.58001C3.98009 1.23001 6.17009 1.23001 7.52009 2.58001C8.87009 3.93001 8.87009 6.12001 7.52009 7.47001Z" fill="#4DB6AC"/>
<path d="M7.49016 4.34999C7.43016 4.15999 7.36016 3.96999 7.26016 3.79999L7.44016 3.25999L6.85016 2.66999L6.31016 2.84999C6.14016 2.74999 5.95016 2.67999 5.75016 2.61999L5.50016 2.10999H4.66016L4.41016 2.61999C4.21016 2.66999 4.03016 2.74999 3.85016 2.84999L3.31016 2.66999L2.72016 3.25999L2.90016 3.79999C2.80016 3.96999 2.72016 4.15999 2.67016 4.34999L2.16016 4.60999V5.43999L2.67016 5.69999C2.72016 5.89999 2.80016 6.07999 2.90016 6.25999L2.72016 6.79999L3.31016 7.38999L3.85016 7.20999C4.02016 7.30999 4.21016 7.37999 4.41016 7.43999L4.67016 7.94999H5.50016L5.76016 7.43999C5.96016 7.38999 6.14016 7.30999 6.32016 7.20999L6.86016 7.38999L7.44016 6.79999L7.26016 6.25999C7.36016 6.07999 7.43016 5.89999 7.49016 5.69999L8.00016 5.44999V4.60999L7.49016 4.34999ZM5.08016 6.32999C4.36016 6.32999 3.78016 5.74999 3.78016 5.02999C3.78016 4.30999 4.36016 3.72999 5.08016 3.72999C5.80016 3.72999 6.38016 4.30999 6.38016 5.02999C6.38016 5.74999 5.80016 6.32999 5.08016 6.32999Z" fill="#73CA94"/> <path d="M7.49016 4.34999C7.43016 4.15999 7.36016 3.96999 7.26016 3.79999L7.44016 3.25999L6.85016 2.66999L6.31016 2.84999C6.14016 2.74999 5.95016 2.67999 5.75016 2.61999L5.50016 2.10999H4.66016L4.41016 2.61999C4.21016 2.66999 4.03016 2.74999 3.85016 2.84999L3.31016 2.66999L2.72016 3.25999L2.90016 3.79999C2.80016 3.96999 2.72016 4.15999 2.67016 4.34999L2.16016 4.60999V5.43999L2.67016 5.69999C2.72016 5.89999 2.80016 6.07999 2.90016 6.25999L2.72016 6.79999L3.31016 7.38999L3.85016 7.20999C4.02016 7.30999 4.21016 7.37999 4.41016 7.43999L4.67016 7.94999H5.50016L5.76016 7.43999C5.96016 7.38999 6.14016 7.30999 6.32016 7.20999L6.86016 7.38999L7.44016 6.79999L7.26016 6.25999C7.36016 6.07999 7.43016 5.89999 7.49016 5.69999L8.00016 5.44999V4.60999L7.49016 4.34999ZM5.08016 6.32999C4.36016 6.32999 3.78016 5.74999 3.78016 5.02999C3.78016 4.30999 4.36016 3.72999 5.08016 3.72999C5.80016 3.72999 6.38016 4.30999 6.38016 5.02999C6.38016 5.74999 5.80016 6.32999 5.08016 6.32999Z" fill="#4DB6AC"/>
<path d="M14.56 4.45001C14.51 4.28001 14.45 4.12001 14.36 3.97001L14.51 3.51001L14 3.00001L13.54 3.15001C13.39 3.07001 13.23 3.00001 13.06 2.95001L12.84 2.51001H12.13L11.91 2.95001C11.74 3.00001 11.58 3.06001 11.43 3.15001L10.97 3.00001L10.46 3.51001L10.61 3.97001C10.53 4.12001 10.46 4.28001 10.41 4.45001L10 4.67001V5.38001L10.44 5.60001C10.49 5.77001 10.55 5.93001 10.64 6.08001L10.49 6.54001L11 7.05001L11.46 6.90001C11.61 6.98001 11.77 7.05001 11.94 7.10001L12.16 7.54001H12.87L13.09 7.10001C13.26 7.05001 13.42 6.99001 13.57 6.90001L14.03 7.05001L14.54 6.54001L14.39 6.08001C14.47 5.93001 14.54 5.77001 14.59 5.60001L15 5.39001V4.67001L14.56 4.45001ZM12.5 6.14001C11.88 6.14001 11.39 5.64001 11.39 5.03001C11.39 4.41001 11.89 3.92001 12.5 3.92001C13.11 3.92001 13.61 4.42001 13.61 5.03001C13.61 5.64001 13.11 6.14001 12.5 6.14001Z" fill="#73CA94"/> <path d="M14.56 4.45001C14.51 4.28001 14.45 4.12001 14.36 3.97001L14.51 3.51001L14 3.00001L13.54 3.15001C13.39 3.07001 13.23 3.00001 13.06 2.95001L12.84 2.51001H12.13L11.91 2.95001C11.74 3.00001 11.58 3.06001 11.43 3.15001L10.97 3.00001L10.46 3.51001L10.61 3.97001C10.53 4.12001 10.46 4.28001 10.41 4.45001L10 4.67001V5.38001L10.44 5.60001C10.49 5.77001 10.55 5.93001 10.64 6.08001L10.49 6.54001L11 7.05001L11.46 6.90001C11.61 6.98001 11.77 7.05001 11.94 7.10001L12.16 7.54001H12.87L13.09 7.10001C13.26 7.05001 13.42 6.99001 13.57 6.90001L14.03 7.05001L14.54 6.54001L14.39 6.08001C14.47 5.93001 14.54 5.77001 14.59 5.60001L15 5.39001V4.67001L14.56 4.45001ZM12.5 6.14001C11.88 6.14001 11.39 5.64001 11.39 5.03001C11.39 4.41001 11.89 3.92001 12.5 3.92001C13.11 3.92001 13.61 4.42001 13.61 5.03001C13.61 5.64001 13.11 6.14001 12.5 6.14001Z" fill="#4DB6AC"/>
<path d="M7.14006 11.91C7.09006 11.74 7.03006 11.58 6.94006 11.43L7.09006 10.97L6.58006 10.46L6.12006 10.61C5.97006 10.53 5.81006 10.46 5.64006 10.41L5.44006 9.98999H4.72006L4.50006 10.43C4.33006 10.48 4.17006 10.54 4.02006 10.63L3.56006 10.48L3.05006 10.99L3.20006 11.45C3.12006 11.6 3.05006 11.76 3.00006 11.93L2.56006 12.15V12.86L3.00006 13.08C3.05006 13.25 3.11006 13.41 3.20006 13.56L3.06006 14L3.57006 14.51L4.03006 14.36C4.18006 14.44 4.34006 14.51 4.51006 14.56L4.73006 15H5.44006L5.66006 14.56C5.83006 14.51 5.99006 14.45 6.14006 14.36L6.60006 14.51L7.10006 14L6.95006 13.54C7.03006 13.39 7.10006 13.23 7.15006 13.06L7.59006 12.84V12.13L7.14006 11.91ZM5.08006 13.6C4.46006 13.6 3.97006 13.1 3.97006 12.49C3.97006 11.87 4.47006 11.38 5.08006 11.38C5.69006 11.38 6.19006 11.88 6.19006 12.49C6.19006 13.11 5.69006 13.6 5.08006 13.6Z" fill="#73CA94"/> <path d="M7.14006 11.91C7.09006 11.74 7.03006 11.58 6.94006 11.43L7.09006 10.97L6.58006 10.46L6.12006 10.61C5.97006 10.53 5.81006 10.46 5.64006 10.41L5.44006 9.98999H4.72006L4.50006 10.43C4.33006 10.48 4.17006 10.54 4.02006 10.63L3.56006 10.48L3.05006 10.99L3.20006 11.45C3.12006 11.6 3.05006 11.76 3.00006 11.93L2.56006 12.15V12.86L3.00006 13.08C3.05006 13.25 3.11006 13.41 3.20006 13.56L3.06006 14L3.57006 14.51L4.03006 14.36C4.18006 14.44 4.34006 14.51 4.51006 14.56L4.73006 15H5.44006L5.66006 14.56C5.83006 14.51 5.99006 14.45 6.14006 14.36L6.60006 14.51L7.10006 14L6.95006 13.54C7.03006 13.39 7.10006 13.23 7.15006 13.06L7.59006 12.84V12.13L7.14006 11.91ZM5.08006 13.6C4.46006 13.6 3.97006 13.1 3.97006 12.49C3.97006 11.87 4.47006 11.38 5.08006 11.38C5.69006 11.38 6.19006 11.88 6.19006 12.49C6.19006 13.11 5.69006 13.6 5.08006 13.6Z" fill="#4DB6AC"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before After
Before After

2
resources/images/edit_button.svg
View file

@ -1,4 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M38.2923 1.34808L38.2441 1.30417C37.3235 0.463194 36.1301 0 34.8837 0C33.4864 0 32.1449 0.591489 31.2029 1.62267L13.3916 21.1224C13.2293 21.3002 13.1061 21.5099 13.03 21.7381L10.9357 28.0167C10.6935 28.7426 10.815 29.5453 11.2607 30.164C11.7099 30.7875 12.4336 31.1598 13.1967 31.1598H13.1968C13.5269 31.1598 13.8495 31.0919 14.1555 30.958L20.2195 28.3052C20.44 28.2087 20.6377 28.0671 20.8 27.8894L38.6114 8.38977C40.4648 6.36078 40.3219 3.20211 38.2923 1.34808ZM14.9484 26.8569L16.1773 23.1726L16.281 23.0591L18.6102 25.1866L18.5066 25.3001L14.9484 26.8569ZM36.0718 6.07002L20.93 22.6472L18.6007 20.5197L33.7426 3.94242C34.0387 3.61819 34.444 3.43956 34.8838 3.43956C35.2696 3.43956 35.6391 3.5831 35.9251 3.84428L35.9731 3.88819C36.6019 4.46248 36.6461 5.44127 36.0718 6.07002V6.07002Z" fill="#73CA94"/> <path d="M38.2923 1.34808L38.2441 1.30417C37.3235 0.463194 36.1301 0 34.8837 0C33.4864 0 32.1449 0.591489 31.2029 1.62267L13.3916 21.1224C13.2293 21.3002 13.1061 21.5099 13.03 21.7381L10.9357 28.0167C10.6935 28.7426 10.815 29.5453 11.2607 30.164C11.7099 30.7875 12.4336 31.1598 13.1967 31.1598H13.1968C13.5269 31.1598 13.8495 31.0919 14.1555 30.958L20.2195 28.3052C20.44 28.2087 20.6377 28.0671 20.8 27.8894L38.6114 8.38977C40.4648 6.36078 40.3219 3.20211 38.2923 1.34808ZM14.9484 26.8569L16.1773 23.1726L16.281 23.0591L18.6102 25.1866L18.5066 25.3001L14.9484 26.8569ZM36.0718 6.07002L20.93 22.6472L18.6007 20.5197L33.7426 3.94242C34.0387 3.61819 34.444 3.43956 34.8838 3.43956C35.2696 3.43956 35.6391 3.5831 35.9251 3.84428L35.9731 3.88819C36.6019 4.46248 36.6461 5.44127 36.0718 6.07002V6.07002Z" fill="#4DB6AC"/>
<path d="M34.8369 15.8664C33.8871 15.8664 33.1171 16.6364 33.1171 17.5862V32.1868C33.1171 34.5984 31.155 36.5604 28.7435 36.5604H7.89985C5.48815 36.5604 3.52623 34.5984 3.52623 32.1868V11.5125C3.52623 9.10094 5.48826 7.1389 7.89985 7.1389H22.9865C23.9363 7.1389 24.7063 6.3689 24.7063 5.41912C24.7063 4.46934 23.9363 3.69934 22.9865 3.69934H7.89985C3.59158 3.69934 0.0866699 7.20437 0.0866699 11.5125V32.1867C0.0866699 36.4949 3.59169 39.9999 7.89985 39.9999H28.7433C33.0515 39.9999 36.5565 36.4949 36.5565 32.1867V17.5862C36.5566 16.6364 35.7866 15.8664 34.8369 15.8664V15.8664Z" fill="#808080"/> <path d="M34.8369 15.8664C33.8871 15.8664 33.1171 16.6364 33.1171 17.5862V32.1868C33.1171 34.5984 31.155 36.5604 28.7435 36.5604H7.89985C5.48815 36.5604 3.52623 34.5984 3.52623 32.1868V11.5125C3.52623 9.10094 5.48826 7.1389 7.89985 7.1389H22.9865C23.9363 7.1389 24.7063 6.3689 24.7063 5.41912C24.7063 4.46934 23.9363 3.69934 22.9865 3.69934H7.89985C3.59158 3.69934 0.0866699 7.20437 0.0866699 11.5125V32.1867C0.0866699 36.4949 3.59169 39.9999 7.89985 39.9999H28.7433C33.0515 39.9999 36.5565 36.4949 36.5565 32.1867V17.5862C36.5566 16.6364 35.7866 15.8664 34.8369 15.8664V15.8664Z" fill="#808080"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

BIN
resources/images/gcode.icns
View file

Binary file not shown.

4
resources/images/question.svg
View file

@ -1,4 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4 5C4 5 4 5 4 4C4 3 5 2 6 2C7 2 9 2 10 2C12 2 12 4 12 5V6C12 7 11 8 10 8C9 8 9 8 9 8C9 8 10 8 9 8C8 8 7 9 7 10C7 11 7 11 7 11" stroke="#73CA94" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/> <path d="M4 5C4 5 4 5 4 4C4 3 5 2 6 2C7 2 9 2 10 2C12 2 12 4 12 5V6C12 7 11 8 10 8C9 8 9 8 9 8C9 8 10 8 9 8C8 8 7 9 7 10C7 11 7 11 7 11" stroke="#4DB6AC" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M7 15C7.55228 15 8 14.5523 8 14C8 13.4477 7.55228 13 7 13C6.44772 13 6 13.4477 6 14C6 14.5523 6.44772 15 7 15Z" fill="#73CA94"/> <path d="M7 15C7.55228 15 8 14.5523 8 14C8 13.4477 7.55228 13 7 13C6.44772 13 6 13.4477 6 14C6 14.5523 6.44772 15 7 15Z" fill="#4DB6AC"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 460 B

Before After
Before After

59
resources/images/studio_logo.svg Normal file
View file

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="399"
height="517"
viewBox="0 0 399 517"
fill="none"
version="1.1"
id="svg8778"
sodipodi:docname="studio_logo.svg"
inkscape:export-filename="BambuStudio_logo_1024.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs8782" />
<sodipodi:namedview
id="namedview8780"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="0.7613254"
inkscape:cx="285.68599"
inkscape:cy="288.31299"
inkscape:window-width="2010"
inkscape:window-height="1203"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="0"
inkscape:current-layer="svg8778" />
<path
d="M 213.86267,192.99507 V 517 H 399 V 265.61302 Z"
fill="#009688"
id="path8770"
style="stroke-width:6.95617" />
<path
d="M 213.86267,0 V 162.04099 L 399,234.65825 V 0 Z"
fill="#009688"
id="path8772"
style="stroke-width:6.95617" />
<path
d="M 0,324.00354 V 0 h 185.13803 v 251.46404 z"
fill="#009688"
id="path8774"
style="stroke-width:6.95617" />
<path
d="M 0,517 V 355.03676 L 185.13803,282.41881 V 517 Z"
fill="#009688"
id="path8776"
style="stroke-width:6.95617" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
resources/web/homepage/img/i4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
resources/web/image/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Before After
Before After

BIN
resources/web/image/logo2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Before After
Before After

32
src/libslic3r/GCode.cpp
View file

@ -1559,8 +1559,10 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
m_placeholder_parser.set("chamber_temperature",new ConfigOptionInt(m_config.chamber_temperature)); m_placeholder_parser.set("chamber_temperature",new ConfigOptionInt(m_config.chamber_temperature));
// SoftFever: support variables `first_layer_temperature` and `first_layer_bed_temperature` // SoftFever: support variables `first_layer_temperature` and `first_layer_bed_temperature`
m_placeholder_parser.set("first_layer_bed_temperature", new ConfigOptionInt(first_bed_temp_opt->get_at(initial_extruder_id))); m_placeholder_parser.set("first_layer_bed_temperature", new ConfigOptionInts(*first_bed_temp_opt));
m_placeholder_parser.set("first_layer_temperature", new ConfigOptionInt(m_config.nozzle_temperature_initial_layer.get_at(initial_extruder_id))); m_placeholder_parser.set("first_layer_temperature", new ConfigOptionInts(m_config.nozzle_temperature_initial_layer));
m_placeholder_parser.set("max_print_height",new ConfigOptionInt(m_config.printable_height));
m_placeholder_parser.set("z_offset", new ConfigOptionFloat(0.0f));
//BBS: calculate the volumetric speed of outer wall. Ignore pre-object setting and multi-filament, and just use the default setting //BBS: calculate the volumetric speed of outer wall. Ignore pre-object setting and multi-filament, and just use the default setting
{ {
@ -1902,14 +1904,10 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
// SoftFever: write compatiple info // SoftFever: write compatiple info
int first_layer_bed_temperature = get_bed_temperature(0, true, print.config().curr_bed_type); int first_layer_bed_temperature = get_bed_temperature(0, true, print.config().curr_bed_type);
file.write_format("; first_layer_bed_temperature = %d\n", file.write_format("; first_layer_bed_temperature = %d\n", first_layer_bed_temperature);
first_layer_bed_temperature); file.write_format("; bed_shape = %s\n", print.full_print_config().opt_serialize("printable_area").c_str());
file.write_format( file.write_format("; first_layer_temperature = %d\n", print.config().nozzle_temperature_initial_layer.get_at(0));
"; first_layer_temperature = %d\n", file.write_format("; first_layer_height = %.3f\n", print.config().initial_layer_print_height.value);
print.config().nozzle_temperature_initial_layer.get_at(0));
file.write_format(
"; first_layer_height = %.3f\n",
print.config().initial_layer_print_height.value);
//SF TODO //SF TODO
// file.write_format("; variable_layer_height = %d\n", print.ad.adaptive_layer_height ? 1 : 0); // file.write_format("; variable_layer_height = %d\n", print.ad.adaptive_layer_height ? 1 : 0);
@ -3215,9 +3213,17 @@ void GCode::append_full_config(const Print &print, std::string &str)
auto is_banned = [](const std::string &key) { auto is_banned = [](const std::string &key) {
return std::binary_search(banned_keys.begin(), banned_keys.end(), key); return std::binary_search(banned_keys.begin(), banned_keys.end(), key);
}; };
for (const std::string &key : cfg.keys()) std::ostringstream ss;
if (! is_banned(key) && ! cfg.option(key)->is_nil()) for (const std::string& key : cfg.keys()) {
str += "; " + key + " = " + cfg.opt_serialize(key) + "\n"; if (!is_banned(key) && !cfg.option(key)->is_nil()) {
if (key == "wipe_tower_x" || key == "wipe_tower_y") {
ss << std::fixed << std::setprecision(3) << "; " << key << " = " << dynamic_cast<const ConfigOptionFloats*>(cfg.option(key))->get_at(print.get_plate_index()) << "\n";
}
else
ss << "; " << key << " = " << cfg.opt_serialize(key) << "\n";
}
}
str += ss.str();
} }
void GCode::set_extruders(const std::vector<unsigned int> &extruder_ids) void GCode::set_extruders(const std::vector<unsigned int> &extruder_ids)

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

@ -194,7 +194,7 @@ void AMSMaterialsSetting::create()
m_sizer_button->Add(0, 0, 1, wxEXPAND, 0); m_sizer_button->Add(0, 0, 1, wxEXPAND, 0);
m_button_confirm = new Button(this, _L("Confirm")); m_button_confirm = new Button(this, _L("Confirm"));
m_btn_bg_green = StateColor(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), m_btn_bg_green = StateColor(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_confirm->SetBackgroundColor(m_btn_bg_green); m_button_confirm->SetBackgroundColor(m_btn_bg_green);
m_button_confirm->SetBorderColor(wxColour(0, 150, 136)); m_button_confirm->SetBorderColor(wxColour(0, 150, 136));

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

@ -251,9 +251,9 @@ AboutDialog::AboutDialog()
version_font.SetPointSize(FromDIP(16)); version_font.SetPointSize(FromDIP(16));
version->SetFont(version_font); version->SetFont(version_font);
version->SetForegroundColour(wxColour("#FFFFFD")); version->SetForegroundColour(wxColour("#FFFFFD"));
if(wxGetApp().dark_mode()) if(wxGetApp().dark_mode())
version->SetBackgroundColour(wxColour("#00675b")); version->SetBackgroundColour(wxColour("#00675b"));
else else
version->SetBackgroundColour(wxColour("#009688")); version->SetBackgroundColour(wxColour("#009688"));
vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5)); vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));

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

@ -131,7 +131,7 @@ namespace GUI {
wxBoxSizer *m_sizer_button = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_button = new wxBoxSizer(wxHORIZONTAL);
m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_sizer_button->Add(0, 0, 1, wxEXPAND, 5);
m_button_bind = new Button(button_panel, _L("Confirm")); m_button_bind = new Button(button_panel, _L("Confirm"));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_bind->SetBackgroundColor(btn_bg_green); m_button_bind->SetBackgroundColor(btn_bg_green);
m_button_bind->SetBorderColor(wxColour(0, 150, 136)); m_button_bind->SetBorderColor(wxColour(0, 150, 136));
@ -402,7 +402,7 @@ UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/)
m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_sizer_button->Add(0, 0, 1, wxEXPAND, 5);
m_button_unbind = new Button(this, _L("Confirm")); m_button_unbind = new Button(this, _L("Confirm"));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_unbind->SetBackgroundColor(btn_bg_green); m_button_unbind->SetBackgroundColor(btn_bg_green);
m_button_unbind->SetBorderColor(wxColour(0, 150, 136)); m_button_unbind->SetBorderColor(wxColour(0, 150, 136));

1
src/slic3r/GUI/BitmapCache.cpp
View file

@ -333,6 +333,7 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_
replaces["\"#6B6B6B\""] = "\"#818182\""; replaces["\"#6B6B6B\""] = "\"#818182\"";
replaces["\"#909090\""] = "\"#FFFFFF\""; replaces["\"#909090\""] = "\"#FFFFFF\"";
replaces["\"#00FF00\""] = "\"#FF0000\""; replaces["\"#00FF00\""] = "\"#FF0000\"";
replaces["\"#009688\""] = "\"#00675b\"";
} }
//if (!new_color.empty()) //if (!new_color.empty())
// replaces["\"#ED6B21\""] = "\"" + new_color + "\""; // replaces["\"#ED6B21\""] = "\"" + new_color + "\"";

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

@ -140,8 +140,8 @@ CalibrationDialog::CalibrationDialog(Plater *plater)
calibration_panel->Layout(); calibration_panel->Layout();
calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0); calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0);
StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled));
m_calibration_btn = new Button(cali_right_panel, _L("Start Calibration")); m_calibration_btn = new Button(cali_right_panel, _L("Start Calibration"));

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

@ -54,8 +54,8 @@ ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, cons
m_button_confirm->SetTextColor(wxColour("#FFFFFE")); m_button_confirm->SetTextColor(wxColour("#FFFFFE"));
StateColor btn_bg( StateColor btn_bg(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );

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

@ -158,8 +158,8 @@ Button* MsgDialog::add_button(wxWindowID btn_id, bool set_focus /*= false*/, con
btn->SetCornerRadius(FromDIP(12)); btn->SetCornerRadius(FromDIP(12));
StateColor btn_bg_green( StateColor btn_bg_green(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );

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

@ -61,7 +61,7 @@ TipsDialog::TipsDialog(wxWindow *parent, const wxString &title, const wxString &
wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL);
m_confirm = new Button(this, _L("OK")); m_confirm = new Button(this, _L("OK"));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_confirm->SetBackgroundColor(btn_bg_green); m_confirm->SetBackgroundColor(btn_bg_green);

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

@ -8340,7 +8340,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL);
m_confirm = new Button(this, _L("OK")); m_confirm = new Button(this, _L("OK"));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_confirm->SetBackgroundColor(btn_bg_green); m_confirm->SetBackgroundColor(btn_bg_green);

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

@ -87,8 +87,8 @@ PublishDialog::PublishDialog(Plater *plater)
m_btn_cancel = new Button(this, _L("Cancel")); m_btn_cancel = new Button(this, _L("Cancel"));
m_progress_sizer->Add(m_btn_cancel, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5)); m_progress_sizer->Add(m_btn_cancel, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal)); std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
StateColor text_color(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Pressed), StateColor text_color(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Hovered),

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

@ -32,7 +32,7 @@ RecenterDialog::RecenterDialog(wxWindow* parent, wxWindowID id, const wxString&
m_button_confirm->SetFont(Label::Body_14); m_button_confirm->SetFont(Label::Body_14);
m_button_confirm->SetMinSize(wxSize(-1, FromDIP(24))); m_button_confirm->SetMinSize(wxSize(-1, FromDIP(24)));
m_button_confirm->SetCornerRadius(FromDIP(12)); m_button_confirm->SetCornerRadius(FromDIP(12));
StateColor confirm_btn_bg(std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor confirm_btn_bg(std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_confirm->SetBackgroundColor(confirm_btn_bg); m_button_confirm->SetBackgroundColor(confirm_btn_bg);
m_button_confirm->SetBorderColor(wxColour(0, 150, 136)); m_button_confirm->SetBorderColor(wxColour(0, 150, 136));

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

@ -141,7 +141,7 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
auto sizer_button = new wxBoxSizer(wxHORIZONTAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
@ -314,7 +314,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
auto sizer_button = new wxBoxSizer(wxHORIZONTAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
@ -530,7 +530,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons
auto bottom_sizer = new wxBoxSizer(wxVERTICAL); auto bottom_sizer = new wxBoxSizer(wxVERTICAL);
auto sizer_button = new wxBoxSizer(wxHORIZONTAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
@ -703,7 +703,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id
auto bottom_sizer = new wxBoxSizer(wxVERTICAL); auto bottom_sizer = new wxBoxSizer(wxVERTICAL);
auto sizer_button = new wxBoxSizer(wxHORIZONTAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),

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

@ -338,8 +338,8 @@ void SavePresetDialog::build(std::vector<Preset::Type> types, std::string suffix
btns->Add(0, 0, 1, wxEXPAND, 5); btns->Add(0, 0, 1, wxEXPAND, 5);
m_confirm = new Button(this, _L("OK")); m_confirm = new Button(this, _L("OK"));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_confirm->SetBackgroundColor(btn_bg_green); m_confirm->SetBackgroundColor(btn_bg_green);
m_confirm->SetBorderColor(wxColour(0, 150, 136)); m_confirm->SetBorderColor(wxColour(0, 150, 136));

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

@ -1117,7 +1117,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SelectMachineDialog::on_selection_changed, this); m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SelectMachineDialog::on_selection_changed, this);
m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5)); m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5));
btn_bg_enable = StateColor(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), btn_bg_enable = StateColor(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_refresh = new Button(this, _L("Refresh")); m_button_refresh = new Button(this, _L("Refresh"));
@ -3214,7 +3214,7 @@ EditDevNameDialog::EditDevNameDialog(Plater *plater /*= nullptr*/)
m_button_confirm = new Button(this, _L("Confirm")); m_button_confirm = new Button(this, _L("Confirm"));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_confirm->SetBackgroundColor(btn_bg_green); m_button_confirm->SetBackgroundColor(btn_bg_green);
m_button_confirm->SetBorderColor(wxColour(0, 150, 136)); m_button_confirm->SetBorderColor(wxColour(0, 150, 136));
m_button_confirm->SetTextColor(wxColour(255, 255, 255)); m_button_confirm->SetTextColor(wxColour(255, 255, 255));

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

@ -234,7 +234,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SendToPrinterDialog::on_selection_changed, this); m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SendToPrinterDialog::on_selection_changed, this);
m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5)); m_sizer_printer->Add(m_comboBox_printer, 1, wxEXPAND | wxRIGHT, FromDIP(5));
btn_bg_enable = StateColor(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), btn_bg_enable = StateColor(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
m_button_refresh = new Button(this, _L("Refresh")); m_button_refresh = new Button(this, _L("Refresh"));

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

@ -34,7 +34,7 @@ SetBedTypeDialog::SetBedTypeDialog(wxWindow* parent, wxWindowID id, const wxStri
m_sizer_main->Add(m_sizer_radiobutton, 0, wxEXPAND | wxALL, FromDIP(10)); m_sizer_main->Add(m_sizer_radiobutton, 0, wxEXPAND | wxALL, FromDIP(10));
auto sizer_button = new wxBoxSizer(wxHORIZONTAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),

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

@ -591,8 +591,8 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent)
m_staticText_control->SetFont(PAGE_TITLE_FONT); m_staticText_control->SetFont(PAGE_TITLE_FONT);
m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL); m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL);
StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); StateColor btn_bd_green(std::pair<wxColour, int>(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled));
m_options_btn = new Button(m_panel_control_title, _L("Print Options")); m_options_btn = new Button(m_panel_control_title, _L("Print Options"));

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

@ -939,7 +939,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
// Add Buttons // Add Buttons
wxFont btn_font = this->GetFont().Scaled(1.4f); wxFont btn_font = this->GetFont().Scaled(1.4f);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
auto add_btn = [this, m_sizer_button, btn_font, dependent_presets, btn_bg_green](Button **btn, int &btn_id, const std::string &icon_name, Action close_act, const wxString &label, auto add_btn = [this, m_sizer_button, btn_font, dependent_presets, btn_bg_green](Button **btn, int &btn_id, const std::string &icon_name, Action close_act, const wxString &label,

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

@ -141,8 +141,8 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_
sizer_button->Add(0, 0, 1, wxEXPAND, 5); sizer_button->Add(0, 0, 1, wxEXPAND, 5);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),

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

@ -166,8 +166,8 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
m_main_right_sizer->Add(0, FromDIP(50), 0, wxEXPAND, FromDIP(5)); m_main_right_sizer->Add(0, FromDIP(50), 0, wxEXPAND, FromDIP(5));
m_button_upgrade_firmware = new Button(this, _L("Update firmware")); m_button_upgrade_firmware = new Button(this, _L("Update firmware"));
StateColor btn_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Enabled), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Enabled),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
StateColor btn_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Enabled)); StateColor btn_bd(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Enabled));
StateColor btn_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled)); StateColor btn_text(std::pair<wxColour, int>(wxColour(144, 144, 144), StateColor::Disabled), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled));

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

@ -1509,7 +1509,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
m_sizer_left_bottom->Add(0, 0, 0, wxEXPAND, 0); m_sizer_left_bottom->Add(0, 0, 0, wxEXPAND, 0);
m_sizer_left_bottom->Add(0, 0, 0, wxALL | wxLEFT, FromDIP(26)); m_sizer_left_bottom->Add(0, 0, 0, wxALL | wxLEFT, FromDIP(26));
StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled),std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled),std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Pressed), StateColor btn_bg_white(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Pressed),

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

@ -43,7 +43,7 @@ void ProgressBar::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, w
auto m_progress_bk = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); auto m_progress_bk = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_progress_bk->SetBackgroundColour(wxColour(238, 130, 238)); m_progress_bk->SetBackgroundColour(wxColour(238, 130, 238));
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
wxBoxSizer *m_sizer_progress= new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_progress= new wxBoxSizer(wxHORIZONTAL);

8
src/slic3r/GUI/Widgets/SideButton.cpp
View file

@ -28,8 +28,8 @@ SideButton::SideButton(wxWindow* parent, wxString text, wxString icon, long stly
border_color.append(0x6B6B6B, StateColor::Disabled); border_color.append(0x6B6B6B, StateColor::Disabled);
border_color.append(wxColour(23, 129, 63), StateColor::Pressed); border_color.append(wxColour(0, 137, 123), StateColor::Pressed);
border_color.append(wxColour(48,221,112), StateColor::Hovered); border_color.append(wxColour(38, 166, 154), StateColor::Hovered);
border_color.append(0x009688, StateColor::Normal); border_color.append(0x009688, StateColor::Normal);
text_color.append(0xACACAC, StateColor::Disabled); text_color.append(0xACACAC, StateColor::Disabled);
@ -38,8 +38,8 @@ SideButton::SideButton(wxWindow* parent, wxString text, wxString icon, long stly
text_color.append(0xFEFEFE, StateColor::Normal); text_color.append(0xFEFEFE, StateColor::Normal);
background_color.append(0x6B6B6B, StateColor::Disabled); background_color.append(0x6B6B6B, StateColor::Disabled);
background_color.append(wxColour(23, 129, 63), StateColor::Pressed); background_color.append(wxColour(0, 137, 123), StateColor::Pressed);
background_color.append(wxColour(48, 221, 112), StateColor::Hovered); background_color.append(wxColour(38, 166, 154), StateColor::Hovered);
background_color.append(0x009688, StateColor::Normal); background_color.append(0x009688, StateColor::Normal);
SetBottomColour(wxColour("#3B4446")); SetBottomColour(wxColour("#3B4446"));

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

@ -56,8 +56,8 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags)
btn_sizer->AddStretchSpacer(); btn_sizer->AddStretchSpacer();
StateColor ok_btn_bg( StateColor ok_btn_bg(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );
@ -85,8 +85,8 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags)
StateColor calc_btn_bg( StateColor calc_btn_bg(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );
@ -135,8 +135,8 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector<float>& matrix, c
// BBS // BBS
#ifdef __WINDOWS__ #ifdef __WINDOWS__
StateColor calc_btn_bg( StateColor calc_btn_bg(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );
@ -335,8 +335,8 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
#ifndef __WINDOWS__ #ifndef __WINDOWS__
StateColor calc_btn_bg( StateColor calc_btn_bg(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
); );

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

@ -60,12 +60,13 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
boost::filesystem::path bin_path = into_path(wxStandardPaths::Get().GetExecutablePath()); boost::filesystem::path bin_path = into_path(wxStandardPaths::Get().GetExecutablePath());
#if defined(__APPLE__) #if defined(__APPLE__)
{ {
auto bundle_path = bin_path.parent_path().parent_path().parent_path();
//bin_path = bin_path.parent_path() / "BambuStudio"; //bin_path = bin_path.parent_path() / "BambuStudio";
bin_path = "/usr/bin/open"; bin_path = "/usr/bin/open";
// On Apple the wxExecute fails, thus we use boost::process instead. // On Apple the wxExecute fails, thus we use boost::process instead.
BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\""; BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\"";
try { try {
std::vector<std::string> args = { "-n", "-a", "/Applications/BambuStudio.app"}; std::vector<std::string> args = { "-n", "-a", bundle_path.string()};
if (!paths_to_open.empty()) { if (!paths_to_open.empty()) {
for (const auto& file : paths_to_open) for (const auto& file : paths_to_open)
args.emplace_back(into_u8(file)); args.emplace_back(into_u8(file));