3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-05 13:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
1695 commits 8 branches 69 tags 1.5 GiB
Commit graph

131 commits

Author SHA1 Message Date
SoftFever
1bdedb1c47
Feature/fix more colors (#193) 
* 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>
 2023-01-18 23:06:39 +08:00
SoftFever
86bfbb7fcc fix color in dark mode 2023-01-05 19:44:33 +08:00
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +08:00
SoftFever
260156648d Merge branch 'master-remote' into SoftFever 
# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
 2022-12-31 15:15:58 +08:00
tao wang
030efb339a ENH: hide some functions which are not ready on U2 version 
Change-Id: I6ff7f98d55d9734938b65aaa72727320dd3c5f6e
 2022-12-26 05:31:54 -05:00
tao wang
51deb70f64 FIX:fixed the side menu popup cannot be selected on macos 13 
Change-Id: Ic4e9182a1a7175b89f37114b3857e813f299989d
 2022-12-26 05:31:54 -05:00
Zhaofeng Li
fd87560bd7 WebView: Only include the private header on Windows and macOS 
The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers.
 2022-12-25 14:30:31 +08:00
Zhaofeng Li
5e543837c1 WebView: Only include webview_edge.h when enabled 2022-12-25 14:30:04 +08:00
SoftFever
a688719e72 Revert "Merge branch 'SoftFever' into feature/calib" 
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
 2022-12-25 12:39:45 +08:00
SoftFever
d733ab7e7b Merge branch 'master' into SoftFever 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
 2022-12-21 16:54:14 +08:00
Zhaofeng Li
06a06714c1 WebView: Only include the private header on Windows and macOS 
The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers.
 2022-12-16 22:51:07 -05:00
Zhaofeng Li
daade424cb WebView: Only include webview_edge.h when enabled 2022-12-16 22:51:07 -05:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever 
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
 2022-12-16 13:59:30 +08:00
tao wang
e9045c2f4b FIX:optimize the fan gear 
Change-Id: I02361a71b56f1527d85b2085f13fb374faacdc32
 2022-12-15 04:38:15 -05:00
tao wang
b61da88d51 NEW:add fan control 
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
 2022-12-15 04:38:15 -05:00
chunmao.guo
59773eee02 FIX: [STUDIO-1725] DropDown: icon scale size on Mac 
Change-Id: I8128035df0c8623d220c791225adeb4a827cbb3f
 2022-12-15 04:38:15 -05:00
tao wang
0d4b8382f5 FIX:change tray id from 1,2,3,4 to A1,A2,A3,A4 
Change-Id: I9da42abb50d95c7a9c41064a993c3cebb68394d9
 2022-12-15 04:38:15 -05:00
tao wang
52e431170c FIX:change the humidity level icons 
Change-Id: I09f0ffce9ee32ec8b7c5948971bb389f5462b89a
 2022-12-15 04:38:15 -05:00
tao.jin
1428a6bec7 ENH:add chinese translation 
Change-Id: Id2d238e3e2918229c88dd986ed41848ea932abcf
 2022-12-15 04:38:15 -05:00
chunmao.guo
967909937d FIX: [STUDIO-1618] ProgressDialog: update dark before show 
Change-Id: I951940d1cfa864f8abdae53ed1b151ea6bf1ea4a
 2022-12-15 04:38:15 -05:00
tao wang
0db1b52b23 FIX:fixed some issue with send print and ams ui 
Change-Id: I1a37bad6ec1f193f9fd98c74506b3bb0358ece6d
 2022-12-15 04:38:15 -05:00
chunmao.guo
588e79c76d FIX: [STUDIO-1574] not switch filament preset after wizard 
Change-Id: Id830b6c8f4ffd76a0b58c51ba892a79f075c0cea
 2022-12-15 04:38:15 -05:00
chunmao.guo
a1fcd05baa FIX: [STUDIO-1570] wkwebview background color 
Change-Id: I6b18a2dbf654b71bff88e0c14317d4479358218a
 2022-12-15 04:38:15 -05:00
chunmao.guo
dcb9862410 FIX: [STUDIO-1570] webview background color 
Change-Id: Icdf41659f4ab18ce30c8b0f585bf702991531599
 2022-12-15 04:38:15 -05:00
chunmao.guo
36efeea30b FIX: [STUDIO-1565] adjust ui style of media file buttons 
Change-Id: Ia3598ca8a15e357021d8b74f645f4d34a853dd91
 2022-12-15 04:38:15 -05:00
Arthur
4419703f41 ENH: do not add L prefix to empty string 
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
 2022-12-15 04:38:15 -05:00
tao wang
eca5897a25 FIX:fixed appconfig is not saved when switching dark mode 
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
 2022-12-15 04:38:15 -05:00
lane.wei
27d2008037 ENH: use wxFont::AddPrivateFont to load fonts for linux 
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
 2022-12-15 04:38:15 -05:00
chunmao.guo
ba8015e455 FIX: more web view logs 
Change-Id: Ia4b2821188c3053be297b0fe0aa19fb8d939a816
(cherry picked from commit 4e76cfc6529038252a4afd8d53cf93f817d46b01)
 2022-12-15 04:38:15 -05:00
tao wang
a9f3f195e1 FIX:fixed ams setting button display error due to scaling 
Change-Id: I810b9f75410d15b16851ec31e710d037d2fba1d6
 2022-12-15 04:38:15 -05:00
chunmao.guo
2f7946333d ENH: [STUDIO-1477] indicators for that has object configs 
Change-Id: I4556b049cd6aa128a05f69c00fa14d8ea5bb3f39
 2022-12-15 04:38:15 -05:00
chunmao.guo
ca2f05e60b ENH: [STUDIO-1478] collapse siderbar printer/filament region 
Change-Id: Id0d1009f5b2c344bc2a95702d33d1d87c864b8f2
 2022-12-15 04:38:15 -05:00
Tao Wang
ab49516ec1 FIX:fixed popup wrong pos of the print menu on multiple displays 
Change-Id: I9712244df4e0df9dcb5beedf4dd36e3a06fa9db6
 2022-12-15 04:38:15 -05:00
tao wang
8216265725 NEW:add remaining capacity detection switch in ams setting 
Change-Id: I8f7be78dbf881bb5e2564aea4d0e01d78f1b0433
 2022-12-15 04:38:15 -05:00
chunmao.guo
3b3ad1b390 FIX: scroll offset with touch pad 
Change-Id: I7dbec590f39f174c02e4179fd781ff7fd1a93374
 2022-12-15 04:38:15 -05:00
chunmao.guo
9b10b1438c FIX: [STUDIO-1011] windows can not scroll in inactivate window 
Change-Id: Ib09e58f4637d632625bf7bd484fd26319630cdb2
 2022-12-15 04:38:15 -05:00
tao wang
6f4e80bbb6 NEW:added dark mode 
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
 2022-12-15 04:38:15 -05:00
tao wang
de0b0508eb FIX:fixed the display error caused by the incorrect remain 
Change-Id: I9c0bb7325d4d9ae043aa3dc868f94102e3aa24ae
 2022-12-15 04:38:15 -05:00
chunmao.guo
bf24a71b60 ENH: webview dark mode 
Change-Id: I0b58e759268d057d5942dd8726c37d1abbdd5930
 2022-12-15 04:38:15 -05:00
chunmao.guo
65ee16f676 FIX: dark mode of wxTextCtrl 
Change-Id: I8a377228b79d24ffe6284acf9be7017207b5dddc
 2022-12-15 04:38:15 -05:00
tao wang
3925ceb9f4 ENH:add humidity display/surplus material 
Change-Id: I1a04df257c9b09fef7ff06cfa192644478a30716
 2022-12-15 04:38:15 -05:00
chunmao.guo
b209243b27 ENH: dark mode of StateColor 
Change-Id: I5928898c50280c7f2eedbb9389032230c7e251c4
 2022-12-15 04:38:15 -05:00
tao wang
01744f1759 FIX:fixed users can not click drop-down menu on mac 
Change-Id: Ib9ac9e323d70f5be32a7d1bd935effba974ef006
 2022-12-15 04:38:15 -05:00
chunmao.guo
5761f8c050 ENH: [STUDIO-1272] handle default filament color in presetcomboxbox 
Change-Id: Id78749db063fd222915b1aa5ad6abf47fb4294ca
 2022-12-15 04:33:48 -05:00
chunmao.guo
d2b112d1c1 ENH: Label Wrap 
Change-Id: I7492f058f731a68e441ab9b78693872364fc00ab
 2022-12-15 04:33:48 -05:00
chunmao.guo
4d4fcc1780 NEW: management camera video stream in device panel 
Change-Id: I39634af900071cc5c01a88100457880a513e416f
 2022-12-15 04:33:48 -05:00
chunmao.guo
8d0f19fd6a FIX: test HasCapture before CaptureMouse 
Change-Id: Ia18b2288b4601c1ae8769d56e5bf46b886a1264e
 2022-12-15 04:33:48 -05:00
chunmao.guo
a52857e95b FIX: mouse wheel direction 
Change-Id: I7b9a5e300de8e7f0c5a9883a20a18856f79c2b93
 2022-12-15 04:33:48 -05:00
chunmao.guo
5fc2acc235 FIX: Label hyperlink style 
Change-Id: Ib0935b41080de994b0b82e4c211ff7a0b9f295bc
 2022-12-15 04:33:48 -05:00
tao wang
c5811178ae FIX:fixed the fix window cant not display full text 
Change-Id: Ibab602396e2261059d7e730dbeea1f3e3282e841
 2022-12-15 04:33:48 -05:00