GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-20 01:53:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,960 Commits 295 Branches 268 Tags
Commit Graph

13410 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ghostkeeper
052e33e66b
Don't anchor status label to button any more 
It's now in a completely different place.

Contributes to issue CURA-8609.
 2021-10-12 10:17:03 +02:00
Ghostkeeper
4661b02e4c
Move code and status related to uploading materials to separate class 
There's quite a lot of status to track, errors and progress. It's better kept separate.

Contributes to issue CURA-8609.
 2021-10-12 09:43:21 +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
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
Ghostkeeper
c3d392c5cf
Show upload error or success in header once completed 
According to the brand new design.

Contributes to issue CURA-8609.
 2021-10-11 15:27:54 +02:00
Ghostkeeper
8ae93c6bc1
Resolve binding loops in sync spinner 
Contributes to issue CURA-8609.
 2021-10-11 15:19:06 +02:00
Ghostkeeper
ffd3277854
Show error if the upload failed 
Contributes to issue CURA-8609.
 2021-10-11 14:57:21 +02:00
Ghostkeeper
ffee4a2443
Show syncing spinner while syncing 
Rather than disabling the sync button, hide it completely and show this spinner instead.

Contributes to issue CURA-8609.
 2021-10-11 14:30:10 +02:00
Ghostkeeper
56eb694745
Hide refresh button if there are no offline printers 
It's not considered a big use case when the user has already added some printers but would want to add more while syncing materials to those printers.

Contributes to issue CURA-8609.
 2021-10-11 14:11:28 +02:00
Ghostkeeper
9ffbaa772f
Add back button to return from USB workflow to welcome screen 
This allows the user to see the welcome screen instructions again. Or to switch back to internet-syncing if they accidentally pressed the USB button (or were just curious).

Contributes to issue CURA-8609.
 2021-10-11 13:58: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
Ghostkeeper
43bcd2b56a
Implement info icon with UM.StatusIcon 
This way the sizes are consistent with the other similar icons in the UI.

Contributes to issue CURA-8609.
 2021-10-11 13:49:45 +02:00
Ghostkeeper
da76280359
Make USB image a bit larger 
This is more in line with the design.

Contributes to issue CURA-8609.
 2021-10-11 13:38:41 +02:00
Ghostkeeper
e7b49ee551
Disable sync button while in progress 
Need to show a bit more feedback I think. Let's see what the design said...

Contributes to issue CURA-8609.
 2021-10-11 13:11:54 +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
p.kuiper
730fb72f78 Merge branch 'master' into PP-1-Improved_print_profiles 2021-10-11 08:09:05 +02:00
Jaime van Kessel
9ca5a52659 Also speed up the expression for the value of a setting item 2021-10-08 18:35:02 +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
Jaime van Kessel
285a4584e7 Improve speed of the inherit button 
A few unneeded conversions were done. Also moved one check to python from JS
 2021-10-08 18:12:35 +02:00
Ghostkeeper
fb7e67b8ad
Change 'hit' to 'click' 
This is more consistent with other texts.

Contributes to issue CURA-8609.
 2021-10-08 16:51:04 +02:00
Ghostkeeper
599c59bd3a
Add a background job to upload material archives 
It creates the archive now. It doesn't yet upload it.

Contributes to issue CURA-8609.
 2021-10-08 15:15:57 +02:00
Ghostkeeper
a7f172d836
Only show online printers in list of printers to sync to 
We can only sync with printers that are currently online.
We'll just send it to the account to sync with everything. But these are the ones it should arrive with.

Contributes to issue CURA-8609.
 2021-10-08 14:22:46 +02:00
Ghostkeeper
32c63c2757
Add isOnline role to GlobalStacksModel 
This way we can filter for only online printers or display whether printers are online or not in the future.

Contributes to issue CURA-8609.
 2021-10-08 14:09:12 +02:00
Jaime van Kessel
65a35bbebc Move creaseee extruders and definitions to correct folder 2021-10-08 10:52:10 +02:00