Commit Graph

688 Commits

Author SHA1 Message Date
zhou.xu
30731cfd54 ENH:add "not support bed type" function
jira: STUDIO-9028
Change-Id: Id1c6cc9005fc5073d885274e360d31282063a9a3
(cherry picked from commit e74c9e710b4bed97e637c8197052b5bd864bfc95)
2025-09-16 15:36:16 +08:00
zhou.xu
f729554858 FIX:close gcode.3mf not pop window that should not appear
jira: STUDIO-9821
Change-Id: I6c9d4e5231d2c7a9b9629003bdffab1c523fe15f
(cherry picked from commit 22e3f089924149617e3f788abf85cbfe79fa0b45)
2025-09-16 14:50:42 +08:00
xun.zhang
0b01388f49 ENH: jump to filament map dialog in error tip
1. Remove error tip for unprintable areas if no longer needed
2. Add link for filament map dialog in error tip

jira:STUDIO-10073

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic3235038de73a85964c6dbcb9b4f435e7aa47d34
(cherry picked from commit 1793060e96cec973d9606bd4fbe36686671e0fee)
2025-09-16 14:48:16 +08:00
Noisyfox
2375ab860a Merge remote-tracking branch 'upstream/main' into dev/h2d
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
2025-09-16 14:46:40 +08:00
qing.zhang
e7e6405ad3 ENH:instead of prime_volume by filament_prime_volume
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I96e7d0604da8f90678feed81833e3a634752ffff
(cherry picked from commit be02e769bb49680d6be678fc5fa73a141ca8da1c)
2025-09-16 10:39:19 +08:00
SoftFever
1e87666487 Add support for OrcaSlicer 2.3.1-alpha infill rotation template warning
Implement a check for projects created with OrcaSlicer 2.3.1-alpha to warn users about potential issues with infill rotation template settings. If the infill pattern is not safe to rotate, prompt the user to clear the rotation template settings to avoid print quality issues.
2025-09-14 20:35:58 +08:00
zhimin.zeng
19a6a20b23 FIX: sync extruder info when select preset
when the connected machine is mutli_extruer and is the same as preset
2. fix the filament unprintable check bug
jira: STUDIO-10047

Change-Id: I4e78003f080897d5b43c0a742852078b149eba45
(cherry picked from commit 1fbc179ae4874d24089dc1faf81608b9417481cb)
2025-09-13 18:52:13 +08:00
zhou.xu
34eac964aa FIX:fix bug for the base color of the color modification
after matching the untreated material
jira:STUDIO-10062

Change-Id: I699fd843600182bc87b224eee488e752b64ca0b4
(cherry picked from commit 29b0be89eb5190bd83d783bf173f14950aef738d)
2025-09-13 18:50:28 +08:00
zhou.xu
164fec343f FIX:Unknown material display incomplete
jira: STUDIO-9997
Change-Id: I55409e5ba054eadf9200c22b8c6ab31223c3b689
(cherry picked from commit 5c6a752279c20d3bc2628edf9db0aa320bdf322d)
(cherry picked from commit e113538a1741465e6b25583c5e4101ea499debc3)
2025-09-13 18:46:59 +08:00
qing.zhang
a6c4e22e15 ENH: move extra params
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib5c4d203c6585b9946d8703d9f33477780afb275
(cherry picked from commit 78079dacd1c4f14c171668d6c7895e72dd96c52a)
2025-09-12 17:43:07 +08:00
zhou.xu
3b69225bc8 NEW:add "Fade out" effect for BaseTransparentDPIFrame
jira: none
Change-Id: Ied2fd3a07c213c3518183865169728a87a7d5b1a
(cherry picked from commit c5406570bc8647d243011e330f4bd618bcceec85)
2025-09-12 17:39:25 +08:00
zhou.xu
45a3224539 NEW:add BaseTransparentDPIFrame and timed disappearance
jira: none
Change-Id: I8fcf56ead20aba640c59406c0dad3b6ad67f18a6
(cherry picked from commit d34a8cb2ee1cf0d29c2ca5187a4c168b775269f8)
2025-09-12 17:37:14 +08:00
zhou.xu
b2856b44b0 ENH:add "sync filaments status" logic
jira: none
Change-Id: I7a74641e6d8e1d1d713d4d97af370a8c0a87f154
(cherry picked from commit abfa7261625dfd90ad276baf9afd66a3368303f1)
2025-09-12 17:25:17 +08:00
zhou.xu
ecb94e119c FIX:Only one of the two dialogs is displayed
jira: STUDIO-10065
Change-Id: I7763de83697ea9645808757b9396acd34cd12cca
(cherry picked from commit eab6384c6cb50428689bae724ee1d16217eab28d)
2025-09-12 17:13:01 +08:00
zhou.xu
a8d2a0e589 ENH:add "pop_sync_nozzle_and_ams_ialog" api
jira: STUDIO-10016
Change-Id: I000fa5719cf631ff0c63b6379850e1915f78ddaa
(cherry picked from commit 170687352efa3e87605a2bc37eafbed3679417f9)
2025-09-12 17:12:50 +08:00
jiangkai.zhao
16731a90b0 ENH:add rib wall wipe tower
jira: none

Change-Id: I9699cc74e206851284949f89230e986435b9e1b7
(cherry picked from commit eabfa6b272590698886ecec33b89207605b91993)
(cherry picked from commit 1d33d1c37d4dada1cd1129ff16fe46d07933ad26)
2025-09-12 15:31:11 +08:00
zhou.xu
054162a192 FIX:change control for two dialog
jira: STUDIO-10038
Change-Id: Ia88ebc9c5a61920108cdec2ae33fdf73cf6e0b00
(cherry picked from commit 4c9d8917007a7eea742253e2417b3faeab1985db)
2025-09-10 16:36:34 +08:00
chunmao.guo
9a7ee39837 FIX: nozzle AMS rescale
Change-Id: I8006c72947463d23984fa62ce3a9a2e2d40e990f
Jira: STUDIO-10045
(cherry picked from commit 2d4cdc82181d8fa8b5c16f7baeb2a46e12b3fc07)
2025-09-10 16:36:18 +08:00
chunmao.guo
484279a7e9 FIX: liveview_remote protocol missing agora
Change-Id: If3a46c67e139e3abc47dc672e32246eb6b59f9fd
Jira: STUDIO-10041
(cherry picked from commit 71d9d8969e4bf502adaa56f165fc857be7fe6f5a)
2025-09-10 16:33:02 +08:00
zhou.xu
8c06b19a7b ENH:translate text
jira:none
Change-Id: I2d37d7ba4867b1507d2a8073dfdfc836b7c8e112
(cherry picked from commit 5427e9e0522b370e85ef0b2eab8394ae5f41ed40)
2025-09-10 16:31:39 +08:00
chunmao.guo
b9f6e43159 FIX: switch diameter texts
Change-Id: I2e93cdd0895f3b7f2531d96c64f7caa8d0440194
Jira: none
(cherry picked from commit 50f9bdbd91de69b160013bf8b6a9bd561e23474e)
2025-09-10 16:28:24 +08:00
zhou.xu
49743635f5 ENH:translate text
jira: none
Change-Id: I0bbacfc198b93f663d1e844664440e45cf39617d
(cherry picked from commit 248f6daf96591010654263d57c14bf45fef2a53b)
2025-09-10 16:26:15 +08:00
chunmao.guo
d1f039b5f3 FIX: switch diameter button order & total ams count
Change-Id: Ife11b131269cd5b1ed6c1555621d5ea727a07027
Jira: STUDIO-9984, STUDIO-9739
(cherry picked from commit 35e8c0d5dab916ee1b103a475d638ad7958e561b)
2025-09-10 16:24:41 +08:00
tao wang
0e763dd300 ENH:Optimize translation
Change-Id: Ic45baaa974af044a1bc166faf6e27ca5ee4e155b
(cherry picked from commit 4a8304486789965c85a498d72250ea84088730a8)
2025-09-10 16:23:33 +08:00
zhou.xu
a90639130a ENH:add "only_external_material" logic
jira: STUDIO-9985
Change-Id: Iac15989bea39d1571eab66199737472381832017
(cherry picked from commit d317055f421ba2037f983ad1d99cd0e268b7274b)
2025-09-10 16:20:49 +08:00
lane.wei
48c67f6d94 ENH: GUI: remove object limited warning
jira: no-jira
Change-Id: I89bc082721bdc05ed2f41febc12a4f4252308ac0
(cherry picked from commit ff02619730f6af3910b535c419fc798b4a9a9d62)
2025-09-10 16:19:14 +08:00
lane.wei
d6715225c7 FIX: GUI: refine the error message when switch plate
also refine the text
jira: STUDIO-9809

Change-Id: Ifce527d3d19ead80b314611de8f3f861dc598188
(cherry picked from commit 014996d4258cef42ce943157d6485fad9cc98ee2)
2025-09-10 16:19:03 +08:00
zhou.xu
31f16dc42e FIX:pop error MessageDialog
jira: STUDIO-9955
Change-Id: I9ce6a68baaa7fc7548817a37c042091ae4b7e73a
(cherry picked from commit 3a6784342a8f965c151e9f8e3cdbc1f7983e6f80)
2025-09-10 16:18:03 +08:00
zhimin.zeng
fbf2ccc226 FIX: crash when delete filament
jira: STUDIO-9956
Change-Id: Ibef1db35c2953040bb7df6b53ed3144f3ff85d96
(cherry picked from commit 99837d8c01e782ef6634ab60a06e05f48ca31437)
2025-09-10 16:16:50 +08:00
zhou.xu
2456729002 FIX:fix bug of SyncAmsInfoDialog
jira: STUDIO-9948 STUDIO-9950
Change-Id: Ic97dfb7787c9e27386003b2dc3f88f1003456245
(cherry picked from commit 081df8f5809dc023487b239dc1419b20eacc7a40)
2025-09-10 16:14:02 +08:00
zhou.xu
c2b8f7ecae FIX:update SyncAmsInfoDialog
jira: STUDIO-9928 STUDIO-9934
Change-Id: Ica81cb037ff0b99cc53a762b280a666e8c832ab3
(cherry picked from commit eeb474d2cee9187961db1941be952f806ff6c76d)
2025-09-10 15:29:28 +08:00
xun.zhang
4742521930 FIX: always empty popup in unprintable case
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90fcb90ef01e8cc398683bf00eb8d87eefe95069
(cherry picked from commit f79ba9e315689202f592cac3dcc3027c4eae9164)
2025-09-10 15:28:25 +08:00
zhimin.zeng
d04f09fa18 FIX: The filament_map of the disk is incorrect in manual mode
jira: STUDIO-9484
Change-Id: I920f387b10d46c2fa1b9385bf3d920c8b8df8806
(cherry picked from commit 4cf4c82c9e226204be84449d2e7df382d5a73ccf)
2025-09-10 15:27:05 +08:00
zhimin.zeng
98f305f32c FIX: auto sync extruder list after connect printer
when enter in prepare page
jira: none

Change-Id: I3dd0ac4fbc283d5c4b8e85d01724251cc1a7131e
(cherry picked from commit 34ed8441a16499f922e82b6c83f140eda58055a5)
2025-09-10 15:26:54 +08:00
zhou.xu
dfa9e8d3bd FIX:add deal_btn_sync api
jira: none
Change-Id: Ib0d2cd95a927622f746767c606cfb1feb56240a6
(cherry picked from commit 8a92c26aad11aa089d9a93beed813667013ec617)
2025-09-10 15:25:38 +08:00
chunmao.guo
819e11733a FIX: PrinterFileSystem less thumbnail batch count to 2
Change-Id: If741fa8a394ab510f0bf15fa90cd43c8f14a7c80
Jira: none
(cherry picked from commit bc8f79e2fec6ae568b9f403f21d694659b5dea79)
2025-09-10 15:23:43 +08:00
zhou.xu
8a6eddb7c2 NEW:add SyncNozzleAndAmsDialog
jira: none
Change-Id: Ib2e8d645a1b9a280da5c91b6de2fee313075bc17
(cherry picked from commit 4845e4c585cf2d57e028dd6e9ebc221b66dea324)
2025-09-10 15:06:02 +08:00
chunmao.guo
d01f553dc6 ENH: optimize set ams number popup
Change-Id: I7765b47785ee80d74d7b75701747585b6cd5db51
Jira: STUDIO-9829
(cherry picked from commit 3573bbd985cff965f7077326f0ba6c8d847b9043)
2025-09-10 15:03:50 +08:00
zhimin.zeng
00f19fcd72 ENH: add timelapse warning for multi-extruder printer
jira: none
Change-Id: I09a25f00eef6d3fab6ad948a13c8eb308f134dbb
(cherry picked from commit d7acee50e88812e8a0bd7b9afea7aca5d5826841)
2025-09-10 15:01:19 +08:00
zhou.xu
80cd896896 ENH:update SyncAmsInfoDialog
jira: none
Change-Id: Icdfaa85500a0f448b9959923b863e6fbf72b397f
(cherry picked from commit baa2282dede7886720cdb564ef4de22710c5528c)
2025-09-10 15:00:55 +08:00
xun.zhang
ae75d8b8a5 ENH: update some sentences and refine ui
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibba2d6c880fcb810f861cf06eb7a30a512cbbacf
(cherry picked from commit 5195e824814a1ee38d789f331ec86e73807d412a)
2025-09-10 15:00:25 +08:00
chunmao.guo
b3a320cc2e ENH: sync ams info to extruder group
Change-Id: Id0aace998a759c6e91aabb2685306e54e06d152e
Jira: STUDIO-9828
(cherry picked from commit 2bae63e3819bc2dc04dc64c1d53b10d2f04edeff)
2025-09-10 12:39:00 +08:00
zhou.xu
ee12c32b11 ENH:update SyncAmsInfoDialog
jira: none
Change-Id: I7549dd3334fd9bcc4eba5d3b41786516fd879f38
(cherry picked from commit 9b1717fa56b1d5baacc3801f23d1586050970574)
2025-09-10 11:17:47 +08:00
zhimin.zeng
ea06ea32f9 FIX: 1. add auto sync on connect printer
2. remove printer list in prepare page
jira: none

Change-Id: Iab4009c5249663f309221d3fcc02e0bd676e554b
(cherry picked from commit 19e8ab26481cfcc9b81dded0bc91c5075c940012)
2025-09-10 11:08:42 +08:00
chunmao.guo
d626c38ae7 FIX: something
Change-Id: I2923786337f97f4297b0444522c620891aa2ad90
Jira: STUDIO-9725 filament menu delete icon
Jira: STUDIO-9785 StaticGroup border color
Jira: STUDIO-9716 update badge icon
Jira: STUDIO-9815 click printer/bed panel for combobox
Jira: STUDIO-9867 label with for single noozle
Jira: STUDIO-9739 ams page up/down
(cherry picked from commit 1cde0b844a97f3420db4999927f05a833b92b0fb)
2025-09-10 10:43:06 +08:00
zhou.xu
200a811dca ENH:add "text to image" function in TextInput
jira: none
Change-Id: Ibdb57b74511432e81faa0c556bb6e639d5a174f5
(cherry picked from commit 09323aeed34f29f105b95d3d6a2c7a151e17e42a)
2025-09-10 09:55:52 +08:00
zhou.xu
2e8a5ecd87 FIX:update SyncAmsInfoDialog
jira: none
Change-Id: I8c34d47e799c56e2b1887794dc8a7bfaf8904d77
(cherry picked from commit e06aed7cbf144cdd77f9b7caa160c1c7f7941794)
2025-09-10 09:47:00 +08:00
zhimin.zeng
10e676e439 ENH: Add prompt information when mixture of PLA and PETG
jira: STUDIO-9659
Change-Id: I03a09dd796074d0872010672bdd85688bb7f1715
(cherry picked from commit 903b230f389ac8fce2816a8d46a0675019af0b04)
2025-09-10 08:53:00 +08:00
zhimin.zeng
c781f6f450 FIX: preset is incorrect when opening MW file
jira: STUDIO-9793
Change-Id: Ib1405c5badc4857a506ecea41ce4708eb2f83423
(cherry picked from commit e1d11d814ec0846fde047b54bfb2fadcd9303eec)
2025-09-10 07:30:47 +08:00
Alexandre Folle de Menezes
914425e526 Update strings for keyboard shortcuts (#10399)
* Update strings for keyboard shortcuts
2025-09-09 21:48:42 +08:00