GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 20:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,353 Commits 290 Branches 260 Tags
Commit Graph

28353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
d7d6918ab7 Use CuraMenu so that custom styling is used 
CURA-8683
 2022-01-14 15:01:48 +01:00
Jaime van Kessel
4db8878317 Fix ordering of material menu selection 
CURA-8683
 2022-01-14 14:33:46 +01:00
Jaime van Kessel
babf3043f8 Use Cura.Menu instead of UM.Menu 
Same as the previous commit. Use the specialised variant provided by Cura instead
of the generic one of UM

CURA-8683
 2022-01-14 13:50:44 +01:00
Jaime van Kessel
3130ea0f74 Use Cura.MenuItem instead of UM.MenuItem 
I didn't realise that Cura already had a menu item. To prevent
Confusion, i've changed Cura.MenuItem to use UM.MenuItem and let all
other menus use Cura.MenuItem
 2022-01-14 13:46:05 +01:00
Jaime van Kessel
bab9311284 Fix opening of marketplace button 
CURA-8684
 2022-01-14 13:14:15 +01:00
Jaime van Kessel
38e20fd90b Fix menuItem not hiding correctly 
CURA-8693
 2022-01-14 13:09:59 +01:00
Jaime van Kessel
b614cabae6 Put back import 2022-01-14 13:05:07 +01:00
Casper Lamboo
404e02d585
Merge pull request #11251 from Ultimaker/CURA-8868_raft_interface_extruder 
Raft Extruders
 2022-01-14 09:11:07 +01:00
Casper Lamboo
41f1029dc0
Use updated python type notation 2022-01-14 09:07:41 +01:00
Casper Lamboo
732aefedbb
Change label to "Raft Top Extruder" 
To be consistent with Cura's terminology
 2022-01-14 09:05:18 +01:00
Ghostkeeper
73a151ab49
Put focus on search bar when Digital Library opens 
Fixes CURA-8768.
 2022-01-13 13:55:42 +01:00
Ghostkeeper
69d3f0e6f6
Add missing default_value and settable_per_mesh 
Default_value is a required property. Maybe we should have a test for this.

Done as a 5 minute fix. Fixes Ultimaker/CuraEngine#1549.
 2022-01-13 12:02:59 +01:00
Jaime van Kessel
313c10801d Codestyle fixes 2022-01-13 09:23:13 +01:00
Jaime van Kessel
13af43b76c Fix context menu visibility for settingview 
CURA-8683
 2022-01-13 09:19:47 +01:00
Jaime van Kessel
97bf50d56c
Merge pull request #11236 from Ultimaker/CURA-8683_replace_controls_windows_and_menus 
Switch out the file, view and edit menu for controls 2
 2022-01-13 09:08:37 +01:00
Jaime van Kessel
94c006009b Remove debug code 
CURA-8683
 2022-01-13 09:06:22 +01:00
杜建树
ddcfd9413a change definition names 2022-01-13 12:01:26 +08:00
Ghostkeeper
f4bcf9d89e
Add more settings for test of build volume limits 
These new settings are necessary or the test will get exceptions that these settings don't exist.

Contributes to issue CURA-8868.
 2022-01-12 17:55:33 +01:00
Jaime van Kessel
bf65f77310 Merge branch 'CURA-8683_replace_controls_windows_and_menus' of github.com:Ultimaker/Cura into CURA-8683_replace_controls_windows_and_menus 2022-01-12 16:01:19 +01:00
Jaime van Kessel
94c71704db Add clarifying comment about why something is added at index 5> 
CURA-8683
 2022-01-12 16:00:32 +01:00
Jaime van Kessel
f44d4d341f
Apply suggestions from code review 
Minor codestyle issues

CURA-8683

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-01-12 15:57:20 +01:00
Ghostkeeper
403d92a760
Fix getting used and starting extruders with new adhesion extruder settings 
Getting more involved than I thought. But it's not complex yet.

Contributes to issue CURA-8868.
 2022-01-12 14:29:01 +01:00
Ghostkeeper
a363bda25e
Add raft top extruder to expert settings 
You could want to change that if you're an expert. The skirt/brim extruder is really only relevant for the prime tower brim if you're using a raft. If not using a raft, setting the adhesion extruder is equivalent.

Contributes to issue CURA-8868.
 2022-01-12 14:12:06 +01:00
Ghostkeeper
304f57293d
Adjust build volume depending on new adhesion extruder sub-settings 
It should get these settings from the correct extruders even if they are different from one another.

Contributes to issue CURA-8868.
 2022-01-12 14:09:57 +01:00
Ghostkeeper
262a005e54
Get extruder values from appropriate sub-adhesion-extruder 
The adhesion extruder is now split up into multiple sub-settings. Where applicable to the brim or skirt, get it from the skirt/brim extruder. Where applicable to a specific part of the raft, get it from that part's extruder. Where applicable to the whole raft, get it from the adhesion extruder.

Contributes to issue CURA-8868.
 2022-01-12 13:52:47 +01:00
Ghostkeeper
824c9fd837
Add new raft extruder settings 
We want to be able to print the layers of the raft with different extruders. To this end, we'll make sub-settings of the adhesion extruder that allow setting the extruder for each part of the raft differently from the rest.

Contributes to issue CURA-8868.
 2022-01-12 13:43:10 +01:00
Remco Burema
a1622c77ea
Merge pull request #11246 from gferon/patch-1 
Remove unused import of sentry_sdk
 2022-01-12 09:25:36 +01:00
AnnaKang0219
e39601e0ba remove setting 
remove retraction_prime_speed = =retraction_speed in all profiles.
 2022-01-12 15:23:24 +08:00
杜建树
4dee92f04c change the definition file names to be lowercase with underscores 2022-01-12 11:14:14 +08:00
Mingda_js
7cfcec09b0
Merge branch 'Ultimaker:master' into master 2022-01-12 09:21:51 +08:00
Gabriel Féron
aad41807c3
Remove unused import of sentry_sdk 2022-01-11 20:28:41 +01:00
Ghostkeeper
5eee9958a0
Case-insensitive visibility checking for printers 
In Qt's ListModel, the section headers collect items case-insensitively. However, when checking whether a printer should be visible (when the section header is expanded) was still checked case-sensitively. As a result, it was hiding all printers that did not use the same casing in its manufacturer name, e.g. FlashForge vs. Flashforge.

Fixes #11125.
 2022-01-11 16:29:40 +01:00
Ghostkeeper
66648ca611
Merge branch '4.13' 2022-01-11 14:12:04 +01:00
Ghostkeeper
020b8f7510
More consistent header for change log 2022-01-11 13:24:29 +01:00
Jaime van Kessel
59479ee223 Fix checked property for materials menu 
CURA-8683
 2022-01-11 12:09:24 +01:00
Jaime van Kessel
6644bff2be Fix some QML warnings on closing Cura 
CURA-8683
 2022-01-11 11:52:43 +01:00
Jaime van Kessel
3d0e71fe7e Remove unused import 2022-01-11 11:44:59 +01:00
Jaime van Kessel
f8906597e5 Update menu for PrinterType button 
CURA-8683
 2022-01-11 11:43:01 +01:00
Jaime van Kessel
b30ad58f91 Update context menu to controls 2 
CURA-8683
 2022-01-11 11:36:34 +01:00
Jaime van Kessel
70209aa728 Use the regular menu for extensions 
It seems that the extra logic doesn't play well with a menu bar.

Since we don't need to make this menu invisible ever, there is no need for the
extra logic to hide it. As such we can just use the regular menu

CURA-8683
 2022-01-11 11:26:26 +01:00
Jaime van Kessel
0bd0f09437 Remove unused component 
CURA-8683
 2022-01-11 11:26:05 +01:00
Jaime van Kessel
29c9322fc8 Add background to application menu 
CURA-8683
 2022-01-11 11:16:40 +01:00
Jaime van Kessel
6cde2d028b Convert preferences & help menu to controls 2 
CURA-8683
 2022-01-11 11:10:12 +01:00
Jaime van Kessel
d1461c5d7f Add extension menu to application menu 
CURA-8683
 2022-01-11 11:07:12 +01:00
Ghostkeeper
c328f3619d
Added bugfix for QT_PLUGIN_PATH 4.13.0 2022-01-11 10:43:44 +01:00
Ghostkeeper
8c7f0d2c2d
Merge branch 'CURA-8475_nil_qt_plugin_path' into 4.13 2022-01-11 10:40:54 +01:00
Jaime van Kessel
2bad5c5cd3 Update the settings menu to controls 2 
CURA-8683
 2022-01-11 10:31:39 +01:00
Remco Burema
8b7403c2f6
Also ignore QML2_IMPORT_PATH. 
More secure.

part of CURA-8475
 2022-01-11 10:29:21 +01:00
Ghostkeeper
f3c3f3187e
Merge branch '4.13' 2022-01-11 10:05:15 +01:00
Ghostkeeper
b804d08be4
Merge branch 'CURA-8876' into 4.13 2022-01-11 10:05:04 +01:00