27073 Commits

Author SHA1 Message Date
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
Ghostkeeper
a35fcf493a
Allow word wrapping for error message
This prevents being able to align the text vertically with the troubleshooting button though. The text may become the larger of the two, in which case the text should be leading the height. Qt can do this with a Layout, however it then can't automatically adjust the width of the layout there since that would create a polish loop in the layout.

Contributes to issue CURA-8609.
2021-11-01 18:59:06 +01:00
Ghostkeeper
67cae04a24
Remove message explaining what caused the error
It doesn't matter to the user. Only the error message matters.

Contributes to issue CURA-8609.
2021-11-01 18:29:36 +01:00
Ghostkeeper
e7e513bb16
Reduce width to 0 if the icon is neutral
Because with our default theme, the neutral icon is empty. This causes the alignment of the label next to it to appear off.

Contributes to issue CURA-8609.
2021-11-01 18:27:38 +01:00
Ghostkeeper
fd79b76f07
Add troubleshooting link to footer
It's moving there now. However if there are any errors syncing with the printers, the troubleshooting link has to disappear from there.

This makes the layout quite complex, since the icon on the left and the button on the right are no longer vertically centred. The text used to be vertically centred too, but can't do that any more since the text is not the determiner of the height any more, with there being a horizontally aligned button below it. It's all a bit complex now.

Contributes to issue CURA-8609.
2021-11-01 18:18:56 +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
67d76e3af8 Change version in citation file to 4.12 2021-11-01 11:50:24 +01:00
Remco Burema
acde6ae489
Apply suggestions from code review
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-10-31 21:21:24 +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
Ghostkeeper
cd286a006e
Add missing colours, fixing dark theme
Don't just use white rectangles or black text. Use the theme where appropriate. And these rectangles are just outlines.

Contributes to issue CURA-8609.
2021-10-29 15:18:40 +02:00
Ghostkeeper
ce4117a3ee
Reset export USB button when re-opening window
To do that, I moved the property to track that state to the root of the window.

Contributes to issue CURA-8609.
2021-10-29 15:12:16 +02:00
Ghostkeeper
c58d03ad4c
Change button to 'done' once USB export has completed
Also important to keep in mind: It won't change to 'done' if the user cancelled the file dialogue.

Contributes to issue CURA-8609.
2021-10-29 15:06:44 +02:00
Remco Burema
a82ffa45a0
Merge pull request #10700 from Ultimaker/CURA-8656_error_checking_for_disabled_settings
Error checking for disabled settings
2021-10-29 13:39:59 +02:00
Jaime van Kessel
87db24f14c Don't check validation for settings in error state
CURA-8656
2021-10-29 10:39:00 +02:00
10r3n20
86875580af add dark themed images to the dark theme 2021-10-28 14:12:15 +02:00
Jaime van Kessel
6c416742fb Merge branch 'dark-theme-images' of github.com:Ultimaker/Cura 2021-10-28 14:11:20 +02:00
Jaime van Kessel
42e066a5a8 Merge branch '4.12' of github.com:Ultimaker/Cura 2021-10-28 13:54:58 +02:00
Jaime van Kessel
61c43fb765 Only show "can't find location message" when it couldn't find location
Bit of a silly mistake, but easy enough to fix!

CURA-8649
2021-10-28 13:53:52 +02:00
Jaime van Kessel
59be3e195d Use category as fallback translation for intents instead of "unkown" 2021-10-28 13:48:09 +02:00
Jaime van Kessel
8f1cf4a963 Move openSYncAllWindow to the right class
CURA-8609
2021-10-28 09:43:12 +02:00
Remco Burema
ce61f8ef60
Merge branch 'master' into bremco-graphics_buffer_update 2021-10-27 18:47:51 +02:00
Jaime van Kessel
f47738f558
Merge pull request #10607 from Ultimaker/CURA-8609_sync_materials_to_printer
Sync materials to printers via cloud
2021-10-27 14:51:16 +02:00
Jaime van Kessel
79117d5898 Fix merge mistakes
CURA-8609
2021-10-27 14:48:12 +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
Ghostkeeper
273e933145
Reset sync status when closing and re-opening sync window
Otherwise when you want to sync again, it'll just say that you're done. Not what a user would expect, I reckon.

Contributes to issue CURA-8609.
2021-10-27 14:13:49 +02:00
Ghostkeeper
116046a8b2
Fix binding printer_id to response callbacks
With the lambda it would capture the variable of printer_id. It wouldn't actually store the value of printer_id in teh created lambda. As a result, it was using the current value of printer_id when the lambda executes, rather than the value of printer_id when the lambda is constructed. A bit weird how that works in Python's lambdas.

With partial functions it works properly.

Contributes to issue CURA-8609.
2021-10-27 14:06:04 +02:00
Ghostkeeper
f99fedc58b
Fix API misalignments with confirm material upload action
The API endpoint got renamed (without my awareness). It also needed to be a POST request, probably since the beginning. And apparently it needs everything to be in a sub-field called 'data' for some reason.

Contributes to issue CURA-8609.
2021-10-27 13:38:58 +02:00
Ghostkeeper
1c6ad019a3
Response data is contained in sub-field 'data'
The entire response is contained in a lone 'data' field in the response. Why this is necessary I don't know, because indeed everything the server can tell us is data so everything would be in a 'data' field. But that's how the API reacts so that's how we'll have to parse it.

Contributes to issue CURA-8609.
2021-10-27 13:16:39 +02:00
10r3n20
00120870e1 add dark themed images to the dark theme 2021-10-26 13:01:15 +02:00
Jaime van Kessel
b9c9b82052
Merge pull request #10662 from Sekisback/master
Fix some German translations
2021-10-25 17:41:39 +02:00
Sekisback
12c5a29d3e
Update fdmprinter.def.json.po
mistyping fixed
2021-10-25 16:51:59 +02:00
Ghostkeeper
101056bca6
Simplify description of lightning infill angle settings
These two have garnered some feedback in that it's wholly unclear what the sentences even mean. Hopefully this correction makes it more clear for next time.

Contributes to issue CURA-8638.
2021-10-25 15:22:29 +02:00
Ghostkeeper
82441f97b1
Clarify context of error message for translators
This should improve the translation for next time.

Contributes to issue CURA-8638.
2021-10-25 15:22:28 +02:00
Ghostkeeper
72f74b2759
Clarify description of Lightning infill
Two changes have been made:
- Use more consistent terminology for the top side of the model (which could be skin or walls). This is corrected from feedback by our translators.
- Don't add disclaimers about the infill density to this already way-too-long setting description. If anything, a disclaimer should be added to the infill density description that Gradual Infill and some infill patterns might not reach the desired density everywhere. But really, I think it's more in the domain of user documentation like the Ultimaker website or the Settings Guide.
2021-10-25 15:22:28 +02:00
Jaime van Kessel
e6686f2b85 Merge branch '4.12' of github.com:Ultimaker/Cura 2021-10-25 13:13:27 +02:00
Jaime van Kessel
4901b82d48
Merge pull request #10660 from oliof/patch-1
Update change_log.txt
2021-10-25 13:13:01 +02:00
Ghostkeeper
0fd84bf1a5
Fix override of combing mode 2021-10-25 02:03:30 +02:00
Sekisback
d725fa8806
Update fdmprinter.def.json.po
some German translation fixes
2021-10-23 09:32:17 +02:00
Harald Wagener
ead8e277b6
Update change_log.txt
fix a tiny typo.
2021-10-23 02:04:58 +02:00
Ghostkeeper
4f9d2990db
Merge branch 'patch-1' of https://github.com/Hogan-Polaris/Cura into Hogan-Polaris-patch-1 2021-10-22 16:47:09 +02:00
fvrmr
3c995c98a5 Update change log
Added a header for other new features
4.12-beta
2021-10-22 11:47:42 +02:00
fvrmr
737890e23a Change log and whats new pages
Updated change log
Updated whats new pages: text and new images.
2021-10-22 10:15:58 +02:00
Jelle Spijker
3abbcc99c0
fixed top bottom pattern zigzag in profiles
The enum value should be placed in single quotes in double quotes
2021-10-21 17:13:25 +02:00
Remco Burema
0d59e63309
Remove non-default roofing layer count from some UM TPLA profiles.
V&V approved to be in the BETA.
2021-10-21 16:40:19 +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
Jaime van Kessel
1f6e1942d7 Disable the material sync message again
CURA-8639
2021-10-21 10:39:47 +02:00
THeijmans
74c432428b Fixes bug in top bottom pattern settings
As discussed in CCB, mistake was made which led to no skin being printed. This fixes it.
PP-44
2021-10-21 09:57:43 +02:00
THeijmans
4e4a5ff382 Fixes bug in ultimaker S3 definition
setting was configured twice
2021-10-21 09:52:37 +02:00