Commit graph

28475 commits

Author SHA1 Message Date
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 648aa3d84c.
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
Jaime van Kessel
2baada8a70 Use the material name instead of brand + type + color
CURA-8514
Fixes #10421
2021-10-19 11:23:21 +02:00
mlapkin
7a8168953f
Fix translation for 'nozzle'.
Update strings having 'nozzle' translated as 'head' and make them more consistent with others where translation is correct.
2021-10-18 23:12:40 +07: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
Ghostkeeper
8bd6fe7c2b
API changed: material_profile_name instead of file_name
Contributes to issue CURA-8609.
2021-10-18 15:15:37 +02:00
Ghostkeeper
c9d53cbbde
Renamed OAuth scope
This got renamed since the API was communicated to us.

Contributes to issue CURA-8609.
2021-10-18 15:15:05 +02:00
mlapkin
efa292e28d
Update fdmprinter.def.json.po
Fix translation of 'order'.
2021-10-18 18:37:56 +07: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
bf6dd443b2
Add material profile writing permission
The API needs this new scope name.

Contributes to issue CURA-8609.
2021-10-18 12:59:32 +02: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
0378531f13
Handle QML exposing of filterConnectionType if not filtering
It should expose it as -1 then.

Contributes to issue CURA-8609.
2021-10-15 16:24:43 +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
0583814dfa
Fix HttpNetworkManager not providing error parameter if there is no error
Contributes to issue CURA-8609.
2021-10-15 16:00:54 +02:00
Ghostkeeper
f56e438747
Fix broken references
Just some things that the QML is complaining about. This actually did fix the spinning of the spinners.

Contributes to issue CURA-8609.
2021-10-15 15:52:54 +02:00
Ghostkeeper
889000242d
Document UploadMaterialsJob class better
Including all of its signals and methods.

Contributes to issue CURA-8609.
2021-10-15 15:42:12 +02:00
Ghostkeeper
e05fa87b48
Handle errors reading material archive back in
It could be that this archive is not accessible any more for whatever reason. Write-only file systems, quarantined files, etc. Whatever the reason, Cura shouldn't crash on this because it's not in Cura's control.

Contributes to issue CURA-8609.
2021-10-15 15:24:05 +02:00
Ghostkeeper
4262dfaf5d
Better handle errors in local part of upload job
It could be that the archive fails to save because the user doesn't have access to its own temporary folder, the firewall quarantines the archive, there's not enough disk space, whatever. These errors need to be handled and not crash Cura.

Contributes to issue CURA-8609.
2021-10-15 15:17:59 +02:00
Ghostkeeper
dfcefe11cc
Use enum for printer status constants
This indicates how we're using it, and also allows for use of symbols in the code rather than strings, which integrate better with tooling.

Contributes to issue CURA-8609.
2021-10-15 14:51:07 +02:00
Ghostkeeper
2b4a31c9de
Change type of filter to Optional[ConnectionType]
It's a bit more semantic this way.

Contributes to issue CURA-8609.
2021-10-15 14:35:07 +02:00
AnnaKang0219
34c531123b remove wrong bed_temperature setting
remove wrong bed_temperature setting
2021-10-14 13:52:07 +08: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
Ghostkeeper
a399bacab3
Patch CuraApplication away while running tests for output devices
It needs CuraApplication because it wants to set metadata on the printer. But this is not relevant for the tests.

Contributes to issue CURA-8609.
2021-10-13 10:34:59 +02:00
Ghostkeeper
24cd2046f8
Initialise _printer_metadata as a list instead of a dict
It should become a list later on, in any case.

Contributes to issue CURA-8609.
2021-10-13 10:13:06 +02:00
Ghostkeeper
af54316690
Typing fixes
Some things the CI is complaining about.

Contributes to issue CURA-8609.
2021-10-13 10:00:22 +02:00
Ghostkeeper
a703e6b882
Use lambdas instead of functools
Partialmethod is not callable apparently. I think the problem is that it's calling the method outside of the scope of the class here. I'm probably not using it right. Lambas are easier since they automatically take their scope along with them.

Contributes to issue CURA-8609.
2021-10-12 17:47:05 +02:00
Ghostkeeper
2d53a548dc
Remove superfluous error handling
If there is an error, it'll go into onError and handle the error there.

Contributes to issue CURA-8609.
2021-10-12 17:38:47 +02:00
Ghostkeeper
bfb8d9ddf1
Show 'Done' button when sync was successful
And make it close the window when pressed then.

Contributes to issue CURA-8609.
2021-10-12 17:34:34 +02:00
Ghostkeeper
5b14792c76
Use 'try again' as button text if the first attempt failed
Contributes to issue CURA-8609.
2021-10-12 17:30:20 +02:00
Ghostkeeper
c2057c94db
Only show troubleshooting link if there is an error
And show it next to the error.

Contributes to issue CURA-8609.
2021-10-12 17:28:09 +02:00
Ghostkeeper
cf860829c7
Provide upload request metadata as body of a PUT request
Apparently the API is now a PUT request rather than a GET request. It needs a bit more metadata which can be hard-coded for our client.

Contributes to issue CURA-8609.
2021-10-12 17:21:25 +02:00
Ghostkeeper
bfb39cf989
Add spinners and status icons per printer
These make use of the per-printer sync status to show either nothing, a spinner, a cross or a checkmark.

Contributes to issue CURA-8609.
2021-10-12 17:09:54 +02:00