Commit graph

16749 commits

Author SHA1 Message Date
Mark
a0263676e1 The prepare button slices, so it should be a slice button 2018-06-01 13:36:50 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user
applies a configuration using the Sync button.
2018-06-01 13:26:14 +02:00
Diego Prado Gesto
0a573408d9 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-01 12:59:10 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
2018-06-01 12:58:08 +02:00
Ian Paschal
cca51cb74b Revert "Revert "CURA-5435 Attempt to fix "wobbly" text""
This reverts commit 9b5369a5b1.
2018-06-01 09:39:04 +02:00
Ian Paschal
9b5369a5b1 Revert "CURA-5435 Attempt to fix "wobbly" text"
This reverts commit bc1fa5c3f9.
2018-06-01 09:38:45 +02:00
Ian Paschal
bc1fa5c3f9 CURA-5435 Attempt to fix "wobbly" text 2018-06-01 09:38:37 +02:00
Ghostkeeper
abc3cde568
No longer call initialize() since it's included in __init__
We now always run initialize() after __init__ in Uranium.
2018-05-31 21:28:21 +02:00
Jaime van Kessel
91a66d1290 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-31 17:21:27 +02:00
Jaime van Kessel
c988e0eccb Also added "none" to the state list of prints_jobs not to be matched with printers 2018-05-31 17:20:53 +02:00
Lipu Fei
bb313c45a9 Set job name to "unnamed" if user types in nothing
CURA-5367
2018-05-31 16:25:58 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered
CURA-5367
2018-05-31 15:37:48 +02:00
Mark
3fefdad14b Round margins
CURA-5435
2018-05-31 15:22:49 +02:00
Mark
a8173344a3 Hidden materials 2018-05-31 14:45:57 +02:00
Lipu Fei
c288bbb6d1
Merge pull request #3785 from Ultimaker/WIP_improve_initialization
CURA-5164 Make application initialization and start up more clear
2018-05-31 14:31:40 +02:00
Lipu Fei
b3ef1bfd51 Simplify UserAgreement 2018-05-31 14:29:56 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Lipu Fei
7d8472e588 Merge remote-tracking branch 'origin/3.4' 2018-05-31 12:25:33 +02:00
Lipu Fei
a468fc2cc4 Only load loading.gif when needed
Toolbox crashes on Mac OS X due to reaching the max limit of file
handlers. This seems to be caused by the loading the "loading.gif"
animation image. Probably because many widgets are created and each of
them has an animation image, and Qt (5.8?) seems to load everything at
the same time.
2018-05-31 12:21:53 +02:00
Jaime van Kessel
416f695610 Canceling sending job to cluster no longer results in "still sending print" message.
Previously it would always show this, requiring a restart of Cura before print could be sent. CL-913
2018-05-31 11:52:36 +02:00
Ruben D
33e49bebbe
Don't connect when aborting while the signal is not yet connected
Do this using try-except so that it is thread safe.
2018-05-31 10:59:17 +02:00
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before
retrieving it from the definition if there are not defined in the material.
2018-05-30 16:58:11 +02:00
Ian Paschal
00fe180085 Hide Toolbox Showcase & Materials for 3.4 2018-05-30 16:29:55 +02:00
Ian Paschal
d68b44791b
Merge pull request #3479 from smartavionics/mb-wall-min-flow
Added wall_min_flow and wall_min_flow_retract settings.
2018-05-30 13:44:21 +02:00
Ghostkeeper
86d4f0583c
Make showing of support density image dependent on support pattern
Because that's what it's actually depending on.

Contributes to issue CURA-4513.
2018-05-30 13:37:25 +02:00
Jack Ha
7728ef02ed Merge branch '3.4' 2018-05-30 11:01:30 +02:00
Jack Ha
b5ab25ed55 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-05-30 10:58:27 +02:00
Jack Ha
ed0a0dd765 Fix multiply object in a rare case that an object is just too big 2018-05-30 10:58:19 +02:00
Ghostkeeper
913661d666
Merge branch '3.4' 2018-05-30 10:36:10 +02:00
Ghostkeeper
6ea5924c95
Remove Try Multiple Line Thicknesses setting
This setting is now always enabled, hard-coded in the engine.
2018-05-30 10:35:50 +02:00
Jack Ha
b43806fd4b Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-05-30 09:45:11 +02:00
Jack Ha
3395610b67 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:59 +02:00
Jack Ha
a616e92367 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:33 +02:00
Lipu Fei
f1bb0e58e7 Do not use CuraVersion data if strings are empty
CURA-5357
2018-05-30 09:20:02 +02:00
Lipu Fei
fae9bc838b Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt
CURA-5357
2018-05-30 09:18:45 +02:00
Lipu Fei
9223122fc8 Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt
CURA-5357
2018-05-30 09:13:27 +02:00
Jack Ha
16b8d3f137 Merge branch '3.4' 2018-05-30 09:12:28 +02:00
Ian Paschal
13b3e4afa5 CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo
Also improved interfacing with `CuraVersion.py`
2018-05-30 09:11:49 +02:00
Lipu Fei
11db13aa28 Clear is_user_specified_job_name flag when setting a project file name
CURA-5280
2018-05-30 09:07:02 +02:00
Lipu Fei
80d4989843 Show keep/discard user settings dialog upon variant change
CURA-5417
2018-05-30 09:03:36 +02:00
Aleksei S
4d6753a1f1 remove unused code lines in firmware checker
CURA-4952
2018-05-29 18:33:38 +02:00
Aleksei S
b46a08f566 Add Reft and Right side aligned action buttons to the message box
CURA-4952
2018-05-29 18:15:16 +02:00
Ian Paschal
c77ea76b21 CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo
Also improved interfacing with `CuraVersion.py`
2018-05-29 16:34:36 +02:00
Lipu Fei
fed0a015ee Clear is_user_specified_job_name flag when setting a project file name
CURA-5280
2018-05-29 15:56:01 +02:00
Diego Prado Gesto
9873d57286 CURA-5404 Change default retraction distance to 6.5mm for ultimaker3 and
S5
2018-05-29 14:48:34 +02:00
Diego Prado Gesto
a969d3c5ea CURA-5404 Remove retraction_amount values that must be in the material
profile.
2018-05-29 14:37:13 +02:00
Diego Prado Gesto
cc42d993d3
Merge pull request #3854 from fieldOfView/fix_configurationmenu_text
Fix configurationmenu text
2018-05-29 13:50:03 +02:00
Lipu Fei
7cf2832183 Fix quality_group is None check in _setQualityGroup()
CURA-5423
2018-05-29 13:43:32 +02:00
Diego Prado Gesto
77826b5a7d
Merge pull request #3863 from fieldOfView/fix_toolbox_compatibility_headers
Make headers non-transparent
2018-05-29 13:37:53 +02:00
Ghostkeeper
3614da0f9d
Replace infill_hollow by infill_support_enabled
It's not the exact same functionality, but very similar and equally expert.

Contributes to issue CURA-5108.
2018-05-29 13:22:59 +02:00