26552 Commits

Author SHA1 Message Date
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
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
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
Ghostkeeper
648aa3d84c
Add new button to open the Marketplace
For now this button opens the same Marketplace. I must maintain both Marketplaces side-by-side for the moment though.

Contributes to issue CURA-8556.
2021-10-18 17:49:55 +02:00
Ghostkeeper
7680124f7e
Merge branch 'master' of https://github.com/mlapkin/Cura into mlapkin-master 2021-10-18 17:36:46 +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
Jelle Spijker
629f695ef7
Only show certain Application Switcher links when logged in
Some links in the application only make sense to
forward a user when they are logged into the DF.
Since we don't expose yet if the user has access
to the DF it will now only check if they are
logged in.

Contributes to CURA-8624
2021-10-18 15:37:06 +02:00
mlapkin
efa292e28d
Update fdmprinter.def.json.po
Fix translation of 'order'.
2021-10-18 18:37:56 +07:00
Ghostkeeper
89c5a38afa
Use a neutral e-mail address
If I end up under a bus, these e-mails will then still arrive somewhere.
2021-10-16 11:52:29 +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
Ghostkeeper
a1a4d421ca
Consistent user-visible naming of Arjun Pro printers
Contributes to issue CURA-8580.
2021-10-15 16:13:31 +02:00
Ghostkeeper
57f4807f98
Update setting_version to 19
This was committed before we implemented that version upgrade. But we do it now. This requires that we update references to the FLSun SR printer, but obviously there are none in here.

Contributes to issue CURA-8580.
2021-10-15 16:12:27 +02:00
Ghostkeeper
41e662fb6a
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
Ghostkeeper
c6d92dc8d6
Fix combing mode override
This needs quotes, since it's a Python expression. Otherwise it would get interpreted as a variable name which doesn't exist.

Contributes to issue CURA-8627.
2021-10-13 17:23:09 +02:00
Ghostkeeper
f0262abbb5
Combine two property overrides in one setting, for proper JSON
Otherwise the maximum gets ignored because the JSON results in a dict where the keys are unique. So the second one happens to get skipped then.

Contributes to issue CURA-8627.
2021-10-13 15:46:35 +02:00
Ghostkeeper
43897b60d8
Properly use strings as values for enums in setting overrides
This is interpreted as a Python function, so if it doesn't have those quotes it'll be interpreted as a variable name, and that variable doesn't exist.

Contributes to issue CURA-8627.
2021-10-13 15:42:46 +02:00
Jelle Spijker
246c986d95
Merge pull request #10605 from Ultimaker/CURA-8550_lightning_infill
CURA-8550 Added lightning infill description and sub-settings level.
2021-10-13 12:21:29 +02:00
Konstantinos Karmas
f68d915235
Merge pull request #10509 from Ultimaker/PP-1-Improved_print_profiles
Various print profile improvements for the UM3, S3 and S5
2021-10-12 16:10:48 +02:00
p.kuiper
7deb31db98 Bug fixes.
- Removed default value when value is already set.
 - Make sure UM3 and UM3 extended variants are the same
2021-10-12 12:54:26 +02:00
p.kuiper
17ea8d0de7 Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles
# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
2021-10-12 09:31:20 +02:00
Remco Burema
e29edb0cc9
Added lightning infill description and sub-settings level.
part of CURA-8550
2021-10-12 09:17:58 +02:00
Konstantinos Karmas
9bb31dd468
Merge pull request #10589 from Ultimaker/remove_unneeded_catalog
Remove unneeded catalog
2021-10-12 09:10:05 +02:00
p.kuiper
fb645a2454 Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles
# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
2021-10-12 09:09:05 +02:00
p.kuiper
0239ce8a78 - Bug fix error due to string overrides.
- "Minimum_value" changed to "minimum_warning_value"
- PVA (BB0.4 and BB0.8) require low support jerk settings for good adhesion
- Support roof does follow print_jer and no warning levels set
2021-10-11 13:53:21 +02:00
p.kuiper
6c67b03a55 - Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00 2021-10-11 11:35:38 +02:00
Ghostkeeper
4aa10ba42f
Use initial layer line width factor from adhesion extruder
This is a per-extruder setting. So get it from the proper extruder.
2021-10-11 10:08:11 +02: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
p.kuiper
730fb72f78 Merge branch 'master' into PP-1-Improved_print_profiles 2021-10-11 08:09:05 +02:00
Jaime van Kessel
512b0a1dbe Remove unneeded catalog
The catalog was created over and over again even though it wasn't needed.
On my machine this took 0.25 seconds, so it does add up
2021-10-08 18:17:18 +02:00
Remco Burema
2ed837ba71
Merge pull request #10486 from Ultimaker/use_empty_qurl_if_path_doesnt_exist
Only return the path if the folder actually exist
2021-10-08 14:01:01 +02:00
Jaime van Kessel
2c9f31cbde Remove unneeded signal connections 2021-10-08 13:50:21 +02:00
Jaime van Kessel
7d9c6e1449 Fix QML warning 2021-10-08 13:35:01 +02:00
Jaime van Kessel
65a35bbebc Move creaseee extruders and definitions to correct folder 2021-10-08 10:52:10 +02:00
ivovk9
e76c0d6df8
Add Creasee CS50S pro, Creasee Skywalker and Creasee Phoenix (#10533) 2021-10-08 10:50:42 +02:00
Jaime van Kessel
327d24d5e6 Fix typo 2021-10-07 13:19:34 +02:00
Konstantinos Karmas
2461f972b3
Merge pull request #10562 from Ultimaker/CURA-7851_fix_duplicating_support_blocker
Fix duplicating / multiplicating support blockers
2021-10-06 16:49:51 +02:00
Konstantinos Karmas
e793eac425 Push the grouped operation instead of redoing it
CURA-7851
2021-10-06 16:46:20 +02:00
Konstantinos Karmas
6a1f09def0 Add is_logged_in status datapoint
CURA-8443
2021-10-06 16:19:31 +02:00
Jaime van Kessel
4aae3d7e2e Move duplicated modifier meshes a bit after duplication
This makes sure that they are visible / selectable after multiplication

CURA-7851
2021-10-06 15:57:18 +02:00
Jaime van Kessel
4ce69a9eb5 Fix the message if not all duplicated objects could be placed
CURA-7851
2021-10-06 15:52:33 +02:00
Jaime van Kessel
fa4f567cb1 Simplify ifstatement for MultiplyObjects
CURA-7851
2021-10-06 15:50:12 +02:00