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 648aa3d84c
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
