juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-15 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,878 Commits 17 Branches 77 Tags
aa75c444aa554fad5f1d98614072c2bee9e4daa6
Commit Graph

94 Commits

Author SHA1 Message Date
xin.zhang
4a787f6ff8 ENH: clean codes about device 
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
 2025-10-02 09:30:48 +08:00
fei2.fang
f2e759e885 FIX: Correct auto-calc of flush value and default color picker selection 
jira: STUDIO-13718, STUDIO-13666

Change-Id: I5dd08d3ed46423ba6b3c6cb4c022cfc36f46c620
(cherry picked from commit 173a6ee070d6b5e1ac445f0ebdc4c2fdd145e253)
 2025-10-01 21:58:02 +08:00
fei2.fang
f7758b1831 FIX: Allow white color selection in default color picker 
jira: STUDIO-13666

Change-Id: Ia2f5d8a1830a14d519c9277a88148a723f3d1be0
(cherry picked from commit fccfee6208c5ddc0552004d0642771f99f10dd67)
 2025-09-30 15:32:44 +08:00
chunmao.guo
12725f763c FIX: filament list group problem 
Change-Id: I0ab9590e88336a8f95285df5f346f45eebe8d32a
Jira: STUDIO-12522, STUDIO-12209
(cherry picked from commit efeb19a292a38e2f8a4d117b5bfceddd644e4ce0)
 2025-09-29 20:41:15 +08:00
fei2.fang
ad7725a020 FIX: Add overflow protection and clean up filament picker internals 
- Add safeguards for invalid idx when opening color picker
- Prevent crash when filament color data is missing or uninitialized
- Simplify private member variable naming in filament picker dialog

jira: STUDIO-12956

Change-Id: I455565bdac769f497f22f884e19cd0cbb04fb8c3
(cherry picked from commit 705ad911ee81395b2162ae67a8f64e237f6a3c5d)
 2025-09-28 17:31:07 +08:00
fei2.fang
ea826815af FIX: Show RGB for custom color and allow staying in official picker dialog 
- Display RGB values when a custom color is selected
- Prevent official color picker dialog from closing when custom color dialog is canceled
- Ensure multi-color materials are correctly displayed when importing new 3MF files

jira: STUDIO-12938, STUDIO-12937, STUDIO-12933, STUDIO-13110

Change-Id: Iab410585bf8cc5e9e81c6f0da23fe4ddba561785
(cherry picked from commit 2c20d591b998b02b0b66ac81b048a28fa26bd409)
 2025-09-28 15:01:11 +08:00
fei2.fang
27943f7047 FIX: Correct virtual tray loading and multi-color material display 
- Fixed incorrect is_array() check on vtray["cols"], causing virtual tray init failure.
- Rewrote AMS grouping logic using iterators and set<int> for cleaner and safer traversal.

jira: STUDIO-12955

Change-Id: I09a68e259b56864260abb6c59ff9b1bf7ec2823c
(cherry picked from commit 60c47473047a3fba20d59cd974179537c116524d)
 2025-09-28 14:19:10 +08:00
fei2.fang
470ed6af5d FIX: Support dark mode in filament picker 
- Applied dark theme styling to filament picker dialog
- Fixed color picker background not updating on theme switch

jira: STUDIO-12935

Change-Id: I9c7dcc518e7b0bd2c330f477ee42f4c61ea9fd4b
(cherry picked from commit 66ae7a02b945ff603b2dc699c93e55589481379e)
 2025-09-28 14:19:02 +08:00
fei2.fang
9ee76e4775 NEW: Official filament color selection approved 
- Add a filament picker dialog for official color selection
- Enable displaying multiple filament colors in the picker dialog and preview sidebar
- Introduce two new config options:
  - `filament_multi_colors`
  - `filament_color_types`
  to both the application config and the 3MF config

jira: STUDIO-12346

Change-Id: I66f8c1ec9147df4f5948c8a329c1737551280e63
(cherry picked from commit 522dc0bbca49033a1ba9725ca7f6c3ea729691a6)
 2025-09-28 14:17:52 +08:00
chunmao.guo
aa2071578f FIX: PresetComboBoxes user filament preset group name 'Custom' 
Change-Id: I19b5a5cf458fc4b4f0fe8ab9ee541ea9ca010b64
jira: none
(cherry picked from commit e2d0c8eb1e595c2875e00dc1c0b48125adbbe1cd)
 2025-09-24 11:42:10 +08:00
xin.zhang
ff003bbda0 ENH: remove the event funcs 
jira: [STUDIO-12081]
Change-Id: Ifb1126c162ec5b50d2a787a2c018b702946fd36f
(cherry picked from commit d4ddbe97924b44d1fb19a4e80309c9a9aad42709)
 2025-09-23 21:32:56 +08:00
chunmao.guo
04957107ef 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
zhou.xu
a37dbd6f1d 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
chunmao.guo
b6add47f98 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
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
chunmao.guo
d31c4427aa ENH: printer nozzle diameter select 
Change-Id: Ibf8b74e1f93a7c387db3f0fb5e6e733165322322
Jira: STUDIO-9140
(cherry picked from commit c990314567383d3bfff72ac11df6471e0a10f315)
 2025-09-21 14:37:37 +08:00
zhou.xu
4dbcb8152c FIX:got the wrong name of the selected filament 
jira: none
Change-Id: I476bd1dfb995a0868161184c0c5782e1cae4dde3
(cherry picked from commit 31a7f19b983374ccf6e1b57de8fb635ef7e24184)
 2025-09-21 13:48:02 +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
zhimin.zeng
d5f11037fa FIX: Third-party filament show Incompatible in cali 
jira: STUDIO-11306
Change-Id: Id63f935a478cef92d720cd602ff19dbe87ca1c8e
(cherry picked from commit 7ef9a211233db7f1d0f50a074074eff2e43dccd6)
 2025-09-21 13:47:52 +08:00
zhou.xu
dc9d5661c3 ENH:adjust UI in AmsMapingPopup 
jira: none
Change-Id: Ib2e7e642d7a1700abb92eca2546614b2fd7d2bd4
(cherry picked from commit 5c8d62097384836a1a6d496983734c4e3220baaa)
 2025-09-18 10:08:08 +08:00
zhimin.zeng
fc76b50234 FIX: only match system preset for ams auto sync 
jira: STUDIO-10434
Change-Id: I38322b1f7dc3c4f26aee91d69dbfb6ce65fb9f3d
(cherry picked from commit c5650679548e75c88a16c91491322c41860ee586)
 2025-09-17 14:22:38 +08:00
lane.wei
72ac5dd093 FIX: gui: fix the filament select issue after sync ams 
jira: STUDIO-10467
set the filament selected to visible if it is selected

Change-Id: I376101c7c01b2f6dd85e780abd3ad69c81bcc0d6
(cherry picked from commit b957d5111b28d3d028153f9314b5a53389ef95d8)
 2025-09-17 11:13:36 +08:00
zhimin.zeng
f133dd1733 FIX: fix the display of N3S 
jira: STUDIO-10291 & STUDIO-10285
Change-Id: I10c1d3d210a875b75bb31ed33f8db451bdadb5e7
(cherry picked from commit edb9583f76a3214807bf796f793a8c03c732770e)
 2025-09-16 22:18:27 +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
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
zhou.xu
3392d3136d FIX:fix bug of dual_extruder 
jira:STUDIO-9622
(cherry picked from commit 9514b6225f2170dc3baa34f27e6a435de1fc8439)
 2025-09-10 16:13:56 +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
Noisyfox
cb26af8477 Fix compile error 2025-09-10 08:04:34 +08:00
zhimin.zeng
04643255e7 FIX: back up the selected printer in prepare page 
jira: none
Change-Id: Ibd163f78c4ce911a88459ecca96660ed4aa68ab2
(cherry picked from commit 392e8e18915d0db26ca8a3840d5783cc81cd1c1c)
 2025-09-09 17:22:13 +08:00
chunmao.guo
b1b9c02368 FIX: something gui 
Change-Id: Ia5ed59d2acca441030a917ae6867cca70bb2231f
Jira: STUDIO-9705, STUDIO-9714
(cherry picked from commit 7bf976babc8d12118200c5ebe8f1df976d269199)
 2025-09-09 14:41:24 +08:00
chunmao.guo
a8d10da9dd ENH: show printer preset short name 
Change-Id: Ice1f30ca9dae1363afa2971039af514d8dd5af11
Jira: none
(cherry picked from commit d6181c25b342623176b2db1f21181dc655e64a4e)
 2025-09-09 14:41:22 +08:00
zhimin.zeng
048f91be5c FIX: fix crash when the preset name has Chinese characters 
jira: STUDIO-9096
Change-Id: I8925a9ed5c39c52515a581bd824fa57bd6823164
(cherry picked from commit 901a3bf66610cc901b9f368b31383baec02127d8)
 2025-09-07 22:48:10 +08:00
zhou.xu
ad79ed6d93 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
zhimin.zeng
dd7e3bf72d FIX: fix crash when not find preset 
jira: none
Change-Id: I2752294bd0cd0b063c1b164f2f14e96e54f9d9aa
(cherry picked from commit b85205f1de76e89e6400e5ecf9e5bfbbe38e6510)
(cherry picked from commit cb435671d0610a88fca6efe1beec3d25d1364acf)
 2025-08-28 15:46:17 +08:00
zhimin.zeng
f6bb871b38 FIX: should not display sync dialog when open obj file 
2. select machine with unchecked presets, cannot get the corresponding machine preset
jira: 9070 9065

Change-Id: Ic971a17eef464bead4f247d769ab6be4facb68d1
(cherry picked from commit a297b57249ed1ab8689506c64d12e39328647cf9)
 2025-08-28 11:22:46 +08:00
zhimin.zeng
d637efee3d FIX: support sync N3S ams 
jira: 9008
Change-Id: Icd63670f312562e0260277eb47e01e5d13789f31
(cherry picked from commit ee99497fd7f25e61eec1726c9b40267cf7a51045)
 2025-08-28 10:35:23 +08:00
chunmao.guo
88a728f444 FIX: PresetComboBox edit_btn crash 
Change-Id: I7e311420e8c8779cac1654683298252be06a462a
Jira: STUDIO-9061
(cherry picked from commit 20a8a337d624d3e7d1233438d99a09cb6a9d2a38)
 2025-08-26 20:40:55 +08:00
zhimin.zeng
6afd3a961b ENH: add connected to printer preset list 
and add group name
jira:none

Change-Id: Iecc4ec38ff071105f856c2034ceac0d5bde3b7b0
(cherry picked from commit c44cc2db1a4b27955e0099b06f2508faf824b538)
 2025-08-26 13:31:48 +08:00
chunmao.guo
d1f45e87b0 ENH: new printer layout 
Change-Id: I8acc59b2446a13c8f7fe3a6bdf090f39d4896b1f
Jira: STUDIO-8859
(cherry picked from commit d723fa714f34d572052b5cae0847472529f2c62f)
 2025-08-26 10:26:29 +08:00
chunmao.guo
2fe654587b ENH: filament actions and dual extruder filaments 
Change-Id: I12a83f29c96887fc910976ac8e025c4f1508d945
(cherry picked from commit 0065ea986fc41132df43cca6704c8c98318e6b71)
 2025-08-24 23:18:02 +08:00
Jessy LANGE
e348923283 GUI: Add filament notes to material selector tooltip (#10051) 
* GUI: Add filament notes to material selector tooltip

Enhances material selector tooltip to display filament notes from preset configuration.
Adds automatic truncation for notes longer than 200 characters with ellipsis.
Improves user experience by providing material context directly in tooltip.

Fixes #10037

* GUI: Add filament notes to material selector tooltip

Enhances material selector tooltip to display filament notes from preset configuration.
Adds automatic truncation for notes longer than 200 characters with ellipsis.
Improves user experience by providing material context directly in tooltip.

Fixes #10037

* GUI: Fix tooltip display for unsaved profile notes
 2025-07-05 00:29:47 +08:00
Alexandre Folle de Menezes
57a6f61349 Fix the spacing on the original english strings (#9596) 
* Remove extra spaces between words

* Remove extra spaces after punctuation

* Remove extra spaces before punctuation

* Always needs a space after punctuation

* Always needs a space before parens

* Remove trailing spaces before newline
 2025-05-16 16:31:58 +08:00
Alexandre Folle de Menezes
d37f1b6a81 Fix english strings consistency (#8881) 
* "non zero" -> "non-zero"

* "Z hop" -> "Z-hop"

* "works" -> "is working"

* "version at least x" -> "version x or higher"

* "printing job" -> "print job"
"to print on" -> "printing on"

* "is not find" -> "was not found"

* "boundary of plate" -> "plate boundaries"

* "toolchange" -> "tool change"

* "colour" -> "color"

* "cancelled" -> "canceled"

* "can not" -> "cannot"

* "gcode" -> "G-code"
 2025-04-26 19:59:49 +08:00
Noisyfox
c163d11fdb Fix filament editor crash on Linux (#9016) 
Fix filament editor crash on Linux (SoftFever/OrcaSlicer#8895)
 2025-03-30 22:02:36 +08:00
Noisyfox
632eff6a3a Fix filament combox disappearing (#8649) 
Make sure frozen filament combox is thawed
 2025-03-02 23:20:16 +08:00
Noisyfox
3757295b95 A bunch of tab fixes (#6551) 
* Make sure the speed tab is properly hidden when toggle off advance mode

* Clear each page before clearing the parent, otherwise the child pages will be destroyed twice

* Fix crash if current selected tab is positioned after the removed tab

* Fix issue that sometimes the printer config first page is not displayed

* Fix issue that the wrong tab item get bold if the number of tabs changed
 2024-08-26 20:21:59 +08:00
SoftFever
7082e945b1 Revert "Fix Compile Warnings (#5963)" 
This reverts commit b83e16dbdd.

Found regressions like auto orientation didn't work anymore after this change, revert it
 2024-08-12 00:00:20 +08:00