Commit graph

28475 commits

Author SHA1 Message Date
Ghostkeeper
476321be5c
Remove log entry for when Marketplace QML fails to load
This is already logged with a warning by the QML engine.

Contributes to issue CURA-8556.
2021-10-25 15:38:54 +02:00
Ghostkeeper
77d1bebbdb
Put PackageList in Marketplace namespace
This way it's not available to the rest of Cura, especially since PackageList is not such an uncommon name. It could give name collisions. Moreover, the rest of Cura doesn't need to have a list of packages from the Marketplace, so it's better separation.

Contributes to issue CURA-8556.
2021-10-25 15:35:28 +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
797ff9c573
Turn new Marketplace button into button with text instead of icon
The Marketplace icon is apparently confusing to use for the Marketplace in Cura and should only be used for the website version.

Contributes to issue CURA-8556.
2021-10-25 11:08:14 +02:00
Jaime van Kessel
43b8476572 Remove unneeded parenthesis
CURA-8556
2021-10-25 10:38:36 +02:00
Jaime van Kessel
37ccf5b823 Add missing return types on init
CURA-8556
2021-10-25 10:37:02 +02:00
Ghostkeeper
0fd84bf1a5
Fix override of combing mode 2021-10-25 02:03:30 +02:00
Ghostkeeper
daf450142b
Implement error handling and showing error state
If an error occurs, the error message is stored in the list model, so that it can be shown with the list.

Contributes to issue CURA-8556.
2021-10-25 01:56:57 +02:00
Ghostkeeper
bca2f36186
Use states rather than individually switching properties
This is necessary because we'll add a fourth state here: An error state. This would get quite complex otherwise.

Contributes to issue CURA-8556.
2021-10-25 01:28:37 +02:00
Ghostkeeper
aed52cea74
Split functionality of the two marketplace buttons
One now opens the old one again. One still opens the new one (but with a new name).

Contributes to issue CURA-8556.
2021-10-25 01:11:26 +02:00
Ghostkeeper
7796abd55b
Revert "Revert "Add new button to open the Marketplace""
This reverts commit aa4b7ddb8b.
Apparently it is now in scope again for the button to be there. It's in the requirements and the requirements are holy. Whoopteedoo.

Contributes to issue CURA-8556.
2021-10-25 00:51:26 +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
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
Ghostkeeper
1ab677f5dd
Add state for when it's loading
This has a slight bug in that the icon will immediately change to an arrow once loading has completed, but will slowly rotate back to angle 0. You don't see this, since the new plug-ins will come in between. The new plug-ins will always be a full page, or otherwise the icon disappears altogether and it's not visible anyway. But if you hold down the scrollbar while loading and quickly scroll down when loading completed, you can see this happen. I don't think anyone will really mind though.

Contributes to issue CURA-8556.
2021-10-21 18:37:02 +02:00
Ghostkeeper
e3cd5606f0
Make load more button load more packages
This adds the functionality of the button.

Contributes to issue CURA-8556.
2021-10-21 18:26:29 +02:00
Ghostkeeper
46ad1ad077
Add disabled state for load more button
Can't click on the button then.

Contributes to issue CURA-8556.
2021-10-21 18:25:33 +02:00
Ghostkeeper
8776294932
Set loading state to False once parsing has completed
This allows the user to request the next one.

Contributes to issue CURA-8556.
2021-10-21 18:23:19 +02:00
Ghostkeeper
35ec8f7190
Add basic layout for button to load more packages
Contributes to issue CURA-8556.
2021-10-21 18:06:52 +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
Ghostkeeper
27da03d862
Add a property to see whether there are any more packages to load
Contributes to issue CURA-8556.
2021-10-21 17:10:32 +02:00
Ghostkeeper
1320d8c9f4
Add a simplistic design for a card for each package
It just displays the package name for now.

Contributes to issue CURA-8556.
2021-10-21 17:09:12 +02:00
Ghostkeeper
031c8efbe6
Implement pagination for package list
The simplest way I can think of.
Currently we only call the request function once, so we can only get the first page. Before calling it multiple times, we should check if there are more pages by checking if the request URL is an empty string.

Contributes to issue CURA-8556.
2021-10-21 16:56:53 +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
Ghostkeeper
b585c02207
Add background to page content, and restructure margins
To display the background across the entire bottom side and not with the margins of the column, we have to restructure where the margins are a bit.

Contributes to issue CURA-8556.
2021-10-21 16:35:54 +02:00
Ghostkeeper
38038b3752
Store items directly in listModel when parsing them
No need to use a custom list in Python and update the ListModel from that. This is much simpler and more efficient.

Contributes to issue CURA-8556.
2021-10-21 16:10:23 +02:00
Ghostkeeper
6415a2649e
Parse responses from package API call
Only positive responses so far. Error handling is not implemented yet.

Contributes to issue CURA-8556.
2021-10-21 16:02:46 +02:00
Ghostkeeper
3138452f94
Allow PackageList to be used as a model from QML
QML is leading here and holding the pointers for creation and destruction.

Contributes to issue CURA-8556.
2021-10-21 15:46:46 +02:00
Ghostkeeper
4337e81b77
Make request to Marketplace API when package list loads
We don't parse the response just yet, but this is part of the work.

Contributes to issue CURA-8556.
2021-10-21 15:33:37 +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
Ghostkeeper
5851ad52c6
Add property to tell if the list is currently loading or loading more
We'll need to display a spinner of some kind in the front-end, I think.

Contributes to issue CURA-8556.
2021-10-21 15:15:56 +02:00
Ghostkeeper
0f5c923d93
Add model to represent packages and export information to QML
We'll construct a bunch of these when we receive information from the API.

Contributes to issue CURA-8556.
2021-10-21 15:03:41 +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
THeijmans
04f37e6283 Removes missed line width settings
As discussed in CCB, now every line width setting will inherit from the right place
2021-10-21 09:48:55 +02:00
THeijmans
9cc1a24e11 Moves arachne setting changes to ultimaker2 layer
Fixing a mistake from PP-28,

PP-44
2021-10-21 09:48:00 +02:00
Ghostkeeper
03492a3a15
Update header of translated files for Cura 4.12
Contributes to issue CURA-8638.
2021-10-20 16:52:50 +02:00
Ghostkeeper
f4c5cfbbd0
Update translated files with new translation templates
There are new translations. This moves all of those new strings into the translation files so that the translators can translate them. Every string that has an empty translation still needs to be translated.

Contributes to issue CURA-8638.
2021-10-20 16:50:10 +02:00
Ghostkeeper
92e5902163
Update translation templates for Cura 4.12
These are the new strings introduced in 4.12.

Contributes to issue CURA-8638.
2021-10-20 16:47:47 +02:00
Remco Burema
8c8ec5391f
Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
Remco Burema
6d93c651ec
Merge pull request #10639 from Ultimaker/CURA-8514_inconsistent_material_naming
Use the material name instead of brand + type + color
2021-10-20 10:47:32 +02:00
Remco Burema
0871870bb6
Merge branch 'merge_main_20211019' into libArachne_rebased 2021-10-20 08:38:52 +02:00