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

28174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
7926a2bbdc Add placeholders for material & plugin icons 
CURA-8762
 2022-02-22 16:33:52 +01:00
j.delarago
9f75b870a7 Swap "+" and "-" made from Rectangle elements for icons. 
CURA-8688
 2022-02-22 16:18:01 +01:00
Jaime van Kessel
0d85b2be7f Ensure that scrollbar is centered 
CURA-8762
 2022-02-22 16:07:11 +01:00
Jaime van Kessel
a36fedabe5 Remove unused fontMetrics objects 
CURA-8762
 2022-02-22 15:53:07 +01:00
Jaime van Kessel
ac6375d17b Don't nest all content in background rect 
This way we don't have an extra identation depth, makes it a bit easier to read

CURA-8726
 2022-02-22 15:47:48 +01:00
Jaime van Kessel
a05650f64c Fix margins for OnboardBanner 
Re-usable components shouldn't really be setting layout themselves.
This should be done by whomever creates them.

The actual fix is that the banner no longe sets all margins, only left & right

CURA-8726
 2022-02-22 15:44:30 +01:00
Casper Lamboo
e8c4888f93
Merge pull request #11334 from Ultimaker/variable_walls_stitching 
Variable walls stitching
 2022-02-22 15:32:28 +01:00
Tim Kuipers
5d0454c180 Revert "reenable alternate_walls" 
This reverts commit 9b43ab3ad756de3d6f0e1e855bfc5af1928db21f.

The material_alternate_walls setting was supposed to be disabled.
Something to do with hardware.
See CURA- 8079
 2022-02-22 15:29:08 +01:00
Jaime van Kessel
0b39fb1c91 Hide download count in manage page 
CURA-8726
 2022-02-22 15:18:49 +01:00
Jaime van Kessel
adfb78e38a Fix spacing 
CURA-8762
 2022-02-22 15:11:11 +01:00
Jaime van Kessel
80f99b0a59 Fix positioning of marketplace searchbar 
CURA-8762
 2022-02-22 15:03:57 +01:00
Jaime van Kessel
5d28994b87 Use cura styled combobox 2022-02-22 14:47:27 +01:00
Rijk van Manen
9b35dc18b5 material specific exceptions on the defaults 
Some materials can handle higher unretract speeds. Also some unnecessary overwrites of the defaults are removed. PP-96
 2022-02-22 14:24:47 +01:00
Rijk van Manen
5632d85339 PVA can handle high unretract speeds 
Even for the bigger nozzle. PP-96
 2022-02-22 14:22:49 +01:00
Rijk van Manen
fe6a8413c1 follow the machine defaults for AA04 nozzles 
The machine defaults are already geared towards the use of AA0.4 nozzles. PP-96
 2022-02-22 14:22:01 +01:00
Rijk van Manen
cc56f7b577 dont change behaviour of AA08 nozzles 
The retract behaviour for the bigger nozzles is not that good already. We want to take a look at these profiles later and leave them untouched for now. PP-96
 2022-02-22 14:20:16 +01:00
Rijk van Manen
9e96a6edc9 small nozzle size handles fast unretract very well 
This statement is already in the S3 and S5 AA0.25 nozzle cfg file. PP-96
 2022-02-22 14:18:57 +01:00
Rijk van Manen
209ca566cd update definitions of ultimaker2+C, S3 and S5 
These printers have the same feeder and therefore share the same retract settings. The retract speed is set high by default and the unretract speed low by default. This is a safe and good default. PP-96
 2022-02-22 14:16:40 +01:00
Jaime van Kessel
4e880709a7 Remove styles.qml 
We no longer need / have styles due to upgrade to qt 6.2
 2022-02-22 12:03:53 +01:00
Jaime van Kessel
2c6ba3cd5d Update some USB printing items to controls 2 2022-02-22 11:58:14 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
Jaime van Kessel
40a4d617cc Remove unused style 2022-02-22 11:40:23 +01:00
Jaime van Kessel
53331f4757 Remove unused imports 2022-02-22 11:39:00 +01:00
Jaime van Kessel
25d2ed14dd Ensure contentWidth is calculated correctly 
CURA-8948
 2022-02-22 11:31:46 +01:00
Jaime van Kessel
a14c160d86 Expose flickable direction for TableView 
CURA-8948
 2022-02-22 11:28:33 +01:00
Jaime van Kessel
03a9f3e2ee Merge branch 'master' of github.com:Ultimaker/Cura 2022-02-22 11:06:13 +01:00
Jaime van Kessel
b1f2f6af75 Add max values for int settings that didn't have them yet 
Fixes #11514
See also c8b491e9e7915b3e5534dee0d4576d7a1bafca20
 2022-02-22 11:03:46 +01:00
Jaime van Kessel
8cf9fe7941 Add noWrap to all labels in configurationMenu 
CURA-8941
 2022-02-22 10:55:22 +01:00
j.delarago
e75993e7f3 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Preferences/MachinesPage.qml
 2022-02-22 10:41:25 +01:00
j.delarago
d40e91cc08 Remove unneccesary opacity assignment. 
Change padding to styled width

CURA-8688
 2022-02-22 10:37:13 +01:00
Joey de l'Arago
9acf35936b
Merge pull request #11506 from Ultimaker/CURA-8949_preferences_styling 
Styling of preferences screens
 2022-02-22 10:10:21 +01:00
Jaime van Kessel
f8d47489d6
Merge pull request #11505 from Ultimaker/origin-visualization-improvements 
inverted y and z colors
 2022-02-22 09:38:20 +01:00
j.delarago
bc4222c34f Remove comments 
CURA-8688
 2022-02-22 09:16:50 +01:00
j.delarago
0b581c0e32 Update buttons in firmware page. 
CURA-8688
 2022-02-21 16:18:44 +01:00
j.delarago
30ca9ab469 Update spinbox to new design. Add reusable UnderlineBackground Component for background of newly designed elements. 
CURA-8688
 2022-02-21 15:44:16 +01:00
Jaime van Kessel
1632527651 Prevent crash when switching extruder in profiles page 2022-02-21 15:40:08 +01:00
Jaime van Kessel
ba6c0438a1 Fix size of signed out account screen 
CURA-8940
 2022-02-21 15:27:27 +01:00
j.delarago
ab21dcdfd4 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-21 14:19:49 +01:00
Jaime van Kessel
6e8c708f35 Change genericMaterials menu to customized menu 
CURA-8928
 2022-02-21 13:26:14 +01:00
Jaime van Kessel
85926c6f7a Add padding to menu 
CURA-8928
 2022-02-21 13:25:00 +01:00
Jaime van Kessel
b0d944f92d Change all unstyled menuseperators to styled ones 
CURA-8928
 2022-02-21 13:21:51 +01:00
Jaime van Kessel
b79c77cb33 Add left & right padding for MenuSeperator 
CURA-8928
 2022-02-21 13:20:04 +01:00
Jaime van Kessel
c3745b42b6 Switch contextMenu to Cura.Menu 
This fixes all the styling issues that it still had

CURA-8928
 2022-02-21 13:15:09 +01:00
Jaime van Kessel
58d04420ed Ensure that edit & help menu have the right styling 
They were still using the default Qt Menu instead of Cura.Menu

CURA-8928
 2022-02-21 13:13:27 +01:00
Jaime van Kessel
390d12495e Update highlight color of menu 
CURA-8928
 2022-02-21 13:08:53 +01:00
casper
16325229af Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-21 12:02:36 +01:00
Jaime van Kessel
beae4f28f7 Change default sizes of menu 
CURA-8928
 2022-02-21 11:58:21 +01:00
j.delarago
26434f3db9 SettingPickDialog was very wide due to the screen factor scaling being removed. This gives it a fixed width the same as other dialogs. 
CURA-8688
 2022-02-21 11:19:14 +01:00
Jaime van Kessel
1343d7bdf9 Change font of camera rendering label 
CURA-8949
 2022-02-21 11:15:30 +01:00
Jaime van Kessel
b2494f4d2e Change the moreInfo button for slice statistics 
CURA-8949
 2022-02-21 11:07:47 +01:00