Commit Graph

11464 Commits

Author SHA1 Message Date
zhimin.zeng
e1cb3c14a0 FIX: add warning when wipe tower outside
jira: STUDIO-11817
Change-Id: I4352f8485e98c84a0ba75d0b2cc8a339e02c209e
(cherry picked from commit ce4bf4bc1bd2342c4bd3a270ed3b7619c7529c7f)
2025-09-24 09:38:42 +08:00
Noisyfox
ae66936d9c Merge remote-tracking branch 'upstream/main' into dev/h2d-2
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
2025-09-24 09:15:33 +08:00
zhimin.zeng
3dd9462399 FIX: should not sync nozzle flow type for P/A printers
jira: STUDIO-12183
Change-Id: I6351c18b7e01c50aa2c741047934a96ca7572c12
(cherry picked from commit 93095852fb41d7a2b0f252d11125a614fd4a1ef0)
2025-09-23 21:45:54 +08:00
xin.zhang
e44dc9cc04 ENH: update the filaments_blacklist functions
jira: [STUDIO-11883]
Change-Id: Ib75383f4e75a0bcd566dcf555695f2a9f45f0cba
(cherry picked from commit 6a12adb7f0b83c025ad09e7e59e68d07a0ea8335)
2025-09-23 21:44:42 +08:00
xin.zhang
433df2a1be ENH: Revert "ENH: support scroll while using AMS mapping"
This reverts commit e6f290b29d4de697d492a2d933a447ad580a9e83.

jira: [STUDIO-11895]
Change-Id: Iab14bba06cfe59c4804ab9cf2d9784ea75bfe4b7
(cherry picked from commit 529687a2d2d5a4782c941a66eabec704548262df)
2025-09-23 21:42:34 +08:00
xin.zhang
c254509581 FIX: update the dialog size control
jira: [STUDIO-12256]
Change-Id: I6472289ea99686ac7bdc3c0cafb6d7bcfdc61ab1
(cherry picked from commit c28e4be2ca1148be0326472ff43b0e605ffca29c)
2025-09-23 21:42:14 +08:00
xun.zhang
919531a093 FIX: unable to load WipeTowerDialog if path has space
1.Also fix a translation problem

jira:STUDIO-11926,STUDIO-11411

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd709582cb1a0e47631abf90ac6fdbcebcd642a3
(cherry picked from commit 8c78dd2256400f2aebaeb234bcef12bb9d384659)
2025-09-23 21:39:22 +08:00
xin.zhang
811bb0f48d ENH: remove the event funcs
jira: [STUDIO-12081]
Change-Id: Ifb1126c162ec5b50d2a787a2c018b702946fd36f
(cherry picked from commit d4ddbe97924b44d1fb19a4e80309c9a9aad42709)
2025-09-23 21:32:56 +08:00
xun.zhang
3852c77986 ENH: remove the limit for number of tpu filaments
jira:STUDIO-11995

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd3ff7bf870570f9691b7008d8ca6ee8245c046d
(cherry picked from commit cd3219e6654d126363c04d0135bece62dcf94e39)
2025-09-23 21:32:18 +08:00
xin.zhang
ae494493b1 FIX: show the printer text in sd card mode
jira: [STUDIO-12247]
Change-Id: I9457c68365a9defaba75d7cda24229740c68a3f8
(cherry picked from commit 271154aa146f2d84eae8076a8d331909c2b10939)
2025-09-23 17:30:37 +08:00
xin.zhang
ff5bbdfdc0 ENH: only check if from slicing print
jira: [none]
Change-Id: I65676589958b180e7aed6ae78a90a037073fd06b
(cherry picked from commit 561e9ea2b5f972291f0de7a08d2e6d43bc052199)
2025-09-23 17:30:36 +08:00
xin.zhang
c33e6d0cf2 FIX: the encoding problem
jira: [STUDIO-12222]
Change-Id: Ia42865d148b1b89207336af3e2713a64c90b656d
(cherry picked from commit afd1766c89e5309da3304b9999234bdfb8cf811b)
2025-09-23 17:30:36 +08:00
Stone Li
7d6fb97584 FIX: fix missing translation issue
JIRA: none

Change-Id: I163550c2e784a5920dbfeb3ee7d9344506da1567
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit fc6b447b4ae84901b17431ae1766fc581233e1f1)
2025-09-23 17:30:36 +08:00
xin.zhang
541b99f2f4 ENH: update dark mode supports of print option
jira: [STUDIO-12188]
Change-Id: I0d38bcab502415dd733d9b58835e1e50dd00bd22
(cherry picked from commit 2b8edfccc866af927f8c791521eecde182946cee)
2025-09-23 17:25:53 +08:00
xin.zhang
148dc681e3 FIX: fix the dissmiss of Combobox
jira: [STUDIO-12226]
Change-Id: Ibecd15608acf0d1118fe5e1b27c8b2aec756c48b
(cherry picked from commit bab463f1f538397a3edfc188420a54fafd919dc2)
2025-09-23 17:25:48 +08:00
zhou.xu
5829dc3606 FIX:update_all_preset_comboboxes shoulld not return
jira: STUDIO-12045
Change-Id: Ie507a87f9be6b95350603231a4ef7ee5596f5fdf
(cherry picked from commit 1541e256f9c858d3e33d5d31d4881e6ebf38e5b7)
2025-09-23 17:25:38 +08:00
tao wang
ff067b9dc2 FIX:fixed the issue of using the wrong tunnel after reconnrction
jira:[none]

Change-Id: Ief1e79a753b051e859697b523eb1ba230f154ae2
(cherry picked from commit 0d9f48c5aae2c340e8b1c4fadb42c331ae9486f6)
2025-09-23 17:22:26 +08:00
chunmao.guo
80d244963e FIX: bbl printer combox layout
Change-Id: I7b82e0d989e0e197bb7644bbdc74927b308e9d89
Jira: STUDIO-12214
(cherry picked from commit e09410acce9ab64a62e4158b68f84570cda5c873)
2025-09-23 17:22:20 +08:00
zhou.xu
627e8e635b ENH:moudify text for SyncNozzleAndAmsDialog
jira: STUDIO-12221
Change-Id: Ib6ba969ca97da53d7bcc04b5db08d83389bf4b5c
(cherry picked from commit 37013329a69854545be2d369021f89e54b9727ec)
2025-09-23 17:20:09 +08:00
xin.zhang
084b0019b7 FIX: do not disable the dialog
jira: [STUDIO-12070]
Change-Id: Ifea317deaab5e8cc9630930315104570966dc59a
(cherry picked from commit 3cb919424720bc09d1d3ed39096f9b08517d3fd3)
2025-09-23 17:20:03 +08:00
xin.zhang
87ab07a948 FIX: update the bitmap of icon for dark mode
jira: [STUDIO-12180]
Change-Id: Ib39f723be9b1f02f2f0dd21204d7831627481528
(cherry picked from commit 73d9f515de93d324c74878f3ceea5ee0f7049073)
2025-09-23 17:19:56 +08:00
milk
ef3b18c068 ENH:Fix issue where printing cannot be sent
jira:[STUDIO-12212]

Change-Id: I91ba978ee9f8b70a003ccd77a156350444283745
(cherry picked from commit d22550e0aaede366ff91cca8cea01df3769733ab)
2025-09-23 17:19:44 +08:00
chunmao.guo
6423073c71 FIX: Dropdown click non grouped item
Change-Id: Ic2d073be946ed68ec249296e84d5bf97d6d9c587
Jira: STUDIO-12213 STUDIO-12208 STUDIO-12191 STUDIO-12192
(cherry picked from commit 00dfff142a6a24872b3c102d57814bb8c3bf0e2a)
2025-09-23 17:19:38 +08:00
chunmao.guo
f5b1b4dfc5 FIX: paste all of object settings
Change-Id: I32681190b20a2392069f6da5059feda070b312d1
Jira: STUDIO-12194
(cherry picked from commit 1a90c581c41b4d5cb35f6eece3aafbc55f2af97b)
2025-09-23 17:19:27 +08:00
xin.zhang
ff9afd1501 ENH: update some check jobs of SelectMachineDialog
jira: [STUDIO-11883]
Change-Id: I730030c06fa819f06390583a666029b8d7b670f5
(cherry picked from commit b59fac368782b3dbfe04bf483a466b1af7610935)
2025-09-23 17:14:12 +08:00
tao wang
2c4f34d24a ENH:optimize the check for the existence of SD cards
jira:[none]

Change-Id: Iee386e97f66664cfa57aa66ea3457de30d6e987a
(cherry picked from commit a209330b7aae23095fc5da451d91fb467940755f)
2025-09-23 17:14:06 +08:00
xin.zhang
a58dedfef1 ENH: update the style
jira: [STUDIO-12184]
Change-Id: Ic6b6feceb80db157a33e6c6287a4a4faeef4036c
(cherry picked from commit 977f054f7f842a9ea95b5f2f6602d22e62d320a4)
2025-09-23 17:14:01 +08:00
chunmao.guo
16f4f90527 FIX: fixed print bed icon large size
Change-Id: I580109e3edb4f546d52a5eb33bbf5b9de0ac000c
Jira: STUDIO-12164
(cherry picked from commit 33cad32d644805145cb56c0992c27151c79e22d2)
2025-09-23 17:13:28 +08:00
milk
c962cfc01c ENH:Fix the issue of local variables being used without initialization
jira: [STUDIO-10756]

Change-Id: I56d19d04dbd5064f6657d5a762a44223b4a79a56
(cherry picked from commit ee0705783507d8590c8fc72e9a2f2f854060c231)
2025-09-23 17:13:22 +08:00
tao wang
f340b3a5eb FIX:use the correct method to update the dark mode of the window
jira:[STUDIO-11511]

Change-Id: Ie359e391e3d511729b4a777376b89e5bceda161c
(cherry picked from commit bdc864bf10dcfe2738e2476025aac35c007f67a1)
2025-09-23 17:11:58 +08:00
xin.zhang
69216b1fbf ENH: support scroll while using AMS mapping
jira: [STUDIO-11895]
Change-Id: I5cefd4e0cc6f5b7d6d1e1eaccfd2035bdd1a948e
(cherry picked from commit f2812461e31bb9b9e1f7740d10e103e85e4f1f25)
2025-09-23 17:11:49 +08:00
milk
2c21cf50d4 ENH:Add logging to the send function and optimize the connection process
jira: [STUDIO-11777]

Change-Id: Idac7b7835f13ec1805442a8c8aefbb35786c36ef
(cherry picked from commit 6c07f1b9a2858a9ab0c52330f78224a03ffb6f0c)
2025-09-23 17:11:37 +08:00
milk
069a5c8ed2 ENH:The print page needs to support multiple alert messages
jira: [STUDIO-10756]

Change-Id: I61edceef2f6bcf30bb87aec41593009af30831fa
(cherry picked from commit 2a7da8456c1dbc96daf875bb0c21a1aa4905852a)
2025-09-23 17:10:55 +08:00
zhou.xu
2e9541a829 FIX:The plate type in dialog of the plate settings does not match the machine
jira: STUDIO-12181
Change-Id: I1d055e3530f19946073c30647c12fbab2be97d50
(cherry picked from commit 54b6cc3c41319ddfc0e3d78f41b903508f0f4c15)
2025-09-23 16:50:33 +08:00
zhou.xu
7283213996 FIX:miss "Printer not connected" case
jira: STUDIO-12166
Change-Id: I962a93f1127064816fd481dc3ad7be034e3de0f3
(cherry picked from commit 9eba9b8a2d91517f13cfa306fb41b06232910a13)
2025-09-23 16:38:51 +08:00
zhou.xu
ecdc54cebd FIX:update_badge_according_flag should check compatible machine
jira: STUDIO-12166
Change-Id: Id19d398fd2159ee916d0ac63691530ba6d746cdd
(cherry picked from commit fa642e8d6673aba65ac363a92b40312242813509)
2025-09-23 16:38:51 +08:00
tao wang
81e8a182b7 ENH:prohibit resume2D tasks
jira:[none]

Change-Id: I038928bbe06b9f8f711513dca9021a9a08c92e6f
(cherry picked from commit 573db9bf60bffd053c68b8e5c021dd737de12cee)
2025-09-23 16:38:51 +08:00
tao wang
21f046e367 ENH:fixed the issue of cant send SD card printing in LAN mode
jira:[STUDIO-11944]

Change-Id: Iab0b2db690e5cf8e02be5c6bf1bcf94a4e0b5468
(cherry picked from commit 60dd53b26dd30de5ea07d83de19832a089655835)
2025-09-23 16:38:51 +08:00
chunmao.guo
f67ae8a16a FIX: clapse filament list min height & adjust filament groups
Change-Id: Ie4c41b2977addcac4359f161daa46f34dd35054e
Jira: STUDIO-12082, STUDIO-12084, STUDIO-12077
(cherry picked from commit 973399104f9877afd8d5796d7cfa241a05957706)
2025-09-23 16:38:50 +08:00
chunmao.guo
ff255a3343 ENH: copy/paste object settings (menu)
Change-Id: If5f6f75102fbd43f652a96d01f9edd4676fa3152
Jira: STUDIO-11666
(cherry picked from commit 59cee48fbf1d06482c96ef6576a1fb5b33f2b621)
2025-09-23 16:38:50 +08:00
xin.zhang
27f546ec73 FIX: disable filament editing if printing
jira: [STUDIO-12153]
Change-Id: I2397360439d5baaf673c9fc306f3b08eb068cfec
(cherry picked from commit 8308fe3964f72cd911ac472923e8b27b0b3f9c61)
2025-09-23 16:38:50 +08:00
xun.zhang
a5f38646eb ENH: add params for filament retract when extruder change
jira: STUDIO-11965

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id175e9dbce419d43cf45d6116ed4fa4fd556f606
(cherry picked from commit c7964441719f521d1a20dc9f084a7598bd01a9a5)
2025-09-23 16:38:50 +08:00
xun.zhang
397b0465fe ENH: add flush params for multi filament
jira: STUDIO-11965

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2245f22a03c65b570bc60a2792daf4c1683f1ebd
(cherry picked from commit ffe2653341bffd5aee42436e236d45e0b87b56aa)
2025-09-23 14:16:03 +08:00
Stone Li
ec4a879235 ENH: add more retry to subscribe
Change-Id: If68249408446aace4a83e4b5beeb0643dce8cb87
(cherry picked from commit 8b0f16d3de8ef6816bf5eb068e007d202f9710c9)
2025-09-23 09:40:04 +08:00
yw4z
5addd9c421 Fix grid lines origin for multiple plates (#10724)
Update PartPlate.cpp
2025-09-23 09:30:29 +08:00
milk
03cd5c57ef ENH:After re-importing the multi-plate Gcode.3mf file, sending all plates to the printer results in information loss
jira: [STUDIO-11531]

Change-Id: Icfbf56ac1f6610f70c3ed192f765e3381ad8ddb6
(cherry picked from commit fcb4ca7a412dfc7c0897b96a3b4c528e6936c297)
2025-09-23 09:22:53 +08:00
xin.zhang
568c65b468 ENH: update the ext mapping logic
jira: [STUDIO-11970]
Change-Id: Id4cd04da942c5457f0b17877a07c0e24b9c585ec
(cherry picked from commit 09d8050037095f03d3e8f92302f1c568d272a97d)
2025-09-23 09:21:07 +08:00
xin.zhang
79fab83911 FIX: check if the filament is unknown
jira: [STUDIO-12085]
Change-Id: Ibf40d7a5106a40385aff5c769e5b7e5cdb866de0
(cherry picked from commit 012b6f2395d66b7b1bdafa3e851ca4b2f874eb23)
2025-09-23 09:21:03 +08:00
tao wang
da8da58d52 ENH:auto switch to using local broker for data transmission
jira:[STUDIO-11616]

Change-Id: I91066a629684dcff4efc73f310c2e0a7843954f4
(cherry picked from commit ac805e7d9150f56d40ec261fd2ed4007e1413b8e)
2025-09-23 09:20:15 +08:00
tao wang
726a647a58 ENH:Not providing IP search in the user version
jira:[none]

Change-Id: Ib73c30fb924c7bd29ce6ecb66f6517716e841988
(cherry picked from commit 1b8a2e5a16b27d377adfc68c5e6e896cfd2a7c44)
2025-09-23 09:19:34 +08:00