GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 18:59:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,715 Commits 295 Branches 268 Tags
Commit Graph

27715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 aa4b7ddb8bce12c4ff2ea8864c1dad63a7a0a7c4.
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
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
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
Remco Burema
86046a32b3
Merge branch 'master' into merge_main_20211019 2021-10-20 08:38:01 +02:00
Remco Burema
2fc20fd04a
Prep for merge with main branch. Setting-version 18 to 19. 2021-10-19 18:32:51 +02:00
Ghostkeeper
cf2b0d2777
Add empty ListModel to store list of packages with 
This model does nothing yet.

Contributes to issue CURA-8556.
 2021-10-19 17:48:21 +02:00
Ghostkeeper
ffce865c85
Add constant for API URLs 
I figured this out now. Don't want to forget it. We'll need it later anyway.

Contributes to issue CURA-8556.
 2021-10-19 17:47:40 +02:00
Ghostkeeper
97edf59660
High-level layout of Marketplace window 
Currently just a title and a page. The title is separate because in between there will be the tabs selecting which page is shown. The title will also change depending on that, but that'll have to be implemented separately. The page is loaded with a loader to make it efficient, and also to make it extensible when the tabs get implemented in a follow-up ticket.

Contributes to issue CURA-8556.
 2021-10-19 16:50:57 +02:00
Ghostkeeper
8beac74417
Let Marketplace button open Marketplace instead of Toolbox 
This hijacks the button to open something else. The old Toolbox is no longer accessible now.

Contributes to issue CURA-8556.
 2021-10-19 13:46:21 +02:00
Ghostkeeper
c35b1f4135
Bring window into focus when it opens 
It can be behind the Cura main window now, where the user won't see it if it was already open.

Contributes to issue CURA-8556.
 2021-10-19 13:45:25 +02:00
Ghostkeeper
5897b3de38
Add function to open Marketplace window 
This will now load in a QML file, cache it, and create an empty window with the title 'Marketplace'.

Contributes to issue CURA-8556.
 2021-10-19 13:43:41 +02:00
Ghostkeeper
aa4b7ddb8b
Revert "Add new button to open the Marketplace" 
This reverts commit 648aa3d84cd11439b6457aa81285ea9a5ac202f0.
Apparently we don't want to retain the old Toolbox alongside, not even during development.

Contributes to issue CURA-8556.
 2021-10-19 13:09:22 +02:00
Ghostkeeper
73ad2a4e08
Add Marketplace plug-in, starting a rewrite from the Toolbox 
This plug-in will be a complete re-write of the previous Toolbox plug-in. It's intended to solve some of the inherent architectural problems with the Toolbox.
We're calling it Marketplace now as well.

Contributes to issue CURA-8556.
 2021-10-19 13:06:04 +02:00