8229 Commits

Author SHA1 Message Date
Jaime van Kessel
99a5aa363f Remove unused controls imports 2021-11-11 16:28:20 +01:00
Jaime van Kessel
c22db1e654 Convert FW updater to controls2 2021-11-11 16:25:25 +01:00
Jaime van Kessel
980ac986df Let DiscoverUM3Action use controls 2 2021-11-11 15:59:51 +01:00
Jaime van Kessel
a68584cda1 Replace more instances of label with UM.Label 2021-11-10 17:42:23 +01:00
Jaime van Kessel
8195b9be28 Remove more references to old controls 2021-11-10 17:30:42 +01:00
Jaime van Kessel
ea8969fe4e Remove multiple references to controls 1 2021-11-10 17:24:28 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Ghostkeeper
dcf78b4885
Merge branch '4.12'
Conflicts:
	resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.
2021-11-08 13:55:09 +01:00
Ghostkeeper
db637802bd
First translate, then process replacement keys
If we first process the replacement keys, the replaced string can't be found in the translation database, so you don't get a translation of the phrase 'Finishes x at y'.

Fixes #10718.
2021-11-08 13:49:54 +01:00
Jaime van Kessel
561d0784f8 Merge branch 'CURA-8522_pause_extrusion_interruption' of github.com:Ultimaker/Cura 2021-11-08 10:23:49 +01:00
Ghostkeeper
fd5b248296
Don't register a new layer if not extruding a line
We do retracts/unretracts on different heights sometimes, for instance after a pause. This would get seen as a new layer. It's quite safe to say that purely retracts and unretracts on a different height do not constitute a layer in a normal g-code file. There would be nothing to draw anyway.

Contributes to issue CURA-8522. Fixes #10282.
2021-11-05 21:04:37 +01:00
Ghostkeeper
74ff28cbea
Only unretract/retract when necessary for priming
Otherwise this is quite a useless move and would only cause blobs on the print.

Found during work on CURA-8522.
2021-11-05 21:03:03 +01:00
Jelle Spijker
64271d0a0c
Merge pull request #10712 from Ultimaker/fix_undo_redo_support_blocker
Fix undo and redo for support blocker
2021-11-05 09:22:11 +01:00
Remco Burema
89ab394dc0
Code-style, revert unilateral descisions.
- Capitalization for camelCase.
- Indentation.
- We don't really even _have_ a concept of what a 'Beta' for a script is, and this was a unilateral descision from a single contributor instead of validated by the proper channels like QA, V&V, etc.
- Pretty sure that while those labels aren't used _within_ Cura proper, other people (and maybe plugins?) rely on them for (further)post-processing. Also the distinction between CAZO and CAZD was lost.

part of CURA-8655
2021-11-02 09:09:02 +01:00
Remco Burema
e286b17bd9
Merge branch 'master' of https://github.com/legend069/Cura into legend069-master 2021-11-02 08:45:27 +01:00
Jaime van Kessel
cd68434611 Merge branch '4.12' of github.com:Ultimaker/Cura 2021-11-01 11:50:47 +01:00
Jaime van Kessel
366ef4ca06 Fix undo and redo for support blocker
The translate wasn't done via an operation, so it wouldn't go back to the same
state after an undo / redo

Fixes #10648
2021-10-31 17:21:51 +01:00
Jaime van Kessel
87db24f14c Don't check validation for settings in error state
CURA-8656
2021-10-29 10:39:00 +02:00
Ghostkeeper
88d08b27d1
Merge branch 'master' into CURA-8609_sync_materials_to_printer
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> On Master we had temporarily reverted the action of this button because it became apparent that the sync wasn't going to be in 4.12. That revert is no longer necessary if this is merged.
2021-10-27 14:21:05 +02:00
Jaime van Kessel
00a01569be Add clarifying comment to pause at height
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
2021-10-21 15:30:32 +02:00
Jaime van Kessel
bf2b42b0b8 Add clarifying comment to pause at height
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
2021-10-21 15:29:21 +02:00
Jelle Spijker
666880ad20
Only show certain App Switcher icons when account has DF access
Added a dictionary where additional user rights can be set.
A plugin such as the DigitalFactory can update this dictionary
if certain account rights change. The `account.additionalRights`
is intended to allow us some flexibility, without breaking the API
in the future.

The Application Switcher now queries the additional account rights,
which is updated by the DF plugin to only show `My printers`,
`Digital Library` and `Print jobs` when the user has access to the
DF.

Contributes to CURA-8624
2021-10-18 15:37:06 +02:00
Ghostkeeper
0d350b5f96
Merge branch '4.12' into CURA-8609_sync_materials_to_printer 2021-10-18 13:23:29 +02:00
Ghostkeeper
5ed57e403c
Delete existing log-in information to force the user to log in again
Otherwise they won't be able to sync material profiles.

Contributes to issue CURA-8609.
2021-10-18 13:17:22 +02:00
Ghostkeeper
a349606fef
Make my name more anonymous
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
2021-10-16 11:45:48 +02:00
legend069
3b639d2119 Update ChangeAtZ.py
updated, as suggested by
https://github.com/Ultimaker/Cura/pull/10554#issuecomment-939812755
2021-10-11 19:57:42 +11:00
Konstantinos Karmas
4759007ed8
Merge pull request #10580 from Ultimaker/CURA-8443_Add_sign_in_status_datapoint
CURA-8443: Add is_logged_in status datapoint
2021-10-11 10:01:52 +02:00
Ghostkeeper
8234276204
Add log entry when syncing with cloud printers
Not only do I now have an interface where the user doesn't get any feedback when syncing happens, but even in the log there was nothing shown when it happens.

Contributes to issue CURA-8609.
2021-10-08 14:13:54 +02:00
Ghostkeeper
93953630ec
Update online status when updating account printer status
This updates the metadata entries. Naturally this updates every 60 seconds in Cura, but it could also manually be triggered by the refresh button.

Contributes to issue CURA-8609.
2021-10-08 14:08:02 +02:00
Jaime van Kessel
7d9c6e1449 Fix QML warning 2021-10-08 13:35:01 +02:00
Konstantinos Karmas
6a1f09def0 Add is_logged_in status datapoint
CURA-8443
2021-10-06 16:19:31 +02:00
Jelle Spijker
8466a291fd
Merge pull request #10547 from Ultimaker/CURA-8601_update_connect_to_cloud_popup
Update connect to cloud popup
2021-10-05 14:44:12 +02:00
Jelle Spijker
501b4c4fde
Spaces around assignment operator
According to UM codestyle

Contributes to CURA-8601
2021-10-05 13:54:13 +02:00
Jaime van Kessel
527de2b6ef Use image instead of custom message type
CURA-8601
2021-10-05 10:20:52 +02:00
Ghostkeeper
9e1dc98cd1
Catch environment errors when reading license file from package
The package may be inaccessible for whatever reason, which would crash Cura.

New attempt to fix CURA-2RP (without breaking the unit test saying that this error should be raised by Uranium then).
2021-10-04 14:31:25 +02:00
legend069
35dd43675c Update ChangeAtZ.py
fixed typos and the gcode insert makes it easier to find for others "changeatz"
2021-10-03 20:00:08 +11:00
legend069
4508f60ce5 Update ChangeAtZ.py
PR
2021-10-03 19:43:50 +11:00
Jaime van Kessel
dc7a45eacf Remove cloud-flow-start icon
It wasn't used anymore

CURA-8601
2021-10-01 16:51:39 +02:00
Jaime van Kessel
6bc9aaa4bf Add message type to cloud
CURA-8601
2021-10-01 11:54:27 +02:00
Jaime van Kessel
d4c4b11927 Update the copy of the connect to cloud message
CURA-8601
2021-10-01 11:38:13 +02:00
Jaime van Kessel
c83c6b0068 Merge branch 'CURA-8510_version_upgrade' of github.com:Ultimaker/Cura 2021-09-28 10:31:56 +02:00
Jaime van Kessel
f3e2e7f6ac Merge branch 'filament-change-marlin-unload-fix' of git://github.com/barnybug/Cura 2021-09-27 14:43:07 +02:00
Jaime van Kessel
20b76c12a7 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8510_version_upgrade 2021-09-27 10:20:50 +02:00
Ghostkeeper
ef568ce622
Only get quality-changes fields for quality-changes profiles
And make the upgrade more robust against weird input, too.

Contributes to issue CURA-8510.
2021-09-24 16:32:38 +02:00
Jaime van Kessel
fa3f3efbec
Merge pull request #10289 from fieldOfView/feature_material_type_name_patterns
Add {material_type}, {material_name}, {material_id} and {material_brand} as replacement patterns

CURA-8598
2021-09-24 16:17:12 +02:00
Ghostkeeper
413913a5a8
Modernise logging
Hopefully this prevents issues like Sentry issue CURA-2WB.
2021-09-24 15:00:03 +02:00
Ghostkeeper
026c4062ce
Add logging for when the user encounters errors in setting values
We want to be able to see this from the log file, to help debug issues.

Done to help with cases like #10475.
2021-09-24 14:08:55 +02:00
Ghostkeeper
0bcd5eba48
Add print_temperature to print temperature settings
This way it is recognised as a command to set the printing temperature, and will prevent Cura from putting its own temperature commands in.

Fixes issue reported here: https://www.reddit.com/r/Cura/comments/pu98kc/stop_initial_hotend_heatup/
2021-09-24 13:09:37 +02:00
Konstantinos Karmas
ad6a8d828e Merge branch 'master' into CURA-8510_version_upgrade 2021-09-23 17:01:00 +02:00