21576 Commits

Author SHA1 Message Date
Ghostkeeper
f4a2f3efa6
Emit activeStackChanged as documented when containers in the active stack change
This fixes updating the intent models when you switch nozzles. Among other things, probably.

Contributes to issue CURA-6600.
2019-09-12 17:27:30 +02:00
Ghostkeeper
603f18ebc9
No need to sort quality groups by type alphabetically
Like, it would put 'draft' first and 'verydraft' last. Just makes no sense. They have unique layer heights already.

Contributes to issue CURA-6600.
2019-09-12 16:44:40 +02:00
Ghostkeeper
9c47fc8e70
Use container tree to get quality definition of printer
Contributes to issue CURA-6600.
2019-09-12 16:15:40 +02:00
Ghostkeeper
7d49fd7fa2
Don't import type that's only used for type checking
Contributes to issue CURA-6600.
2019-09-12 16:15:03 +02:00
Ghostkeeper
b8ab04df4a
Correct type of logged item 2019-09-12 15:58:09 +02:00
Ghostkeeper
f1299589c9
Remove debug prints
Contributes to issue CURA-6600.
2019-09-12 15:49:27 +02:00
Ghostkeeper
3a3aeb92a9
Log errors rather than printing them
This way we can debug them if a user sends us the logs.
2019-09-12 15:45:10 +02:00
Ghostkeeper
2d2bf9e279
Use logger for errors instead of printing them to stdout
This way they will show up in users' logs.
2019-09-12 15:25:01 +02:00
Ghostkeeper
92d2686fed
Pick quality changes group from quality changes groups, not quality groups
Oops.

Probably went wrong when I copied over this code from some other place.

Contributes to issue CURA-6600.
2019-09-12 15:19:06 +02:00
Ghostkeeper
2d0a122c2d
Display list of custom quality profiles
If you activate any of them from here though, it'll crash.

Contributes to issue CURA-6598.
2019-09-12 15:13:02 +02:00
Jaime van Kessel
5db122aff6
Merge branch 'master' of github.com:Ultimaker/Cura into CURA--6683_icons_per_object_settings 2019-09-12 15:01:11 +02:00
Ghostkeeper
9a5d45282a
Set intent category of quality changes group correctly
If any profile has a different intent than default, the entire group becomes that intent. There can only be one intent that's different from default per group.

Contributes to issue CURA-6600.
2019-09-12 14:54:24 +02:00
Jaime van Kessel
a6a106b526
Merge branch 'feature/creality-machines' of https://github.com/trouch/Cura 2019-09-12 14:09:46 +02:00
HUNIBEST
67aa37b13d Add Cubicon plus A15 and A30
Add Cubicon devices profile
- Style Plus-A15
- Dual Pro-A30

CURA-6771
2019-09-12 14:05:13 +02:00
Remco Burema
f4395cc647 Correct comment. 2019-09-12 14:04:30 +02:00
Ghostkeeper
ba0ebf044a
Merge branch '4.3' 2019-09-12 13:54:55 +02:00
Nino van Hooff
0cd664975e Remove face selection for a PreviewPass
Fixes issue where the selected face for the lay-flat feature showed
up in the model thumbail of print jobs.

CURA-6754
2019-09-12 13:42:19 +02:00
Ghostkeeper
1b9e710f72
Fix exporting with new quality changes groups
Those groups are starting to become a bit cumbersome...

Contributes to issue CURA-6600.
2019-09-12 13:40:47 +02:00
Ghostkeeper
4f936f5c23
Fix getting active quality changes group from machine manager
I have the feeling that we have multiple implementations of this but it's hard to find...

Contributes to issue CURA-6600.
2019-09-12 13:28:59 +02:00
Ghostkeeper
cb146b586d
Emit ContainerRegistry's containerMetaDataChanged when name changes
If we properly call the setName() function on the container it'll emit the signal that the metadata changes.

This fixes the updating of the profiles list when you rename a container.

Contributes to issue CURA-6600.
2019-09-12 13:22:57 +02:00
ChrisTerBeke
558698add7 Merge branch '4.3' 2019-09-12 12:04:01 +02:00
Chris ter Beke
08e088e607
Merge pull request #6340 from Ultimaker/CS-59_new_printers_found_popup
CS-59: Message when new cloud printers were added to your account
2019-09-12 11:59:44 +02:00
Jaime van Kessel
a279ee5f22
Fix sync issues when printer was added by cloud
CURA-6769
2019-09-12 11:21:09 +02:00
ChrisTerBeke
07672fd569 Show message when new cloud printers were added to your account but not in Cura yet 2019-09-12 11:04:05 +02:00
Jaime van Kessel
06103b98d5
Ensure that quality_changes get their intent_category set in upgrade
CURA-6599
2019-09-12 10:30:16 +02:00
Jaime van Kessel
958d3698db
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-12 09:50:39 +02:00
Remco Burema
533e0f762f Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-09-11 17:34:49 +02:00
Remco Burema
00b02f95f9 Nix 3mf-read signal-postphoning, which prevented connects.
This fix was originally made to fix CURA-5056, but it turns out it now gives warnings and possibly messes up 3mf reading instead of fixing it, since it prevents the connection of new listeners to those signals.
After removal, the original file this was reported against still loads instead of the crash it was reported to give in the ticket (reproduction rate supposedly 100%) so the removal probably doesn't mess things up.

part of CURA-6600
2019-09-11 17:34:44 +02:00
Ghostkeeper
d6e010f22b
Fix iterating over all stacks
Contributes to issue CURA-6600.
2019-09-11 17:29:10 +02:00
Ghostkeeper
f865151e82
Don't create intent for global stack when duplicating
Contributes to issue CURA-6600.
2019-09-11 17:28:42 +02:00
Ghostkeeper
2b96543cd3
Store intent category in metadata of quality_changes as well
This is necessary in order to restore it properly.

Contributes to issue CURA_6600.
2019-09-11 16:58:11 +02:00
Jaime van Kessel
5e4f673ec2
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-11 16:10:12 +02:00
Ghostkeeper
f6089ed627
Don't use material manager to get list of materials to send
The material manager is no longer populated so it wouldn't send any materials any more.

This is probably faster anyway since it doesn't need to go back to the container registry for every file.

Contributes to issue CURA-6600.
2019-09-11 15:43:35 +02:00
Jaime van Kessel
112c2266f8
Merge branch '4.3' of github.com:Ultimaker/Cura into 4.3 2019-09-11 15:15:48 +02:00
Jaime van Kessel
ab910c2a37
Disable retraction min travel
It's broken right now, so we should enable it again once it's fixed

CURA-6675
2019-09-11 15:12:49 +02:00
Simon Edwards
4ab84c0568
Merge pull request #6335 from Ultimaker/CS-158_fix_monitor_progress_bar
CS-158 Fix monitor tab print status (4.3 cherry pick)
2019-09-11 15:05:13 +02:00
Ian Paschal
72ba6153c2 Boyscout some stuff
CS-158
2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1 Reduce progress bar length
CS-158
2019-09-11 14:50:42 +02:00
Ian Paschal
07a5213ea6 Reduce text size to 12pt from 14pt
CS-158
2019-09-11 14:50:15 +02:00
Ian Paschal
d370a69073 Add some theme values
CS-158
2019-09-11 14:49:36 +02:00
Ghostkeeper
61cedb8385
Merge branch '4.3' 2019-09-10 17:33:47 +02:00
Ghostkeeper
8126cdc051
Update translation headers for Cura 4.3
Contributes to issue CURA-6768.
2019-09-10 17:33:30 +02:00
Ghostkeeper
6643bf5083
Update translation files per language for Cura 4.3
The translators can now fill these in with their translations.

Contributes to issue CURA-6768.
2019-09-10 17:33:29 +02:00
Ghostkeeper
b877717fde
Update translation template files for Cura 4.3
These are the new strings in Cura 4.3.

Contributes to issue CURA-6768.
2019-09-10 17:33:29 +02:00
Diego Prado Gesto
c6f5f4fb33
Merge pull request #6308 from smartavionics/mb-fix-legacy-glsl-issue
Remove gl_PrimitiveID from shader when it's not available.
2019-09-10 17:33:02 +02:00
Ghostkeeper
f8d72b2ea7
Fix crash when adding first quality changes profile
This dictionary is keyed by position integers, not position strings.

Contributes to issue CURA-6600.
2019-09-10 15:33:32 +02:00
Ghostkeeper
a313255bc7
Use integer positions to get quality changes per extruder from group
It's all a mix right now...

Contributes to issue CURA-6600.
2019-09-10 15:10:42 +02:00
Jaime van Kessel
626cd7e85b
Update version numbers of quality files 2019-09-10 15:08:59 +02:00
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-10 15:07:57 +02:00
Ghostkeeper
0b92c3f3df
Use .container property rather than deprecated getContainer() function
Contributes to issue CURA-6600.
2019-09-10 14:56:16 +02:00