3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28014 commits 313 branches 275 tags 718 MiB
Commit graph

28014 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
f7dc2fc2d1 Merge branch 'materials_sync' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:13:15 +01:00
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
266214d651 Merge branch 'Ip_adress_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:08:02 +01:00
Jaime van Kessel
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Jaime van Kessel
c528616d12 Set selection color of textfields 
CURA-8947
 2022-02-17 14:39:11 +01:00
Jaime van Kessel
e66628e2da Merge branch 'CURA-8031_modifier_meshes_in_one_at_a_time_mode' of github.com:Ultimaker/Cura 2022-02-17 14:18:54 +01:00
Jaime van Kessel
614fe6fd4f
Merge pull request #11023 from NilsRo/master 
Update anycubic_i3_mega_s.def.json

CURA-8971
 2022-02-17 09:48:25 +01:00
Jaime van Kessel
bed290e968
Merge pull request #11486 from Ultimaker/origin-visualization-improvements 
Origin visualization improvements
 2022-02-17 09:27:05 +01:00
j.delarago
61ba4426ad Add check for build plate number to modifier mesh list. 
CURA-8031
 2022-02-16 16:05:43 +01:00
j.delarago
a9a533b61d Duplicate modifier meshes for all objects in one at a time mode. 
CURA-8031
 2022-02-16 15:15:31 +01:00
Ghostkeeper
5fc89b6053
Merge branch 'patch-1' of https://github.com/inigoml/Cura into inigoml-patch-1 2022-02-16 12:46:47 +01:00
10r3n20
4383f2ddf2 adjusted colors and size of origin gizmo 2022-02-15 16:45:57 +01:00
10r3n20
a9e3acb623 adjusted buildplate grid color 2022-02-15 16:26:27 +01:00
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address 
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
 2022-02-15 09:29:32 +01:00
NilsRo
dec31d7f44 Update anycubic_i3_mega_s.def.json 
Deleted travel_compensate_overlapping_wall as property is removed
 2022-02-14 19:22:23 +01:00
Evangelos Trantos
84d9d5bec4
Embed more sizes in the ico file so that it looks better 2022-02-14 11:15:19 +02:00
Jaime van Kessel
9b23d3ac9a
Add drawing of how per object stacks work 2022-02-14 09:30:27 +01:00
Jaime van Kessel
b9feac9816
Merge pull request #11460 from Ultimaker/CURA-8687_dialogs 
Replace Dialogs in preparation for Qt 6.x upgrade
 2022-02-11 15:04:01 +01:00
casper
3f658a4914 Change UM.Dialog to Controls.Dialog in connect to printer by ip window 
As `UM.Dialog` is opened using in a new window, the error-confirmation
that was displayed in a `UM.Dialog` was displayed _behind_ the window
object.

CURA 8687
 2022-02-11 14:37:32 +01:00
Superbrain8
fda6758042
Added Nylon quality presets for the Artillery Printer (#11463) 
* Added Definitions for Nylon

CURA-8952
 2022-02-11 14:09:49 +01:00
casper
ca0d84dcae Always prefix text in ColorDialog with a hashtag 
CURA 8687
 2022-02-11 13:48:57 +01:00
casper
959caece90 Make input field in ColorDialog selectable by mouse 
CURA 8687
 2022-02-11 13:45:03 +01:00
Jaime van Kessel
cfb0604067 Clarify some documentation in the PerObjectSettingVisibilityHandler 
We often used shorthands for stack / instance / definition, but this made it
harder for people that are very familiar with the code to understand what is
going on.

Contributes to #11455
 2022-02-11 13:40:21 +01:00
casper
86392ab471 Remove empty file 
CURA 8687
 2022-02-11 13:31:19 +01:00
casper
2edd634909 Provide a title with the color picker 
CURA 8687
 2022-02-11 13:27:41 +01:00
casper
7f95dc98e6 Translate text within the color picker 
CURA 8687
 2022-02-11 13:27:29 +01:00
casper
46fac4263b Fix styling issues in the material sync dialog 
CURA 8939
 2022-02-11 13:10:24 +01:00
Casper Lamboo
5063b84c9a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:12 +01:00
Casper Lamboo
8c0b0ddc5b
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:03 +01:00
Casper Lamboo
02f648d40a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:54 +01:00
Casper Lamboo
b2f3b365c9
Remove setting duplicate properties of UM.Label default settings 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:30 +01:00
Jaime van Kessel
c1d5526537 Add some documentation to ColorDialog 
CURA-8687
 2022-02-11 11:08:11 +01:00
casper
91c95a0ed6 Remove duplicate function 
CURA 8687
 2022-02-11 10:47:37 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs 
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
 2022-02-11 10:44:52 +01:00
casper
1eabf251f4 Remove unused function 
CURA 8687
 2022-02-10 18:07:42 +01:00
casper
fca6ef29ae Move ColorDialog to Cura repo 
Move component to the Cura repo as `Cura.SecondaryButton` and
`Cura.PrimaryButton` are used.

CURA 8687
 2022-02-10 18:06:43 +01:00
j.delarago
9bad66b6ce Add custom ColorDialog.qml with simple hex value selector. 
Cura-8681
 2022-02-10 17:28:29 +01:00
Jaime van Kessel
7abe62a8ec Fix weird wrapping in monitor page 2022-02-10 11:29:14 +01:00
Jaime van Kessel
f15f01e32f Fix styling of visibilityPresetCombobox 2022-02-10 11:24:07 +01:00
Jaime van Kessel
1b9c86603c Fix layout of multiply object dialog 2022-02-10 10:59:21 +01:00
Jaime van Kessel
78523789e7 Use correct styling in settingmenu 2022-02-10 10:49:18 +01:00
Jaime van Kessel
5615ec82a3 Prevent text in configuration menu from spilling out of the menu 2022-02-10 10:45:51 +01:00
Jaime van Kessel
ddc43446e6 Fix wrapping in sync menu 2022-02-10 10:37:26 +01:00
Jaime van Kessel
d50a51396e
Merge pull request #11450 from Ultimaker/CURA-8681_update_icon 
Add new icon styles
 2022-02-10 09:15:37 +01:00
NilsRo
435e9a7924 Update anycubic_i3_mega_x.def.json 
Corrected JSON error
 2022-02-09 21:01:39 +01:00
j.delarago
6f154ea444 Add new icon styles 
Change backup image name from icon to backup

Cura-8681
 2022-02-09 16:55:28 +01:00
casper
2e1f2a37a3 Fix centering of MessageDialog 
Instead of centering in the parent the dialog is now center within the
`Overlay.overlay`. This is the window container.

CURA 8687
 2022-02-09 16:45:34 +01:00
casper
84ecc8d168 Remove unused imports 
CURA 8687
 2022-02-09 15:50:05 +01:00
Jaime van Kessel
5c7e050b32 Merge branch 'master' of https://github.com/baldaaaa/Cura 2022-02-09 15:16:15 +01:00