GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-19 22:43:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,734 Commits 295 Branches 268 Tags
Commit Graph

14353 Commits

Author SHA1 Message Date
j.delarago
b4edb89eb8 Align menubar colors with new designs. 
CURA-8688
 2022-02-28 10:21:16 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
杜建树
46018b12a0 Add the meshes to Magician printer 2022-02-26 20:01:20 +08:00
Mingda_js
9e7aca8244
Merge branch 'Ultimaker:master' into master 2022-02-26 19:51:23 +08:00
j.delarago
17cab9946d Dark theming 
CURA-8688
 2022-02-25 18:18:43 +01:00
j.delarago
7ea0167486 Remove border highlight on hover over menu items, as per new designs 
CURA-8688
 2022-02-25 15:54:51 +01:00
j.delarago
7bbea62558 Add base_colors to theme 
If the value of a color is a string, there will be an attempt to fetch this color from base_colors.

CURA-8688
 2022-02-25 14:56:24 +01:00
Jaime van Kessel
c356d37e06 Remove monitor_icon_size from theme 2022-02-25 14:32:34 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties 
No idea why this was even done, but there just isnt' a reason to use these.
 2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
1589475dd4 Remove a slew of unusued colors in the theme 2022-02-25 13:54:50 +01:00
Jaime van Kessel
ff0b64a56a Purge bunch of unused sizes from theme 2022-02-25 13:33:32 +01:00
j.delarago
aba025b5b6 Unify dialog background coloring. 
CURA-8988
 2022-02-25 13:32:02 +01:00
Jaime van Kessel
5f638ed6c6 Generalize the size of the licence window 
No need to have a seperate size of the licence window. Just use
the default modal one
 2022-02-25 13:22:55 +01:00
Jaime van Kessel
b3d3f5546c Remove objectlist items from theme 
THey weren't used anyway, so time to clean up!
 2022-02-25 13:19:59 +01:00
Jaime van Kessel
9d202b9e61 Remove unused monitor items from theme 2022-02-25 13:18:45 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin 
No idea why it was even there as it's own size.
 2022-02-25 13:16:59 +01:00
casper
2d4a389825 Fix dark mode issues for about dialog 
CURA-8688
 2022-02-25 12:12:57 +01:00
Jaime van Kessel
93a5c44e6c
Fix codestyle 
CURA-8978

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-02-24 17:22:10 +01:00
casper
2761aed455 Make number of columns configurable in color dialog 
CURA-8938
 2022-02-24 15:45:10 +01:00
casper
7dbe5c0f7c Change some margins 
CURA-8938
 2022-02-24 15:44:46 +01:00
casper
9b06849955 Let the content of the color dialog determine the size of the dialog 
CURA-8938
 2022-02-24 15:43:22 +01:00
casper
301d68ebf2 Update swatches on swatch color property changed 
CURA-8938
 2022-02-24 15:42:27 +01:00
Jaime van Kessel
6e59cd23bb Fix hide / show all in setting visibility page 
CURA-8978
 2022-02-24 15:32:39 +01:00
Jaime van Kessel
96751a0cc0 Merge branch 'CURA-8980_fix_monitor_buttons' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 15:22:15 +01:00
j.delarago
61beb963c2 Swap flat buttons for Cura Styled buttons. 
These "buttons" function like radiobuttons so a bit of extra styling needed to be added to swap appearance.

Removed fixed width as it breaks centering with Cura buttons

CURA-8980
 2022-02-24 14:58:07 +01:00
Jaime van Kessel
f9e6135fca Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 13:44:21 +01:00
Evangelos Trantos
a2ce010ec1
Merge pull request #11521 from Ultimaker/CURA-8928_menu_visual_fixes 
Menu visual fixes
 2022-02-24 13:22:56 +01:00
j.delarago
41e04f2e9d Progress bar causing crash due to incorrect min max value variable names. 
Give buttons fixed leftMargin in monitor page so icons are center aligned.

CURA-8980
 2022-02-24 11:34:48 +01:00
ANYCUBIC-3D
b116b29f67 remove metadata:icons 2022-02-24 14:52:53 +08:00
Lafinger
48b08e06a4 change 'outer_inset_first = true' to 'inset_direction = outside_in' 2022-02-24 14:18:57 +08:00
j.delarago
4510a8b06e Down spinbox button highlighting up spinbox button when clicked. 
CURA-8688
 2022-02-23 15:15:46 +01:00
j.delarago
b14e29d214 Make general menu combox wider 
CURA-8688
 2022-02-23 15:13:36 +01:00
j.delarago
111c095f32 Swap RadioButton for styled Cura.RadioButton 
CURA-8688
 2022-02-23 15:04:58 +01:00
casper
6f27199bb9 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-23 14:09:58 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
j.delarago
c3abfec535 Combobox height/width was being resized by RowLayout causing it to be squished. Assigned a implicit width/height which is used instead of height/width. 
CURA-8688
 2022-02-23 12:00:11 +01:00
Jaime van Kessel
6cbcf09580 Merge branch 'PP-96_update-(un)retract-speeds' of github.com:Ultimaker/Cura 2022-02-23 10:30:00 +01:00
ANYCUBIC-3D
0d4c77d5c0 add 3d printer profile for Anycubic Kobra and Anycubic Kobra Max 2022-02-23 10:49:02 +08:00
j.delarago
9f75b870a7 Swap "+" and "-" made from Rectangle elements for icons. 
CURA-8688
 2022-02-22 16:18:01 +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
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