Commit Graph

495 Commits

Author SHA1 Message Date
xin.zhang
2bbd4f89f8 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
xin.zhang
2f1c7994bb ENH: support DD_ITEM_STYLE_SPLIT_ITEM
jira: [STUDIO-12103]
Change-Id: Ic69b5076543066ad00bb0d13ffb4d13b57873d3a
(cherry picked from commit de14cfbac610436c36790c2200e1dbc580fa58c5)
2025-09-23 09:03:49 +08:00
xin.zhang
e9b30443c5 REF: remove useless codes
jira: [none]
Change-Id: I86202fdaa09c5953d9bb4f21cc6dd9d9609c0a7f
(cherry picked from commit e9d8a6c8352628e3f7bb33e2ffaa38e03ebe929b)
2025-09-23 09:03:17 +08:00
xin.zhang
21f9866847 FIX: FanControl the info text display wrap
jira: [STUDIO-12088]
Change-Id: Ic6a1d9ea60e85859f412bc65184b0eb085bba5b2
(cherry picked from commit 8dd0cb4901f43bcea062eac893466e58c0c35e7e)
2025-09-23 09:00:52 +08:00
xin.zhang
015ac04951 FIX: do not popup for AMS1
jira: [STUDIO-12083]
Change-Id: Id2297576fa2b520282d8e4ce9af8e47817fc7088
(cherry picked from commit 8d29e09c1b8c1b9598f869235e99038d48b1bffc)
2025-09-23 09:00:38 +08:00
xin.zhang
60005def4c ENH: update some GUI styles
jira: [STUDIO-12074]
Change-Id: I01bbf66577040d837c1768749b43500221e54fcb
(cherry picked from commit b813cb04dd438319c331d1b7ff533120bf65bd4a)
2025-09-21 18:03:18 +08:00
chunmao.guo
66eb27cfaa FIX: switch_diameter in sync
Change-Id: Iff7c654ef932f36b9c3cb4267e4ea90b8074c9c2
Jira: STUDIO-9744
(cherry picked from commit 0c01d7b3e0224f745b249e8d8dbe1990f3b407bc)
2025-09-21 16:54:02 +08:00
xin.zhang
54c402aec6 ENH: support nozzle info, support new popup style
jira: [STUDIO-11974]
Change-Id: I8d80338d5b90bcca824ea46be2066f1bfb7aa10a
(cherry picked from commit 8c8b8d63b97e8f6a8423456f88e9a5e0e3d9f7ab)
2025-09-21 16:31:30 +08:00
chunmao.guo
16d8e86b84 ENH: group filament preset by vendor & list uncompatible filaments
Change-Id: Ice05956fca59fe130d927b505ac0f61dc8e8cb5e
Jira: STUDIO-11615
(cherry picked from commit 564e59bf4fd99ce718f224ec61f1423fd876fc52)
2025-09-21 15:28:03 +08:00
xin.zhang
50ef04666b FIX: messureSize after set max size; the text is the default tooltip
jira: [STUDIO-11878]
Change-Id: I1945779d620a01fff4cfb29b5592eed0490dbbd5
(cherry picked from commit fba3ab060f5dcfeaf5cc36f14eb5ec46414fdbc8)
2025-09-21 13:48:04 +08:00
xin.zhang
6d336e3dd0 FIX: correct the encoding
jira: [STUDIO-11876]
Change-Id: I9824214e5114ab73ed850fb882be9f0980a5b270
(cherry picked from commit ea56ebfc6c16aef2dff73fd96f8e4530d14394b7)
2025-09-21 13:48:04 +08:00
milk
9a542b1a0f ENH:Optimization of File Transfer System Part2
jira: [STUDIO-11777]

Change-Id: I12744db7d2e3b53425454d632533768c54524677
(cherry picked from commit 4358e9ce351c5784e392a75d1ffcf2f54e1916ec)
2025-09-21 13:48:03 +08:00
xin.zhang
6547cb766c ENH: update air condition control
jira: [STUDIO-11373]
Change-Id: Ib25952165ec5489ef51ec7f5472fb319b0328ffc
(cherry picked from commit 307c83bb8434c40a3c7f0678a1c2abf2b361cd7a)
2025-09-21 13:48:01 +08:00
xin.zhang
9f24f0fe03 FIX: add transparent painting for AMS lite
jira: [STUDIO-11488]
Change-Id: I1b180ad7389eb4d74c3686b0559ce26172f7b264
(cherry picked from commit 03957c567ea0ffed58057f0fafe6f311e87f3a10)
2025-09-21 13:48:01 +08:00
Peter Feerick
230eb6c9f5 fix: typo "pringing"
(cherry picked from commit c65faf05b3a2a0b77c639374bb96f0385e85f7bf)
2025-09-21 13:48:00 +08:00
xin.zhang
2b2d3cfd02 FIX: on mac, the mouse event may triggered even disabled
jira: [STUDIO-11526]
Change-Id: Id68f43e1b6d1401c72966f97643d6631f23b87a9
(cherry picked from commit b2b4eabbfb7cb60cb1cb1b5e4fc624e52e956e22)
2025-09-21 13:47:58 +08:00
xin.zhang
4cd0dc883f FIX: check the return value
jira: [STUDIO-11485]
Change-Id: I60f7d571cd93b0e4f26a965f54c19987843c6265
(cherry picked from commit 85378a7e99bca847bbcb51be1eeaa137eb0a06ea)
2025-09-21 13:47:57 +08:00
xin.zhang
554c192be1 FIX: do not need the button
jira: [STUDIO-11231]
Change-Id: Ia2425864b37d3b158d5c37978e1db04dfc6e63c1
(cherry picked from commit 90ca1c5b4b977fbe98d37718a363c2a31265816e)
2025-09-21 13:47:57 +08:00
zhou.xu
f36fa17a09 FIX:m_ext_image call msw_rescale should protect
jira: STUDIO-11441
Change-Id: I89dc4bfaca61958773f7dfadf2983ff3f9cb6da1
(cherry picked from commit f42e47b7456fde2ef01ae9c3327f7c0ce9d8f174)
2025-09-21 13:47:56 +08:00
xin.zhang
f5f2a893de ENH: Navigate while enter valid number
jira: [STUDIO-11440]
Change-Id: I01a0b2fdb67b76cbea4c17539951c8d57dc2cd31
(cherry picked from commit d6b5bbf84b75447737bde91961305be522eaf47d)
2025-09-21 13:47:56 +08:00
xin.zhang
aea87dbb66 ENH: enable to enter 0 as default cooling temperature
jira: [STUDIO-11360]
Change-Id: Iaede485340c1a88a1a42eceeadf772332fe369a0
(cherry picked from commit 1fd53404176795581cb2fe1e6d69bfe425a04c23)
2025-09-21 13:47:56 +08:00
tao wang
bb74ca8b63 ENH:supports new fields for flag3
jira:[none]

Change-Id: I013c7b843f3f7d5156a8d209572da2bc078e9191
(cherry picked from commit 106d9865c3e569b95519ae9bd9193d10bd991d1a)
2025-09-21 13:47:56 +08:00
xin.zhang
da33d78799 FIX: too small to show, enlarge it
jira: [STUDIO-11323]
Change-Id: Ibd56b0a72cbef0f9c752f83b1e8526a1c4275588
(cherry picked from commit c151680321af77facd1ec0aca337b7680a4c6ecd)
2025-09-21 13:47:53 +08:00
xin.zhang
1549e8f4e4 FIX: modify style; optimize ext image loading time
jira: [none]
Change-Id: Ia4bd69cc4ae6ae115c22a5c0b6c6a517773ec3f4
(cherry picked from commit 1dfd5cfdfb44b7ad4418633a3e00f5c451856fe7)
2025-09-21 13:47:53 +08:00
chunmao.guo
d513914dd3 FIX: DropDown hover item tip
Change-Id: Ie3d9e654cd612b2db983c3410d7d8d0224200a8d
Github: 6380
(cherry picked from commit e6e093949d39fa208c4afaa3f2bc97e3b518ac21)
2025-09-21 13:47:53 +08:00
tao wang
426b5900ee ENH:compatible with AMS exist flag
jira:[none]

Change-Id: I6afeafe0676eded86f83838576d67233f50ee509
(cherry picked from commit a182fa1aa4a3bdd32c4ccfa26adcd92a9f1cca37)
2025-09-21 13:47:51 +08:00
tao wang
6d739dde47 ENH:adjust the layout display of a single AMS
jira:[none]

Change-Id: I801daa5f3a8ee1b3f03037eb4edf881071ea67db
(cherry picked from commit cbd69328318c18a2040a04b24ae8cd5340523ce0)
2025-09-21 13:47:51 +08:00
xin.zhang
c743085c4e ENH: add "Don't show again" to fan speed control
jira: [STUDIO-11231]
Change-Id: I160d122155302195edf4b97e8b92e96350f9d600
(cherry picked from commit 0ba097de36efd077244ea3d1f435c9e5dc7f9637)
2025-09-21 13:47:51 +08:00
zhimin.zeng
3d5abeba60 ENH: Updated calibration UI for single-extruder printer
jira: none

Change-Id: I4e2d97f38699b13e2bced8f6a37c952f7903aa27
(cherry picked from commit 2e3a5e8ca71e3e9426412f8bd07b916f6be45aed)
2025-09-20 15:31:26 +08:00
xin.zhang
fcfb6ac093 FIX: show ams remain for MAC
jira: [STUDIO-11139]
Change-Id: If5b9593e0b46e3f6845bb5637564cee8fa67e5bc
(cherry picked from commit 2d99a9e23106a631f9d1875f71f0910b093de657)
2025-09-20 15:30:19 +08:00
xin.zhang
f9a7f056e9 FIX: use different ext image for different machine
jira: [STUDIO-11133]
Change-Id: Ice69b4f33317e23a2c2d7b8fbdfc94402b4bba28
(cherry picked from commit a67acd8f0ced49052cfe0c4b01a5bf159b046e85)
2025-09-20 15:30:14 +08:00
Noisyfox
c26266dfb6 Merge remote-tracking branch 'remote/main' into dev/h2d
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/slic3r/CMakeLists.txt
2025-09-20 13:10:10 +08:00
Dipl.-Ing. Raoul Rubien, BSc
75ed995b00 Fixes 50 Compiler Warnings: Add SYSTEM toCMakeLists.txt (#10653)
* src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* src/*/CMakeLists.txt: removes duplicate sources from lisbslic3r_sources and SLIC3R_GUI_SOURCES"

* .gititnore: adds CMakeLists.txt.user and CMakeLists.txt.autosave

* deps_src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* removes #pragma once from .cpp file
2025-09-19 23:45:03 +08:00
Bastien Nocera
a0bde11b29 FIX: Fix missing std::set declaration
/run/build/BambuStudio/src/slic3r/GUI/Widgets/DropDown.cpp:281:10: error: ‘set’ is not a member of ‘std’
  281 |     std::set<wxString> groups;
      |          ^~~

(cherry picked from commit 842152b65a3584a9a59950f52260b20951dd09a5)
2025-09-18 23:01:04 +08:00
zhou.xu
13d3cfda63 ENH:Text not centered on mac15
jira: STUDIO-11056
Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959
(cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)
2025-09-18 17:08:18 +08:00
zhou.xu
ef876da0ce FIX:fix mac display
jira: STUDIO-11041
Change-Id: Ib9dcd9e033fa635e82e74f42105185a1d9139062
(cherry picked from commit 563bb3dffc1c36b11236b6a42b626abd35ed60bf)
2025-09-18 16:43:58 +08:00
xin.zhang
489543313c FIX: use wxMessageDialog as warning in MAC
jira: [STUDIO-10386]
Change-Id: Ic8cc6d09f2eba41ec8cfebf239eb6bd78dd3844a
(cherry picked from commit 1537f575927f8d0f0e2658f900296344deb6682c)
(cherry picked from commit a856c7cc62636a4897b0e473034579e223808a7b)
2025-09-18 15:22:56 +08:00
xin.zhang
2c365fba63 FIX: rebuild the TempInput logic
jira: [STUDIO-10386]
Change-Id: If7160dacafaa19d7056125961a59111ff63ea25b
(cherry picked from commit f078f6bfdc4bf2610f8c861132241ebdd933bb74)
(cherry picked from commit 1820ca6fc00f6b6d1250e3464ee05bd33cd244f5)
2025-09-18 15:22:55 +08:00
xin.zhang
4640858b18 FIX: the usage of translation macro
jira: [STUDIO-10847]
Change-Id: I3cb11f4f584c5f6bc42c8ae9a1464190f33c1774
(cherry picked from commit 8079244d15a5eabe4d58cda1af01c93e05b2f7ac)
2025-09-18 14:13:13 +08:00
Mixian
00579388b1 FIX: fix plater UI
Jira: 10520
Change-Id: Iec4401862d1c28df45067dc9b545dafe1341eb35
(cherry picked from commit 94ceedf97faf2b99e104489e73de0e72c4d27fca)
2025-09-18 13:38:29 +08:00
xin.zhang
d61b2a7b73 FIX: the fan speed control in mac OS
jira: [STUDIO-9566]
Change-Id: I781ee149a2b184ee8d559dbb494798386e67e059
(cherry picked from commit 77dc987ad58534b033b025b9d47bb806718667c3)
2025-09-18 11:06:17 +08:00
tao wang
947e034b14 ENH:fix X&P printer displaying incorrect N3S
jira:[none]

Change-Id: I15b30e3f45b060b696e7dd2ab4617a7835e9e6c9
(cherry picked from commit 8cb358305c341074418fc8d75c260b0cb6bc661b)
2025-09-18 10:56:27 +08:00
xin.zhang
193d2dc598 FIX: update the panel
jira: [STUDIO-9241]
Change-Id: I9a309594814e0547f7a6ef247ad710636f478b79
(cherry picked from commit 99ec1acc276800b8fcfe933fb224156a7890a7a6)
2025-09-17 23:30:34 +08:00
xin.zhang
581af2c433 FIX: update is_info_ready function
jira: [STUDIO-10608]
Change-Id: I068969223e54b1fa2056a0acc80bef87d167942c
(cherry picked from commit 44e068e705742b37513d2ce65c18a41007d4b7d8)
2025-09-17 23:08:31 +08:00
xin.zhang
6632db0758 FIX: update the image size
jira: [STUDIO-10732]
Change-Id: Ib4d55b911740cef079f38cd497d40a29ae3b1031
(cherry picked from commit 0ffcd9cc13ce7bbc1f6f96a09647e2f6afa112b1)
2025-09-17 23:08:20 +08:00
xin.zhang
198c78cac9 FIX: the DPI issue
jira: [STUDIO-9238]
Change-Id: I8ab364402358b8b21e6768ecdd0da9cfe6541777
(cherry picked from commit 6dda5f3e523e79485cd0f10c333849fbaa3e0851)
2025-09-17 23:07:08 +08:00
xin.zhang
03ea48c6b4 FIX: update the extruder image in status panel
jira: [STUDIO-10732]
Change-Id: I5437c4ef1538f0022f97c7ef7fb40ec2242328ed
(cherry picked from commit f5c49c89a80e508a442440218b068446d1e9e797)
2025-09-17 23:06:54 +08:00
xin.zhang
740f7eabb1 FIX: use dialog instead of popup window
jira: [STUDIO-10692]
Change-Id: I85e8da120946fc6ff845c9b88d4f1594e313652b
(cherry picked from commit 7115c1ca177e98c2931517d748ce4d63d3a067da)
2025-09-17 21:53:27 +08:00
xin.zhang
a2e3a61ea0 FIX: fix the humidity display of N3S_AMS
jira: [STUDIO-10641]
Change-Id: I48ac96443f851262b3ce720d4b4948b7b515a381
(cherry picked from commit 51042edcbdc1d8d24c11fa8a479559d4fd000fc7)
2025-09-17 17:56:40 +08:00
xin.zhang
e68300ef99 FIX: fix offset of graph painting
jira: [STUDIO-10617]
Change-Id: I3e924640ccfca2fa1a7ff70d54f7b48759ee1ac7
(cherry picked from commit 4fc69c70d4b1d3cf75b40ca09c660731ba2af85c)
2025-09-17 17:51:21 +08:00