Commit graph

136 commits

Author SHA1 Message Date
Noisyfox
af32339e1a Update color & text 2025-10-15 20:10:40 +08:00
Noisyfox
6f36556eaa Merge branch 'main' into dev/h2d-2
# Conflicts:
#	src/slic3r/GUI/Preferences.cpp
2025-10-15 19:43:14 +08:00
yw4z
0493ed03a5
Preferences dialog redesign / improvements / fixes (#10665)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
* init

* update

* update

* update

* update

* tooltips

* update

* fix tab colors

* update

* Update Preferences.cpp

* Update Preferences.cpp

* Update Preferences.cpp

* Update Preferences.cpp

* update "Auto backup" and "Downloads folder"

* cleanup

* update

* update

* update

* update

* update

* update

* Update Preferences.cpp

* update

* update

* update

* update

* Update MainFrame.cpp

* Update text.js

* log level selection

* move NetworkTestDialog to cpp

* Update Preferences.cpp

* Update Preferences.hpp

* cleanup create_item_switch

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-10-15 17:34:08 +08:00
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
Stone Li
5de5db5b99 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
xun.zhang
6f5ea725dc ENH: add new way to set bed temperature
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I99a9f67e9b13b2137ad371b22cf0999ccf9c096d
(cherry picked from commit 69c2947daf66eb0a6732b1b980c9b87f597c8da7)
2025-09-17 16:22:05 +08:00
zhimin.zeng
194f52fb88 FIX:Add Button to restore the pop-up window which is not show again
jira: STUDIO-9734
Change-Id: I33280f747b095dbd1de1643c04c900365c36e922
(cherry picked from commit 9304073ecb6b16997bc89a19aa0fd2008922210f)
2025-09-17 15:48:58 +08:00
jiangkai.zhao
e85fc25690 ENH: update translation
jira: none
Change-Id: Iceeaf2d9bb93fcee4fadfdfc2a5f1f7ab4a0b684
(cherry picked from commit 2421cd430df8c2bd9c632c303388afb5b7064ee0)
2025-09-17 15:13:02 +08:00
xun.zhang
e5e95d48cc FIX: filament map UI issues in mac
1.Also remove a useless otion in preferences page

jira:STUDIO-10472

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6c7052522f7c797fca35decb68879694cc1142b9
(cherry picked from commit 02b4fe96a121f7bff1b30ddf73ff99f2b7e6d6f3)
2025-09-17 11:41:03 +08:00
xun.zhang
0af34f4324 ENH: enhance auto flush option
1.Support auto flush when change printer and nozzle volume type

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9dfc2fff095bbf1901afe99556d1e57aa225f482
(cherry picked from commit f12305832227940eb0eae05817ad046dd4eff02d)
2025-09-17 11:39:56 +08:00
zhimin.zeng
27b16455b7 ENH:remove restrictions on mixed use of high and low temp filaments
jira: STUDIO-10482
Change-Id: Ifdf6f11b45f2e6d138ea615a3ad1f23d40ad3fe9
(cherry picked from commit 0178e930809cabcdbc09ab305e70e4323598b343)
(cherry picked from commit 8f92391717e37dd0f51aa067ad626b83630a46b1)
2025-09-17 11:36:18 +08:00
xun.zhang
c605f73d80 ENH: update translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9b260cb3e21b9052c9a2d65378bd0e795f6db6f3
(cherry picked from commit 2507eba37d5f09cca51b3e9f9f281b2208e57eb1)
2025-09-10 15:02:23 +08:00
xun.zhang
fc09eb2138 ENH: temperoraily disable map dialog after slice
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6d3d90db3508642e0e56015296d3efd50248bd05
(cherry picked from commit 3ddc30a60a36c531b004b7bacc0c583f9d6add3d)
2025-09-09 17:17:07 +08:00
xun.zhang
9732c0b845 ENH: some tip logic optimize
1. Only check printablily if have explicit filament map
2. Refine some sentences

jira:STUDIO-9753,STUDIO-9727

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2fc3aa2276dc6f514c50ac2fcaf9509f41e778f3
(cherry picked from commit 73f92d27dab667c8893ab96e47f3832ce9d2de60)
2025-09-09 17:16:41 +08:00
xun.zhang
897a78ce9a ENH: refine the logic of filament map dialog
1. Always change the map and mode in plate if plate mode is not default
2. Always add pop up before slice
3. Fix the mapping issue in gcode viewer

jira: studio-9523,studio-9519,studio-9513,studio-9479

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0d7d5daf081951ea2d49e06565762ac24064e77c
(cherry picked from commit afaa48520e16b6808f05e511ac1cfe91acadc84b)
2025-09-09 11:03:56 +08:00
xun.zhang
a91937a7f8 ENH: modify some sentences for translate
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6ba3de47566c73ee8d6f8f5f24c854b9599dc073
(cherry picked from commit f858d6c7a8509d3b798bca40cb07eb63ab6efcc0)
2025-09-06 23:53:37 +08:00
xun.zhang
057a1a4f5d ENH: refine ui logic with filament group
1. Add filament group pop up when slice
2. Add more filament modes in filament dialog
3. Add capsule button

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8bc3a2e08696e406b89e550a0335a1a36728ee65
(cherry picked from commit f1702a5c3604f685a3b35ea0e83d29bdbbd90f70)
2025-09-06 23:52:20 +08:00
Vovodroid
5fa35342fd
Add stl, step, etc. to recent list (#9481)
* Add stl, step, etc. to recent list

* Make configurable

* Merge branch 'main' into recent-files-pr
2025-08-24 00:24:30 +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
Noisyfox
9988d0a1f8
Merge branch 'main' into dev/bbl-network-upd 2025-06-25 08:49:55 +08:00
Kiss Lorand
5707f8f4a5
Swap pan and rotate mouse buttons (#9972)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
* Swap pan and rotate buttons

* Add translation
2025-06-24 23:41:41 +08:00
Noisyfox
d60fcb0d11 Merge branch 'main' into dev/bbl-network-upd
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
2025-06-21 10:27:10 +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
Noisyfox
9444d61bb6
Merge branch 'main' into dev/bbl-network-upd 2025-06-01 19:33:39 +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
Noisyfox
0d61ae87ed Fix typo 2025-05-23 15:31:09 +08:00
Noisyfox
05a0703120 Merge branch 'main' into dev/bbl-network-upd
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
2025-05-17 00:22:09 +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
461d42635f Add option to toggle between legacy and new network plugins 2025-05-01 16:23:56 +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
sharanchius
3612d8e4eb
Finished Lithuanian translation - OrcaSlicer_LT.po (#9000)
# Description

Finished Lithuanian translation
Still some work with *.js (C:\Program
Files\OrcaSlicer\resources\web\***) files:


![image](https://github.com/user-attachments/assets/b6c47fe8-fef0-4249-93e3-bd553678dfa6)
****

Not found where can add Lithuanian language into preferences menu:

![image](https://github.com/user-attachments/assets/ea02a8e5-6464-4c59-b127-caffa9ca7d12)


<!--
> Please provide a summary of the changes made in this PR. Include
details such as:
  > * What issue does this PR address or fix?
  > * What new features or enhancements does this PR introduce?
> * Are there any breaking changes or dependencies that need to be
considered?
-->

# Screenshots/Recordings/Graphs


![image](https://github.com/user-attachments/assets/de541508-7abe-40c3-9bfc-e10dd4f725f7)

<!--
> Please attach relevant screenshots to showcase the UI changes.
> Please attach images that can help explain the changes.
-->

## Tests

Used internal Poedit tests and alredy loaded this language for my
working program interface.
<!--
> Please describe the tests that you have conducted to verify the
changes made in this PR.
-->
2025-04-10 14:02:38 +08:00
SoftFever
b1de545ff9
Merge branch 'main' into dev/step-import-dialog 2025-04-05 17:47:59 +08:00
Graham Held
933b282c53
Add in a pref for camera orbit speed multiplier (#8725)
Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-03-30 16:16:08 +08:00
Mack
0bc2444079 ENH:Add 'Don't show again' to the step mesh
jira: STUDIO-8606
Change-Id: I2382b9052e2c994a458ad36ca61eb94c517927c6
(cherry picked from commit 0cce6619ce12aa8540f6dfca6d9ee79ffba65c19)
2025-03-27 22:17:07 +08:00
Sims
cc92abf8b5
Implement #8106: Add setting to prevent loading printer information/project settings from .3mf (#8268)
* Initial implementation

* Add remember option to open project/load geometry only popup

* PR Feedback
2025-02-09 09:51:36 +08:00
Henri van der Riet
5b0ddbd5f7 merge conflicts 2024-09-08 01:04:19 +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
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
Robert Schiele
7bbffaa996
more missing includes (#6398)
Here are more missing header files recently identified by building
without precompiled header support.
2024-08-09 21:33:09 +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
Ocraftyone
c08126703c
Fix Preferences dialog sizing on multi monitor setups (#5820) 2024-07-29 00:15:16 +08:00
Vovodroid
45224eee21
Auto arrange plate after cloning (#6009)
* Auto arrange plate after cloning
2024-07-11 23:54:42 +08:00
Ocraftyone
5c9b82d6ec
Update Web Link Association in Preferences (#5791)
* Fix check_url_association return value

* Update Web Link Association Preferences

Uses a checkbox in place of button to show if the current instance is registered at a quick look
New function is added to build the link association item
Current association line shows "None" for no app associated, "Current Instance" if the current instance is associated, and the formatted path to the registered app (Removes quotes and other extra chars)

* Update to use localization

* Fix Linux Build

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-06-21 21:06:12 +08:00
SoftFever
c8915464f5 fix build errors on Linux 2024-05-29 00:04:54 +08:00
SoftFever
524efcfcca support cura:// and thingiverse 2024-05-28 23:08:26 +08:00
SoftFever
6519e850ef support makerworld.com 2024-05-28 23:08:26 +08:00
SoftFever
7725fbeb90
Printables.com support (associate prusaslicer:// link explicitly) (#5416)
* Enable ability to open `prusaslicer://` links

* Add needed function to miniz

* Import Zip Functionality

Allows zip file to be drag and dropped or imported via the menu option

Based on prusa3d/PrusaSlicer@ce38e57 and current master branch files

* Update dialog style to match Orca

* Ensure link is from printables

* add toggle option in preferences

doesn't actually control anything yet

* Add Downloader classes

As-is from PS master

* Create Orca Styled Variant of Icons

* Add Icons to ImGui

* Use PS's Downloader impl for `prusaslicer://` links

* Implement URL Registering on Windows

* Implement prusaslicer:// link on macOS

* Remove unnecessary class name qualifier in Plater.hpp

* Add downloader desktop integration registration and undo

* Revert Info.plist

* register prusaslicer:// on user request only

* fix build error

* fix single instance problem

* format

* add orcalicer:// handler for Mac
Attempt to add Linux support but seems not working

---------

Co-authored-by: Ocraftyone <Ocraftyone@users.noreply.github.com>
2024-05-22 15:26:52 +08:00
Ocraftyone
a764d836e1
ENH: Open Prinables.com Links and Zip Archives (#3823)
* Enable ability to open `prusaslicer://` links

* Add needed function to miniz

* Import Zip Functionality

Allows zip file to be drag and dropped or imported via the menu option

Based on prusa3d/PrusaSlicer@ce38e57 and current master branch files

* Update dialog style to match Orca

* Ensure link is from printables

* add toggle option in preferences

doesn't actually control anything yet

* Add Downloader classes

As-is from PS master

* Create Orca Styled Variant of Icons

* Add Icons to ImGui

* Use PS's Downloader impl for `prusaslicer://` links

* Implement URL Registering on Windows

* Implement prusaslicer:// link on macOS

* Remove unnecessary class name qualifier in Plater.hpp

* Add downloader desktop integration registration and undo

* Revert Info.plist

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-05-22 10:52:34 +08:00