Commit Graph

115 Commits

Author SHA1 Message Date
tao wang
ccb1cfe77d NEW:disabled materials item will retain original color
jira:[STUDIO-10539]

Change-Id: Iabdbc6582dae5bcb2ec31775163949f0d451dcca
(cherry picked from commit fdb57550aa01ae88538b2de954670b84c6e72baa)
2025-09-17 21:53:33 +08:00
zhou.xu
15b4aafb3e ENH:delete no use code and add log
jira: STUDIO-10644
Change-Id: Ia12ea45553e2856d0c8784c2a87a1e86adece003
(cherry picked from commit 38f1f265cfb9f79030b48137d2949de9f25e782f)
2025-09-17 17:56:31 +08:00
zhou.xu
bd6ad383f0 ENH:add 'reset' button in AmsMapingPopup
jira: STUDIO-10009
Change-Id: Ia924ae9cbe0bec33f1b37af12633a9cb64836182
(cherry picked from commit 3b8aa5993d93598173e412766a938af17ebb2da5)
2025-09-17 17:56:25 +08:00
zhou.xu
6c1e1ea6a5 ENH:Optimize the gap between AMS pop-up controls
jira: none
Change-Id: Iaa397fb5d9de8c496da5cee510535d41a8bdaa81
(cherry picked from commit 905576f52786ae2a431a8ff0b0ea8a23562f2fe3)
2025-09-17 17:22:36 +08:00
xin.zhang
ed6453be6f FIX: support open door check
jira: [STUDIO-9095]
Change-Id: I2e033641724beb15f649b04950c5de51be8722df
(cherry picked from commit d504010ee0137c4ecf55b99b730f76692ef76390)
2025-09-17 15:49:30 +08:00
zhou.xu
8d712ef655 ENH:Add numerical display in AMS control
jira: STUDIO-10432
Change-Id: I504e38612b09513247462974b4d34b331a5d3240
(cherry picked from commit 3f51f72a66b8b88744512c4a7aa2069116572a76)
2025-09-17 10:07:58 +08:00
zhou.xu
9c6c720390 FIX:modify ToolTip for MaterialSyncItem
jira: none
Change-Id: Ia9e3066f6b0b8300641ce1773a74053a675b7e83
(cherry picked from commit 8d9b589b35fa7175e2edef183ce2ce2c83289fcf)
2025-09-17 10:05:03 +08:00
zhou.xu
bd1fd8b6ed NEW:Display AMS mapping relationship in override mode
jira: none
Change-Id: Iac0b3563df2f76710a5bc461adab6dd8335ee62d
(cherry picked from commit 69f28a711f7680a938a46209da61289787f1d8fa)
2025-09-16 15:53:28 +08:00
zhou.xu
f7d474c23f FIX:fix display in mac
jira: STUDIO-10130 STUDIO-10062
Change-Id: Ie98b19cdd3ead958940a8730e6091fc74be05ad8
(cherry picked from commit f5133d9d431ee562148afb1488ddab24c911c16d)
2025-09-16 15:39:36 +08:00
zhou.xu
e6fce2fdfb 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
bee893e93d 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
zhou.xu
7f281f136d FIX:fix dark mode bug of SyncAmsInfoDialog
jira: STUDIO-10012
Change-Id: I6b27b8908f04995814af97baabcee6f77643c125
(cherry picked from commit a87bdf0d543e2d55e11098a6713fc9965f67a150)
2025-09-12 17:43:15 +08:00
zhou.xu
b209457f4c FIX:update MaterialItem
jira: STUDIO-9996
Change-Id: Id225c13eaa2f4f66aca0f76754408fc8506d532c
(cherry picked from commit e45bb41cd10e063f0ea630f7644e719c42c3523e)
2025-09-12 17:40:26 +08:00
xin.zhang
bd06a03405 FIX: show the refill graph only if it's enabled
jira: [none]
Change-Id: I8a1f015a92ac965972f6de46a143a6b0f02340a0
(cherry picked from commit 403a3b42e7c5b4c8aa8a5f680b7d2b6413431ef6)
2025-09-12 17:26:26 +08:00
xin.zhang
1dc9b3cff6 FIX: wrap the text
jira: [none]
Change-Id: I8deb09ac6caa3c3a4ab45d75286e8697d0babb06
(cherry picked from commit 3cb5ee0b303c28be9a9aca37cab5afb10a65b1e9)
2025-09-10 16:37:20 +08:00
zhou.xu
b7e0d556ce FIX:modify text and fix show bug of SyncAmsInfoDialog
jira: STUDIO-9974
Change-Id: Id10dd54bc23e98cd709860b563fc26b4c570b98f
(cherry picked from commit c3990592ac4f531c162fb37fd08893a6cefdfbc4)
2025-09-10 16:37:15 +08:00
xin.zhang
358d552cad FIX: update some translation
jira: [none]
Change-Id: I0b6e14b78c26188b20d8303444ed294eee64dff2
(cherry picked from commit 3bef21933f60e3c813881232ef4fea44db56f395)
2025-09-10 16:32:15 +08:00
xin.zhang
bf8773b1a6 FIX: update the wrap DIP
jira: [STUDIO-10037]
Change-Id: I24c7d1ad54bbcfb4ac43609bff1dd9cd10db2e60
(cherry picked from commit 0c80f1a9754a727c2087b4f56942ec1b8f589fe5)
2025-09-10 16:31:54 +08:00
zhou.xu
af62601d63 ENH:add MaterialSyncItem
jira: STUDIO-9994
Change-Id: Id0d2ebd8dd68854f5cc1c821c7453b75852b8ba7
(cherry picked from commit 012d90bd7e546be17b654a2f71e90628ffd596e5)
2025-09-10 16:28:52 +08:00
tao wang
0fad654010 ENH:add unmatched status for ams mapping
jira:[STUDIO-9995]

Change-Id: I9400ae8ef33a2292565395a8fb4fedbe71437da6
(cherry picked from commit dc4919ebd665554f2b935aa5b41c6c13c21615c5)
2025-09-10 16:27:42 +08:00
tao wang
7d57126ed4 ENH:adjust the UI of the Mapping pop-up window
jira:[none]

Change-Id: I26f07db9a9d4fd565fde1e58d01e2c60380f8492
(cherry picked from commit 8f11826bc0d845d13489487fc647758d1e1f4565)
2025-09-10 16:22:21 +08:00
zhou.xu
b3b9c3b7af ENH:update AmsMapingPopup
jira: none
Change-Id: Icacbc7500eccddea8991dd552a0e4a040e83fdd7
(cherry picked from commit 065e05b37668f2f8409169e278d22b13519cd4d1)
2025-09-10 16:16:54 +08:00
zhou.xu
9b41834d8e FIX:update SyncAmsInfoDialog
jira: STUDIO-9928 STUDIO-9934
Change-Id: Ica81cb037ff0b99cc53a762b280a666e8c832ab3
(cherry picked from commit eeb474d2cee9187961db1941be952f806ff6c76d)
2025-09-10 15:29:28 +08:00
tao wang
59ec50d317 FIX:Update some Chinese translations
Change-Id: I6098ff6f14ee9203c120593636945a5c4388c9fa
(cherry picked from commit 2c9074715c979537f15d131077dc3f44f268a6d3)
2025-09-10 15:28:54 +08:00
tao wang
bdeea4d71f ENH:some UI optimizations
Change-Id: I3395ab87552d6beb3481bf2049bfd1096933f36d
(cherry picked from commit 66a783d126e55360cbbc35503c03f0366aacdf68)
2025-09-10 15:26:13 +08:00
tao wang
297f223ff1 FIX:multi printer control using ext pool
jira:[STUDIO-9610]

Change-Id: I32e7d6701f12e32facd5b0ac536129526582c954
(cherry picked from commit 44db9102ae538b0558ff7f14bfc588e59558ee5b)
2025-09-10 11:18:05 +08:00
zhou.xu
e5c2500667 ENH:update SyncAmsInfoDialog
jira: none
Change-Id: I7549dd3334fd9bcc4eba5d3b41786516fd879f38
(cherry picked from commit 9b1717fa56b1d5baacc3801f23d1586050970574)
2025-09-10 11:17:47 +08:00
tao wang
9b73cabc39 FIX:fixed the disabled status of multi-color materials
Change-Id: I5472dc667fc81681af92a3b16e9fde9c8c1d9158
(cherry picked from commit e563b30b4d5c19e83cbd9c690ae6b9bd6d0bcfa2)
2025-09-10 10:38:30 +08:00
zhou.xu
c61fff5c9e 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
42cbf0ac0d FIX:update SyncAmsInfoDialog
jira: none
Change-Id: I8c34d47e799c56e2b1887794dc8a7bfaf8904d77
(cherry picked from commit e06aed7cbf144cdd77f9b7caa160c1c7f7941794)
2025-09-10 09:47:00 +08:00
zhou.xu
9ecae7ddce ENH:update AMS control
jira: none
Change-Id: Idae5c85cc6bd7948e413b5cea68a75ffa7aba005
(cherry picked from commit ad7fadceaa0e6a5a89421317a041fd09937d01c2)
2025-09-09 17:18:50 +08:00
xin.zhang
b6828ce3a0 FIX: the dialog display fault
jira: [STUDIO-9730]
Change-Id: I6ecd12c4ac4710ea63868963a806b219298c86d0
(cherry picked from commit fbb9ebcf7d7964cf476bb4d1fb40531d4df2db77)
2025-09-09 16:51:19 +08:00
zhou.xu
0f2dd2e0b4 FIX:add mode for syscAMsInfoDialog
jira: none
Change-Id: Iabfc9953f86cd08a2357a9197d6e1afe8d781d9f
(cherry picked from commit eaeac42b19b322f56b501c0d2ce99c4a6b2fd050)
2025-09-09 15:35:19 +08:00
xin.zhang
79247917f5 FIX: do not show refill if there is one tray
jira: none
Change-Id: I2623ca6d565716a9d3950af21175f4799800b956
(cherry picked from commit 920736cf4e5b561f95738f4614b243c61b54b488)
2025-09-07 22:15:53 +08:00
zhou.xu
c21ff1ed3b ENH:add "SyncAmsInfoDialog"
JIRA: none

Change-Id: I8e26178f6da816e102a40b429c565696924c58ea
(cherry picked from commit 2a46460d5a65279cbb42c8aef2474172b1e1ae30)
(cherry picked from commit f7995d5a9f682107bd629841e2f903b0e6a0e7f2)
2025-09-07 20:55:54 +08:00
xin.zhang
cc2b062dbd FIX: the single AMS failed to show
jira: [STUDIO-9445]
Change-Id: I8a565f50a109355f85a66567d242998b26fa4bdc
(cherry picked from commit 5ca6d99fd697144eb50e06436a3296ab91880287)
2025-09-07 00:49:19 +08:00
xin.zhang
0d4b73cd63 FIX: update the refill dialog text
jira: [STUDIO-8563]
Change-Id: Ib4c29f811a68fc8f0ccdea68110c77eea80deb00
(cherry picked from commit 3fa55062f65a4250dc287d54f73bebb2bb4ac700)
2025-09-07 00:00:20 +08:00
xin.zhang
2417b335bc FIX: update the refill dialog
jira: [STUDIO-8563]
Change-Id: Ib924f6f83839d0e6134f0243471a6fbc20a61616
(cherry picked from commit df129aebc19e8fbc02b17f540e43db01e16a2d9f)
2025-09-07 00:00:14 +08:00
xun.zhang
f5a8c96924 ENH: filament map params switch to global param
1.Add more filament map modes
2.Filament map and mode are set as project config
3.Plate filament map is only valid when plate filament mode is
manual

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I33b2f853e0b77b9d605be1f2f1172b44df43da15
(cherry picked from commit e45f8c6dc2146e1e31a1c21e8aaada540af112d0)
2025-09-06 23:49:11 +08:00
zhou.xu
595a6fda2c FIX:fix warning for icon_size define
jira: none
Change-Id: I0393677c5c29354aeca41917daecc87721d9d9ce
(cherry picked from commit 97584e0a1e73a0ce2152ce88c1ffd58abfc96c73)
2025-08-24 23:18:24 +08:00
zhimin.zeng
d444771c10 FIX: Modify calibration protocol
jira: none
Change-Id: Ib0fdf4fd1ab514c2db4d1731ad0d37d3dc38fce5
(cherry picked from commit d479d1186a63e9432f3b063cc70c9f691cd6214b)
2025-08-24 23:18:18 +08:00
hang.xu
14a0de5d2f FIX: Mapping UI display
jira: STUDIO-7473, 7817

Change-Id: Ibd014985b3b4997bd86700537e1d8a7d0d18176f
(cherry picked from commit 66701cc4c9f6c975ebd30b35e519ca8189dc9b7d)
2025-08-24 23:18:11 +08:00
hang.xu
785371bfc7 NEW:Use new ams mappiong item ui/ux
jira:[STUDIO-7347]

Change-Id: Iba306c4a1b5ae59e406a6862428b425a48002870
(cherry picked from commit 260a7202fc07af028db74159c34106c058fd07ff)
2025-08-24 23:18:11 +08:00
hang.xu
debc7266fc FIX: Ext auto fill when mapping item is empty
jira: [Ext auto fill]

Change-Id: I4a8844555e33fcf9f7054fc2e0e254621dec0a1d
(cherry picked from commit 8b4182d0c1de3e7f70fd1f17c032681f12af0045)
2025-08-24 23:18:07 +08:00
hang.xu
310057de7d NEW:change mapping popup layout for multi nozzles.
jira:[Popup for multi nozzles]

Change-Id: I07e6d8f0469d2dcf0037d53e2ca8e22de78ca233
(cherry picked from commit 0924fce6858654c331eafcb91e43252f62e703bf)
2025-08-24 23:18:05 +08:00
tao wang
068eb194d1 NEW:support new ext slot mapping
jira:[support new mapping]

Change-Id: Iaf88f7bd57177df772a926ad162bd3b5a141327a
(cherry picked from commit 3b93bd2dd305026457e9f63ca3faeb153b59c9a5)
2025-08-24 23:18:00 +08:00
yw4z
96a1efb37e Color & Icon fixes / improvements (#9773)
* init

* update

* update

* revert changes for stepmesh dialog

* make highlight arrow more obvious

* reset to zero icons

* modernize return icon

* better dark mode icon for project page

* fix return arrow

* revert changes for hyperlinks

* update

* Update SelectMachine.cpp

* Update SendToPrinter.cpp

* update

* update plate icons

* dragcanvas dark mode support

* revert changes for calibration page

* revert changes for bind dialog

* Update BindDialog.cpp

* fix green text on bbl calibration window

* Update AmsMappingPopup.cpp

* match measure axis color

* fix

* update

* Update AmsMappingPopup.cpp

* revert color change for hyperlink

* Update NotificationManager.cpp

* update

* add icon for resonance avoidance

* update

* Fix wrong icon color after switching dark mode

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-07-17 15:26:55 +08:00
Noisyfox
bf2c6e4fcf Merge branch 'main' into dev/bbl-network-upd
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
2025-06-21 10:27:10 +08:00
yw4z
f6f80fe1ee Remove usage of titlebar icons (#9932)
* ibit

* update

* Update RecenterDialog.cpp

* Update AboutDialog.cpp
2025-06-20 16:52:15 +08:00
Noisyfox
c72c1f0604 Merge branch 'main' into dev/bbl-network-upd 2025-06-01 19:33:39 +08:00