Commit graph

63 commits

Author SHA1 Message Date
zhimin.zeng
5ce2ec11a8 FIX: the data and UI are out of sync when creating printer
jira: STUDIO-11080
Change-Id: I4cc86174b4ed847b53c87f85f9e590742e6dd9ff
(cherry picked from commit c366876acfb95b16bedb57f9e22e1623fc749f7e)
2025-09-18 17:13:09 +08:00
zhimin.zeng
6b282809f8 FIX: add nozzle size filter for create preset dialog
jira: STUDIO-10969
Change-Id: Ideee88b35c41a34512e30aea55a6a518ca337f5e
(cherry picked from commit 4f87d0de271026d0067f7ce449db0c3bdde5744d)
2025-09-18 16:27:26 +08:00
zhimin.zeng
28fdf252d0 FIX: error sync behavior for customize printer preset
jira: STUDIO-10331
Change-Id: I4d42ed089e515c2d74dfade1589f20f1c80ca4ca
(cherry picked from commit ce963cede53a72a123f55666a1f718726eb18ab6)
2025-09-17 14:22:28 +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
maosheng.wei
233edf9502 ENH: Optimize the creation of third-party printer presets
Allow custom input nozzle diameter and allow create custom nozzle diameter for system printer

Jira: XXXX

Change-Id: I78014fb03b20f80fa774a5af3ecf9395d2d02980
(cherry picked from commit 9d3bd858f43315ce95e8f8c03a5446ac7cdbbd97)
2025-09-07 00:07:52 +08:00
Alexandre Folle de Menezes
0ba336647c
Fix misc issues with the translated strings (#10400)
* Spell check "part selectiont" and "printetrs"

* Remove translation of "°"

* Fix the abbreviation of Watts

* Fix capitalization issues

* Fix punctuation issues

* Fix spacing issues

* Adding more missing periods
2025-08-26 22:39:14 +08:00
Azi
4981b0b3e4
Fix: export printer config skipping currently selected preset (#10380)
* Fix: export printer config skipping currently selected preset
2025-08-21 22:10:22 +08:00
Jo Kroese
e5d6de9080
Fix inability to create custom filament due to hidden printer selection checkbox (#10362)
Fix clipped printer selection in Create Filament Preset dialog

Ensure the scrolled panel in the Create Filament Preset dialog expands vertically by changing `m_main_sizer->Add(..., proportion=0)` to `proportion=1`. This exposes the printer selection checkbox, which is required to create a custom filament.

Fixes #6719

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-08-12 00:14:18 +08:00
yw4z
e9e069c167
Styling management for buttons and matching all button styles (#8184)
* Add button styling

* Fix dark mode compability

* printable area button

* Connection dialog icons

* Add aligment control

* Fix alignment

* add new styles

* Update BedShapeDialog.cpp

* Use darker text color on dark mode

* update code

* Update

* update

* Update

* Update WipeTowerDialog.cpp

* update

* Update Button.cpp

* update

* Update Button.cpp

* add enums for style and type

* update

* Update Button.cpp

* fix

* update

* Update DialogButtons.cpp

* Update UnsavedChangesDialog.cpp

* update

* update

* update

* Update Button.cpp

* cleanup

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-07-17 20:44:45 +08:00
Alexandre Folle de Menezes
fa70582ed1
Standard units don't need translation (#9965)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
2025-06-22 15:10:40 +08:00
yw4z
8aec3f69e5
Remove usage of titlebar icons (#9932)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
* ibit

* update

* Update RecenterDialog.cpp

* Update AboutDialog.cpp
2025-06-20 16:52:15 +08:00
dremc
d8683fc045
add filament_vendors:DREMC (#9519)
* Update CreatePresetsDialog.cpp

* Update generate_presets_vendors.py
2025-06-15 19:41:46 +08:00
Dipl.-Ing. Raoul Rubien, BSc
3ecca6116d
fixes compiler warnings (#9619)
* compiler warnings: adds SYSTEM to [target_]include_directories to skip warnings originating from dependencies

* compiler warnings: uninitialized/unused variables, missing parenthesis, pragma

* compiler warnings: redundant template type, missing curly braces, pass 0 instead of NULL as int argument

* compiler warnings: removes fclose(fp) where fp==nullptr since fclose() has attribute __nonnull((1))

* compiler warnings: uninitialized variables, missing parentheses, missing curly braces

* compiler warnings: ? as lower precedence than <<

* compiler warnings: unused variable

* compiler warnings: unused result

* compiler warnings: undefined/unused variable

* compiler warnings: uninitialized variable
2025-06-14 21:05:25 +08:00
yw4z
0999cb057d
DialogButtons fixes and apply to more windows (#9809)
* step import dialog

* update

* update

* drop file dialog

* Update UnsavedChangesDialog.cpp

* update

* fix focus

* Update CreatePresetsDialog.cpp

* improve usage of return button

* fix first button not getting hover effects

* update

* update

* improve button styles

* update button events

* update button events

* update button events

* remove Raise()
2025-06-14 10:27:10 +08:00
Michele Stefanelli
5a173bb1c4
Improve printers pictures and sorting (prusa printers) (#9824)
* Replace prusa printer images with standard sizes and aspect ratio

* Rename Prusa Mini IS to specify the IS in the name

* Add missing prusa CORE One in the preset dialog and reorder prusa printers

* updated pictures to 320px
2025-06-08 18:04:04 +08:00
yw4z
dd549a6c52
class for DialogButtons (#9639)
* init

* match code

* update

* Update DialogButtons.hpp

* make Ok uppercase

* update

* fix and cleanup

* Update DialogButtons.cpp

* update

* Update DialogButtons.cpp

* update

* Update CreatePresetsDialog.cpp

* update

* update

* update
2025-06-04 09:30:36 +08:00
Alexandre Folle de Menezes
b8c5ddd0ee
Fix the spelling/grammar on the original english strings (#9487)
* Fix the spelling/grammar on english strings

* Fix the spelling/grammar on english strings, part 2
2025-06-01 19:32:36 +08:00
Alexandre Folle de Menezes
a2f87dc980
Fix casing issues on the original english strings (#9513)
* Use lowercase after comma

* Use uppercase after period
2025-06-01 19:31:55 +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
Noisyfox
8c4b7456c1
Fix vendor/model selector on create printer dialog (#9344)
* Make sure printer vendor matches

* Handle cases where some vendor do not have printers (such as `OrcaFilamentLibrary`)

* Ignore vendor `custom printer` from create printer vendor list

* Fix missing end bracket

* Update printer vendor and model list on create printer dialog
2025-05-01 17:12:03 +08:00
Alexandre Folle de Menezes
7d72db562f
Add translation markers on more unstranslated strings (#9134) 2025-04-26 23:11:36 +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
FusRock
3a3f695967 add filament_vendors:FusRock
Add FusRock and keep the alphabetical order
2025-04-15 16:25:26 +08:00
Azi
6d467c8f16
fix: no printers show up for custom filament creation (#8959)
* fix: for custom filament creation, if no compatible printers are defined, it should be available for all printers

* same fix idea but for 'Copy Current Filament Preset' option

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-04-14 15:23:22 +08:00
Alexandre Folle de Menezes
1ba7f18b90
Mark strings missing from translation (#8757) 2025-03-09 14:14:27 +08:00
SoftFever
70dfdb95a9
Fix a crash issue then exporting preset bundle (#8525)
fix crashes when finding base preset
2025-02-23 15:20:27 +08:00
Azi
599b0e09eb
fixed a custom filament creation bug (#7965)
fixed a bug with custom filament creation where orca doesnt recognize capitalized letter in 'Nozzle' in the printer name
2025-01-08 09:09:35 +08:00
xiaoyeliu
3b73ad875d
fix: create custom filament (#7477) 2024-12-15 00:49:28 +08:00
camerony
4c78d687a0
Added LDO as a Filament vendor (#7587)
* Added LDO as a Filament vendor
2024-11-27 20:35:27 +08:00
cochcoder
23d597a302 Add PETG-CF10 filament type & RatRig filament vendor 2024-09-27 12:25:12 -04:00
Heiko Liebscher
adb2d33c92
New de translation and typos for 2.20beta (#6702)
* add new de translation for 2.2 beta

* fix typo info(r)mation

* build new locals
2024-09-09 22:42:27 +08:00
Henri van der Riet
5b0ddbd5f7 merge conflicts 2024-09-08 01:04:19 +02:00
Henri van der Riet
e750727743 updates for PR #6638 - typos and grammar
Including resolved merge conflicts.
2024-09-08 00:16:33 +02:00
SoftFever
220213e846 Revert "Fix typos and grammar (#6638)"
This reverts commit 1afc1372bc.
2024-09-07 20:04:17 +08:00
henrivdr
1afc1372bc
Fix typos and grammar (#6638)
* fix lots of typos, grammar etc.

* merge conflict

* merge conflict

* merge conflict

* merge conflict

* revert gettext comments

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-09-07 18:00:01 +08:00
George Peden
a1e2267fdf
case insensitive sort for filament vendor list (#6594)
* case insensitive sort for filament vendor list

* Merge branch 'main' into case-insensitive-filament-vendor-sort
2024-09-03 22:58:11 +08:00
Noisyfox
2bf54878f7
Make the checkbox on export preset dialog more visible in dark mode (#6539)
* Make the checkbox on export preset dialog more visible in dark mode (SoftFever/OrcaSlicer#6536)

* Merge branch 'main' into bugfox/export-checkbox
2024-08-25 12:42:01 +08:00
Noisyfox
f136f04cfd
Fix Linux build & some warnings (#6438)
* Fix linux deps debug build

* Use the same DL_CACHE for release build when building debug version of deps on Linux.
This prevents downloading the same source packages twice, and avoid downloading again after deleting the build dir.

* Fix debug build

* Fix warnings "loop variable creates a copy from type" and "loop variable binds to a temporary constructed from type"
2024-08-18 11:33:00 +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
Duan Gauche
b1a06e80b3
added FilX as a Filament vendor (#6216)
* added FilX

* Fixed Typo

* Merge branch 'main' into FilX

* Merge branch 'main' into FilX
2024-08-02 22:48:11 +08:00
Ocraftyone
b83e16dbdd
Fix Compile Warnings (#5963)
* Fix calls to depreciated wxPen constructor

* Fix use of wxTimerEvent

* Fix unrecognized character escape sequence

* Fix signed/unsigned mismatch

At least as much as possible without significantly altering parts of the application

* Clean unreferenced variables

* fix mistyped namespace selector

* Update deprecated calls

* Fix preprocessor statement

* Remove empty switch statements

* Change int vector used as bool to bool vector

* Remove empty control statements and related unused code

* Change multi character constant to string constant

* Fix discarded return value

json::parse was being called on the object, rather than statically like it should be. Also, the value was not being captured.

* Rename ICON_SIZE def used by MultiMachine

By having the definition in the header, it causes issues when other files define ICON_SIZE. By renaming it to MM_ICON_SIZE, this lessens the issue. It would probably be ideal to have the definitions in the respective .cpp that use them, but it would make it less convenient to update the values if needed in the future.

* Remove unused includes

* Fix linux/macOS compilation

* Hide unused-function errors on non-Windows systems

* Disable signed/unsigned comparison mismatch error

* Remove/Disable more unused variables

Still TODO: check double for loop in Print.cpp

* Remove unused variable that was missed

* Remove unused variables in libraries in the src folder

* Apply temporary fix for subobject linkage error

* Remove/Disable last set of unused variables reported by GCC

* remove redundant for loop

* fix misspelled ifdef check

* Update message on dialog

* Fix hard-coded platform specific modifier keys

* Remove duplicate for loop

* Disable -Wmisleading-indentation warning

* disable -Wswitch warning

* Remove unused local typedefs

* Fix -Wunused-value

* Fix pragma error on Windows from subobject linkage fix

* Fix -Waddress

* Fix null conversions (-Wconversion-null)

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-07-29 21:00:26 +08:00
Duan Gauche
50d646dd41
Added Styrene Butadiene Styrene (SBS) to filament_types (#6217)
Co-authored-by: Duan Gauche <duan.gauche@pdsvision.com>
2024-07-25 22:40:17 +08:00
ElectricalBoy
93ec1dd7ee
Fix typos (#5998)
* Fix typos

* Update translation files appropriately

* Fix more 'fond's with 'found's

* Fix typos

* Fix duplicate message error
2024-07-11 00:04:47 +08:00
SoftFever
b7a0b30578 Pick updates from BS 1.9.3
sync bbl profiles
FIX: [#4320] crash when edit project preset

github: #4320

Change-Id: I81eb5f0d461565d63a32100a5bebb4569cfb0b1b
ENH: add pctg type

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ie01fcd4bef0d3ebec5bbd7185a87a1740068bdba
(cherry picked from commit c6276932dd92bc4283600954415eedeac6d351ce)
ENH: CLI: add logic to save metadata into 3mf from CLI

JIRA: no jira
Change-Id: I7f96c2ab9671ec1c0115e90f6d64230b8170eb38
(cherry picked from commit 3d2d6e23ba318a2b331a62e320f8ca199168f1f5)
2024-06-21 18:21:21 +08:00
cochcoder
467691db5e
Add support for Prusa XL Input Shaper (only one head will print) & add PC-CF, PA11-CF, & PVB filament types (#5511)
* Add Prusa XL & speed profile

* Wrong name

* Fix cover image sizing

* Change infill pattern & density to whats in PrusaSlicer

* Fix filament start G-Code & Add additional info in printer notes

* Add PETG profile

* Link PETG profile

* Add ABS & add bed temps

* Add Prusament PLA & attempt at removing ramming limits

* Allow user to change ramming time & volume

* Revert changing identifier

* Remove invalid ramming variables

* Add Prusament PETG

* Try this

* Revert "Try this"

This reverts commit c6228950fb.

* Revert ramming changes

* Add rPLA, PLA+, PC-CF, PA11-CF, and PVB

* Add PVB profile and other minor improvements

* Add image formats

* Add rPLA profile & remove rPLA & PLA+ from printConfig

* Add Prusament PC-CF & small bug fixes

* Add Prusament ASA, PA-CF, PC, & pa11cf common file

* Minor improvements to common and speed profiles

* Add 0.20mm Quality profile

* Add .3mm Draft process & link .2mm Quality

* Add 0.15mm Quality process

* Add 0.10mm Detail process

* Add 0.07mm UltraDetail profile

* Add 0.5mm nozzle size & related processes

* Set default print profile

* Fix incorrect bridge flow ratio

* Fix incorrect support z distance

* Correct skirt values if enabled

* Add 0.6 & 0.8 nozzles & respective profiles as well as some fixes

* Set default profile for 0.8

* Add 0.25, 0.3, & respective profiles

This also adds all the nozzle sizes to the filament profiles

* Adapt filename format

* Remove unneeded values

* Add Input Shaper

* Fix raft contact distance

* Add Input Shaper profiles to filaments

* List default profiles

* Add printer variant variable

* Change cover sizes & optimize svg

* Fix small filament bug

* Add comment for symmetry

* Add Prusa before XL & XLIS

* Fix failing check

* Fix failing check part 2

* Some small changes

* I've been overthinking this haven't I?

* Could it be this?

* Revert this change

* Try one last thing

* Change naming for XLIS & covers

* Try removing non-IS profiles

* Change IS models

* Remove remnants of non-IS profiles

* Change naming for better consistency
2024-06-08 17:36:00 +08:00
yw4z
c14ae13788
Parameter box improvements (#5119)
* Parameter improvements

• Added "Layers" side text for
	Bottom shell layers
	Number of slow layers
	Top shell layers
• Added "Layer" side text for
	Full fan speed at layer
• Added "x" side text for ratios. This one looks nice imo
	Internal bridge flow ratio
	Bridge flow ratio
	Top surface flow ratio
	Bottom surface flow ratio
	Flow ratio
	Scarf joint flow ratio
• Added "mm" side text for
	Mesh margin
	Minimum wall length
• Added "°C" side text for
	Softening temperature
• Converted these to spin boxes. Currently it combines combo box and input box and it has weird usage. Using spin boxes better because other layer related input boxes uses this too
	Top interface layers
	Bottom interface layers

* Fix for combo boxes without arrows

* Add icon files for Point input boxes

* Add side text for Point controls

* Update width of point controls

* Use TextInput for PointCtrl

* Use TextInput for PointCtrl

* Update style of Point Control

* Better Background color for Disabled elements on dark mode

* Use same color for disabled text on combo boxes

* Use Slightly darker text color for disabled text elements

* Revert changes for Top / Bottom interface layers parameter boxes

* fix build error

* update point control icons

* Remove "x" side text from flow ratio related parameters

* revert color related fixes

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-05-29 23:02:17 +08:00
cochcoder
fd8e1d765b
Add filament vendors (CERPRiSE, FilamentOne, Tianse, and VOXELPLA) & rename Formfortura to Formfutura (#5472)
* Add filament vendors part 1

* Add filament vendors part 2

* Fix merge confilcts

* Readd filament vendors & remove duplicate
2024-05-29 00:32:04 +08:00
Olcay ÖREN
0a4fcf4e2b
Turkish words were edited in the text.js file. (#5473)
* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po

Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* Valment filament added.

* Update OrcaSlicer_tr.po - TURKISH translation update

* Turkish words were edited in the text.js file.
2024-05-28 22:39:58 +08:00
anselor
a1b4e0ce55
Added additional filament vendors. (#5461)
Added Anker printers to filament presets dialog.
Added helper to generate formatted strings for dialog from profile JSON files.
2024-05-26 13:30:51 +08:00
SoftFever
f33b46ed32 update locale 2024-05-21 00:36:45 +08:00