GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,476 Commits 294 Branches 267 Tags
Commit Graph

28476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
j.delarago
bf784dbba0 show star on hover 
CURA-8979
 2022-03-15 15:03:49 +01:00
j.delarago
59b7d20f75 Update ReadOnlyTextArea import 
Update ReadOnlyTextArea style (It's not really read only 🤔)

CURA-8979
 2022-03-15 14:50:02 +01:00
Jaime van Kessel
5fe6f0d1ac Merge branch 'CURA-9007_burger_menu' of github.com:Ultimaker/Cura into CURA-9007_burger_menu 2022-03-15 14:45:04 +01:00
Jaime van Kessel
7148ca5d06 Fix poup rescaling the burgermenu weirdly 
CURA-9007
 2022-03-15 14:42:53 +01:00
j.delarago
495462182c Move background circle into background 
Change burger icon color to correct color for dark+light mode

CURA-9005
 2022-03-15 14:08:28 +01:00
Rijk van Manen
bf131f539e remove all wall_thickness statements 
All print profiles are following the global rules, no print profile specific exceptions. PP-115
 2022-03-15 13:48:41 +01:00
Jaime van Kessel
1ef797a744 Merge branch 'CURA-9039_combobox_open_out_of_window' of github.com:Ultimaker/Cura 2022-03-15 13:24:25 +01:00
Jaime van Kessel
f9814520f7 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8979_Materials_Preference_Page 2022-03-15 11:07:44 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
Jaime van Kessel
93405bdb93 Add identation for the materials preferences page 
CURA-8979
 2022-03-15 10:19:34 +01:00
Rijk van Manen
1bf6243b69 For 0.25 profile increase wall line count to 3 
With this equation the wall thickness better matches the thickness we had before CURA5.0. PP-115
 2022-03-15 09:45:20 +01:00
Rijk van Manen
943e126cb4 set wall thickness to two lines by default 
With this equation the wall line count is two by default and exactly matches the wall thickness that will be printed. PP-115
 2022-03-15 09:44:05 +01:00
j.delarago
067cdda401 Add missing UM import 
CURA-9005
 2022-03-15 09:05:38 +01:00
j.delarago
b04fabb27a Remove focus from SettingItems when scrolling. 
This fixes the issue where you can scroll combobox dropdowns out of the settingView.

CURA-9039
 2022-03-14 17:33:48 +01:00
j.delarago
8a182b1f3f Workaround for windows not giving dialogs the correct width. 
CURA-8921
 2022-03-14 16:41:53 +01:00
j.delarago
ff824b718c Replace burger buttons with generic BurgerButton.qml component. 
Move comment onto newline (Comments on the same line as component names break text folding)

Update burger menu margins in SettingView to match design

CURA-9007
 2022-03-14 16:14:57 +01:00
j.delarago
0b82e9ef31 Remove focus from TextField when incrementing/decrementing using buttons. 
This fixes the issue where the value that was in the textfield before typing would be incremented instead, if the textField had active focus.

CURA-8890
 2022-03-14 14:29:11 +01:00
j.delarago
0ba4dbacc4 Make combobox_wide much wider and swap out existing uses of combobox_wide for combobox. 
CURA-8890
 2022-03-14 13:13:30 +01:00
Jaime van Kessel
c6326eff64 Ensure that "update profile" button in preferences has correct enabled state 
CURA-9023
 2022-03-14 11:56:45 +01:00
Jaime van Kessel
0084001e2f Remove . from button string 
CURA-9023
 2022-03-14 11:47:19 +01:00
Jaime van Kessel
97732336e3 Increase width of dropdown boxes in general page 
CURA-8990
 2022-03-14 11:42:50 +01:00
Jaime van Kessel
ea03236f03 Remove unneeded font assignment 
The default font is, you guessed it, already default.
 2022-03-14 11:40:05 +01:00
Jaime van Kessel
790c2c23c1 Display profile name correctly in dropdown 
CURA-9040
 2022-03-14 11:38:31 +01:00
p.kuiper
a88cb2bb48 I accidently deleted the files while testing the profile changes and committed without them. Restored the files. 
Relates to PP-126
 2022-03-14 11:22:30 +01:00
p.kuiper
6f36998feb Moved the horizontal layer expansion correction (corrects for the bulging of the extruded beads) from the engineering intent profiles to the default profiles for all ultimaker machines (ultimaker.def.json). This will improve the dimensional accuracy of the default, visual and draft intents. 
Relates to PP-126
 2022-03-14 10:53:03 +01:00
Ghostkeeper
cfeb5101e7
Reset Max Skin Angle for Expansion to 90 
It has been found that the 20 degree leads to overhangs that this printer doesn't handle well.

Fixes #11553.
 2022-03-14 02:37:14 +01:00
casper
5136838f56 Update materials list in materials preference page 
Main improvement of this commit is that the reusable category button
component is used as the collapsable header component for the material
brands/types.

CURA-8979
 2022-03-11 16:42:11 +01:00