Commit graph

32026 commits

Author SHA1 Message Date
casper
10339555f4 Simplify materials preference page by wrapping scroll items in ListView
CURA-8979
2022-03-21 13:20:41 +01:00
casper
9b19eaf84f Add scroll bar to print monitor if content is overflowing
Fixes https://github.com/Ultimaker/Cura/issues/11629

CURA-8980
2022-03-21 11:27:47 +01:00
3d-hctech
ff99087f84 Fix uppercase and lowercase
Fix the uppercase and lowercase confusion issue of extruder files
2022-03-21 18:10:12 +08:00
3d-hctech
694102df54 Fix some error since last
Change some "Unnecessary default_values" , machine ID and start&end Gcode
2022-03-21 17:38:47 +08:00
casper
a4f1907b12 Show Yes and No buttons in abort dialog
CURA-8980
2022-03-21 10:23:05 +01:00
3d-hctech
3495c79bc1
Merge branch 'Ultimaker:master' into master 2022-03-21 16:57:16 +08:00
Tyler Adler
7830cd5bf9 Neptune 2 and 2D
This adds machine_head_with_fans_polygon and gantry height as well as support for neptune 2D
2022-03-20 20:19:19 -07:00
Ghostkeeper
e715017545
Adjust description of Change Retraction for rel. extrusion
A patch-up until we have a real solution, as suggested in #11487.
2022-03-20 19:49:12 +01:00
Jim Duchek
c778f3fa23 Convert estimated time to int 2022-03-20 07:14:55 -06:00
j.delarago
a3892c8147 Remove reference to Cura in UM component
Add isActiveModelFunction that can be overwritten in inheriting components

Override isActiveModelFunction in Profiles page, this is done because quality models do not have a unique id that can be assigned to activeId

CURA-9044
2022-03-18 16:44:56 +01:00
j.delarago
c10865b179 Fixes this error
QML Column: ScrollBar must be attached to a Flickable or ScrollView

by wrapping the Column in a ScrollView the same way that is done for the information page.

CURA-8979
2022-03-18 14:45:03 +01:00
j.delarago
bd91078e6e Accept click events on materials items in materials list
CURA-8979
2022-03-18 14:08:20 +01:00
j.delarago
c6bd020dec Anchor material name to star icon so text doesn't display under star icon.
CURA-8979
2022-03-18 13:58:41 +01:00
j.delarago
c7bb97aa6c Add tooltip to materials list itmes.
CURA-8979
2022-03-18 13:56:19 +01:00
10r3n20
c8f34e26c7 updated image 2022-03-18 13:46:17 +01:00
j.delarago
503f21090e Swap materials page SpinBox for NumericTextFieldWithUnit
This fixes,
filament cost iterating backwards with spinbox ( who knows why it did this )
text not updating when different material selected
value with decimals not saving

Remove margin from NumericTextFieldWithUnit.qml. Not sure why this was present, it made the TextField slightly smaller than the rest.

Remove some parsing str to float/int. Not needed since settings are stored as str

CURA-8979
2022-03-18 13:42:55 +01:00
Tim Kuipers
fabaf2026d reduce testing of bed adhesion size 2022-03-18 09:55:02 +01:00
Tim Kuipers
91a5d154bc allow any material to set the brim extruder to not overridden 2022-03-17 15:27:41 +01:00
Remco Burema
17e18e76d7
Merge pull request #11639 from Ultimaker/more_intuitive_line_thresholds
More intuitive line thresholds
2022-03-17 14:55:59 +01:00
Tim Kuipers
6da67e3d82 remove special case for prime tower brim disallowed area
It's now handled in CuraEngine
2022-03-17 14:41:57 +01:00
Tim Kuipers
4d146e882e remove skirt/brim adhesion size constraint
it is handled by CuraEngine now.
2022-03-17 14:39:24 +01:00
fieldOfView
a79b9c4ef1 Remove material_diameter from quality profiles
Setting the `material_diameter` in a quality profile overrides what is set in the material, and there is no way for the user to override this since `material_diameter` is a hidden "machine" setting. The `material_diameter` is still properly set in the printer definition and the used material, so functionally there is no difference.

(Doesn't) affect XYZ Da Vinci, Tinyboy, Tevo Blackwidow, Nwa3d, Key3d, Kemiq Q2, Katihal, Gmax15+, Flashforge, Crazy3dPrint and AnyCubic printers.
2022-03-17 14:08:21 +01:00
Tim Kuipers
d9282eabdd brim_inside_margin user setting
it allows for removing the brim inside holes completely if set to a high value,
or just keep it a small distance away from internal holes
2022-03-17 11:47:44 +01:00
Tim Kuipers
fb8787f7bd fix: fix wrong placement of prime tower disallowed area
The prime tower should no longer be displaced by the brim width
2022-03-17 11:47:36 +01:00
Tim Kuipers
1f2ca2aa8f Fix limit_to_extruder for skirt_brim_extruder 2022-03-17 11:43:48 +01:00
Joey de l'Arago
fcfc47920f
Merge pull request #11674 from Ultimaker/CURA-9039_combobox_open_out_of_window
[CURA-9039] fix combobox scrolling out of view
2022-03-17 07:46:56 +00:00
Jaime van Kessel
40fc587d64
Merge pull request #11675 from Ultimaker/PP-115_unify-wall-thickness
PP-115_unify-wall-thickness
2022-03-16 17:04:22 +01:00
10r3n20
044c3e9da2 updated splash screens 2022-03-16 17:03:03 +01:00
Remco Burema
7dfcac7bbe
Merge pull request #11663 from Ultimaker/CURA-9007_burger_menu
[CURA-9007] Update Burger Menus
2022-03-16 15:59:32 +01:00
Jaime van Kessel
f0bfe4f3a2 Merge branch 'PP-126_set_horizontal_expansion' of github.com:Ultimaker/Cura 2022-03-16 15:53:32 +01:00
Remco Burema
f4e57b82f8
Merge pull request #11664 from Ultimaker/CURA-8921
[CURA-8921] Workaround for windows not giving dialogs the correct width.
2022-03-16 15:29:32 +01:00
Remco Burema
51752d162c
Merge pull request #11635 from Ultimaker/CURA-8981_resolve_for_interface_and_raft_extruder
Add resolve values for raft & interface extruders
2022-03-16 14:46:20 +01:00
j.delarago
84d7443c18 Change OnYChanged out for OnPositionChanged inside scrollbar. Makes a bit more sense logically and this can be reused in ScrollViews as well.
Added OnPositionChanged to General Page
CURA-8979
2022-03-16 13:59:22 +01:00
Tim Kuipers
1bd6cbb3d6 remove brim max
With the new brim algorithms the brim will never be generated outside of the volume.
It's nice to be able to input 9999 if you want the brim to cover the whole build plate...
... for testing purposes ;)
2022-03-16 11:31:41 +01:00
Tim Kuipers
0339e4f1ca reduce clearance needed between prime tower and models
With the new implementation we don't need that much clearance.
2022-03-16 11:31:40 +01:00
Tim Kuipers
33e3a45b5c fixes for optional skirt_brim_extruder_nr 2022-03-16 11:31:40 +01:00
Tim Kuipers
2698cd76c5 make skirt_brim_extruder_nr an optional_extruder to allow for the brim_per_material feature 2022-03-16 11:31:40 +01:00
Tim Kuipers
a35a38c684 fix inclusion of brim_gap in TestBuildVolume 2022-03-16 11:31:40 +01:00
Tim Kuipers
f7049ca3ea fix disallowed areas taking brim_gap into account 2022-03-16 11:31:40 +01:00
Jaime van Kessel
daa4c20df4 Use intConversion instead of Str for extruder & optionalExtruder
CURA-8981
2022-03-16 11:08:28 +01:00
Jaime van Kessel
0388dad59f
Merge pull request #11671 from Rolzad73/master
- fixed snapmaker2 End-Gcode definition for Z return variable
2022-03-16 09:44:50 +01:00
Rolzad73
5a12265446 - fixed snapmaker2 End-Gcode definition for Z return variable 2022-03-15 16:56:06 -04:00
Jaime van Kessel
d8f6173dd9
Merge pull request #11660 from Ultimaker/CURA-8890_combobox_width
[CURA-8890] combobox width
2022-03-15 16:51:02 +01:00
Jaime van Kessel
74e46c6009 Merge branch 'CURA-8945_spinbox_behaviour' of github.com:Ultimaker/Cura 2022-03-15 16:44:57 +01:00
Rijk van Manen
d9cc755f94 restore old top_bottom_thickness
Since we changed wall thickness, but do not want to change the top_bottom_thickness these values need be set hardcoded. PP-115
2022-03-15 16:43:14 +01:00
Rijk van Manen
cf7f48f622 forgot to remove one statement
PP-115
2022-03-15 16:26:15 +01:00
j.delarago
4b853b89bd Fix typo
CURA-8979
2022-03-15 16:23:18 +01:00
j.delarago
9dbc497fcb Move TabRow below so it renders over the top lining of content rectangles.
Update Tab styles to match designs

CURA-8979
2022-03-15 16:19:33 +01:00
j.delarago
b33a5d7b84 Add space, so content isn't bellow scrollbar
CURA-8979
2022-03-15 15:54:50 +01:00
j.delarago
99f9918db5 Remove Italics
CURA-8979
2022-03-15 15:05:26 +01:00