3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
21886 commits 10 branches 72 tags 3.3 GiB
Commit graph

256 commits

Author SHA1 Message Date
tao wang
e144fce341 ENH:select vams when none ams mode 
Change-Id: Id47e2e89d7b6661cb2f6b147f82bd699237396c9
 2023-02-01 16:24:44 +08:00
tao wang
27fc88169e FIX:Fix UI display error without AMS mode 
Change-Id: Ida20f405d6c5a99ba6a8c437a7201b8ebd7fbad2
 2023-02-01 16:24:44 +08:00
Stone Li
b2a752110e FIX: fix display error in virtual tray 
refine description for ams not connected

Change-Id: Ic4c01e69cfd9385548a497af5c5c3071614067a2
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 4158f1e06ed20fa5dd4c3ef412d4c8fab76054a8)
 2023-02-01 16:24:44 +08:00
tao wang
53ed1f99ce FIX:fixed print error has wrong layout 
Change-Id: I668b32caeba9c3c2256c7a85b7858f98cd97fadc
 2023-02-01 16:24:44 +08:00
tao wang
86490d4cef FIX:Fixed some UI layout issues for monitor page 
Change-Id: I91fc50b63ff79ef7e9b7df600325a619c6764a09
 2023-02-01 16:24:44 +08:00
tao wang
23fb4dba2e ENH:select the first tray when switching AMS 
Change-Id: I74487f9bda81df199685b31e6fb7f5dbcaeef607
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
Stone Li
07282cc078 FIX: fix code conflict 
Change-Id: Ibffa0b4fc4c72df878b469ab50f74d12748f15ed
 2023-02-01 16:24:44 +08:00
tao wang
739915e6f6 ENH:Optimize the layout of AMScontrol 
Change-Id: Id74c0f14cf17b5d0cbc1077bb3609d7b1c8c6c2b
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
Stone Li
f701b4efd5 FIX: fix check k / n logic 
Change-Id: I0f9fe5c95523d79b4c6435555d10f2d641639b13
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
tao wang
8d2f3c8440 FIX:Fixed some UI layout issues for monitor page 
Change-Id: Ifbb7dd7271195bed17dcd83a398bb7a65b13dca2
 2023-02-01 16:24:44 +08:00
Stone Li
eed072eccf NEW: add extrusion calibration 
1. display factor of extrusion calibration
2. add progress to calibration extrusion
3. support ext spool

Change-Id: Ic124a0097f16e6287c09f5f133eea84eeefb4000
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
tao wang
e962bcfec9 ENH:add ams humidity tips and update new icon 
Change-Id: I8f504fa911ef7a84ca8929af3c5d7c53d289761e
 2023-02-01 16:24:44 +08:00
SoftFever
2492e5d39c merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +08:00
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
chunmao.guo
a4cf284c3d ENH: adjust user preset handling 
1. async fetch user presets from server (in thread)
2. always load default user presets
3. load user presets from cache immediately
4. not remove user presets cache
5. hide some loading ui

Change-Id: I1d29ed18e09606d0b2f69a69eea2eb5042c26223
 2023-01-10 19:08:26 +08:00
chunmao.guo
722fde9255 FIX: [STUDIO-1873] scroll out of range in DropDown 
Change-Id: Ide38f2e34f8b54380e72dc51509050c55b771f6d
 2023-01-10 19:08:26 +08:00
chunmao.guo
3372313e13 FIX: [STUDIO-1969] disable mouse wheel on SpinCtrl 
Change-Id: I9d568c5fe48defe88c94a476a295143c7089d960
 2023-01-10 19:08:26 +08:00
tao wang
4d8d4cb69c ENH:wxStaticText set the default foreground colour 
Change-Id: Ifb03554848bc869f8605fb10945e7681147204d5
 2023-01-10 19:08:26 +08:00
tao wang
64a635608c ENH:set the fan gear at 10% 
Change-Id: I4ccb62c0e047ccaec3b6a7ca02e03fd2ce320348
 2023-01-10 19:08:26 +08:00
tao wang
5dcf49e0f4 FIX:hide the rpm for fan speed 
Change-Id: I4ba972ee358cbb833a704b927260325940ca4d53
 2023-01-10 19:08:26 +08:00
chunmao.guo
5066cc1736 FIX: label color 
Change-Id: I1de550178601fab8844fac9aabf9728233a965bb
 2023-01-10 19:08:26 +08:00
chunmao.guo
d164889aa4 ENH: [STUDIO-1647] use WebView2 put_UserAgent 
Change-Id: Ifae6589892353adb4b940fbe77d7d0f9521330dc
 2023-01-10 19:08:26 +08:00
chunmao.guo
a953442c9e ENH: update WebView2 to 1.0.1418.22 
Change-Id: I76d4747f8e135368e9dae6ee9f3e980bf4ec6f81
 2023-01-10 19:08:26 +08:00
tao wang
c4136f7641 ENH:reset filament empty when the remain value is error 
Change-Id: I1fa1923a7ef3cd61b592e5ff0874aadf5a534eaf
 2023-01-10 19:08:26 +08:00
tao.jin
b6ef31f7b9 ENH: refine physical printer dialog 
Change-Id: I34d122f83addab3db2952a6a2b91b59921d2a981
 2023-01-10 19:08:26 +08:00
chunmao.guo
1d04c35d0d FIX: StaticBox zero size bitmap 
Change-Id: I33d942f771171fe1f2a61b5f3d1a66a6c7e0da05
 2023-01-10 19:08:26 +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