GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-02 15:41:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,012 Commits 295 Branches 267 Tags
Commit Graph

9149 Commits

Author SHA1 Message Date
Remco Burema
e69b855b2b
Merge pull request #13127 from Ultimaker/CURA-9221_show_message_cloud_approval 
[CURA-9221] Show message cloud approval
 2022-08-30 16:53:47 +02:00
Remco Burema
7ab16e078c Speared spurious space. 
done as part of CURA-9221
 2022-08-30 16:45:34 +02:00
c.lamboo
c7f8fe8feb Don't add is_online to .3mf files 
from eccb
 2022-08-30 13:38:19 +02:00
c.lamboo
cf99114de8 Only display message for abstract printers 
CURA-9422
 2022-08-30 13:10:03 +02:00
c.lamboo
426a5c3cc5 Add correct image in monitor page 
CURA-9422
 2022-08-29 10:40:35 +02:00
c.lamboo
6f4796f34f Remove commented out code 
CURA-9422
 2022-08-29 09:26:26 +02:00
c.lamboo
ad7c18d75e Increase margins 
between image, text and action button in the monitor page

CURA-9422
 2022-08-29 09:26:08 +02:00
Remco Burema
55c312e9bb Some minor GUI tweaks. 
part of CURA-9422
 2022-08-26 14:56:10 +02:00
Remco Burema
4f75251000 Prettify monitor page for abstract cloud printers. 
Fill placeholder. Image is the closest I could find in the current SVG's. Other than that, this should be it mostly for the 'monitoring' of abstract cloud printers.

part of CURA-9422
 2022-08-26 14:41:44 +02:00
Remco Burema
95f234679c Placeholder; the selected printer to monitor is abstract, but cloud-capable. 
forms the base of CURA-9422
 2022-08-26 13:10:09 +02:00
joeydelarago
9c599870e3 Move message triggering into CloudOutputDevice so that the campaign link can include the cluster_id. 
CURA-9221
 2022-08-26 10:59:03 +02:00
Joey de l'Arago
119fb32681
Update plugins/UM3NetworkPrinting/src/Messages/PrintJobAwaitingApprovalMessage.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-08-26 10:14:36 +02:00
joeydelarago
0993dc99f9 Remove unused import 
CURA-9221
 2022-08-26 09:00:17 +02:00
joeydelarago
a6f459b0f6 Update links 
CURA-9221
 2022-08-26 08:55:12 +02:00
joeydelarago
a58690c774 change _parseModels -> _parseResponse since it now parses responses with no models included. 
Move status check into _parseResponse

Don't give PrintJobUploadSuccessMessage() if printis awaiting approval. The print has successfully uploaded but it is pending approval instead so it does not make sense to display both messages.

CURA-9221
 2022-08-25 14:49:40 +02:00
joeydelarago
30692bb4b8 Add link out to learn more 
CURA-9221
 2022-08-25 14:13:25 +02:00
joeydelarago
1a023f7285 Swap text and title for message. 
Move link opening code into the PrintJobAwaitingApprovalMessage.py

CURA-9221
 2022-08-24 17:02:17 +02:00
joeydelarago
9b20a1b37f Merge branch 'main' into CURA-9221_show_message_cloud_approval 2022-08-24 16:15:24 +02:00
joeydelarago
abb6d20beb Remove enum, python has no build in support for getting enum from string value. This will be in Python 3.11 though. 
CURA-9221
 2022-08-24 14:06:30 +02:00
joeydelarago
17e6bccf51 Create abstract printers when adding lan printers. 
CURA-9514
 2022-08-24 10:07:17 +02:00
jspijker
54e9dbf827 Show device name of failed machine creation in log 
CURA-9277 Detect and Load Specific printers and Cloud Printer Types
 2022-08-22 14:57:37 +02:00
Casper Lamboo
12f3581337
Assign result of createAbstractMachine to a variable 
With prepended underscore to highlight the result of the function is not being used.

CURA-9277
 2022-08-22 14:44:45 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:00 +02:00
c.lamboo
761bf3b8fa Fix creating abstract machines on account sync 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 14:44:19 +02:00
joeydelarago
b82f1f4a8c Add new Abstract machine stack type. This represents a type of printers (ultimaker_s3 etc). 
These are created whenever a cloud printer of a new printer type is added.

CURA-9277

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-08-19 13:53:43 +02:00
joeydelarago
ad70566dc6 Added a message for pending approval status. 
Updated CloudPrintJobResponse to use an enum for status

CURA-9221
 2022-08-10 17:34:48 +02:00
digitalfrost
aed16cf849 PostProcessingPlugin/.../Stretch.py Use enumerate 
Use enumerate instead of range(len
 2022-08-10 10:47:18 +02:00
digitalfrost
72751b2507 Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 09:36:53 +02:00
digitalfrost
0f0815efab Use is not operator rather than not ...is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 09:33:26 +02:00
digitalfrost
d65e198e8c Use is not operator rather than not ...is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-08 09:28:26 +02:00
digitalfrost
2f9e5b00bb Use is not operator rather than not ... is 
This is advocated by both PEP8 and the Google Python Style Guide
 2022-08-07 10:09:33 +02:00
Jelle Spijker
7b768ca810
Merge pull request #12866 from Ultimaker/CURA-9220_hide_if_no_permission 
Hide cloud interaction buttons if the user has no permissions to them
 2022-08-01 12:41:11 +02:00
Ghostkeeper
8a55a2aff6
Further review suggestions 
Contributes to issue CURA-9220.
 2022-08-01 10:49:29 +02:00
Ghostkeeper
7c1a254812
Add newlines before properties 
As suggested in the code review.

Contributes to issue CURA-9220.

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-01 10:47:57 +02:00
Ghostkeeper
a0f640586c
Add slice ID to example data 
Contributes to issue CURA-9031.
 2022-07-29 15:57:10 +02:00
j.spijker@ultimaker.com
a88e31eddd Add the slice_uuid to the slice info data 
Contributes to CURA-9031
 2022-07-27 18:13:09 +02:00
j.spijker@ultimaker.com
a712e7517a Add the received slice_uuid to the print information 
Contributes to CURA-9031
 2022-07-27 18:12:25 +02:00
Ghostkeeper
f849df6ba3
Remove old df_access additional right 
It is replaced by the new permissions system. The rights are more specific than 'digital factory access, yes or no'. It's now about whether you can read/write printers/projects/print jobs/etc and can differ whether it is your own project/job/etc or someone else's.

Contributes to issue CURA-9220.
 2022-07-26 17:49:55 +02:00
Ghostkeeper
615f16bda0
Hide 'show in browser' when the user can't visit the printer overview 
No use then. They can't visit that page.

Contributes to issue CURA-9220.
 2022-07-26 16:57:07 +02:00
Ghostkeeper
19ba092340
Add property of whether the printer details can be read 
We'd assume so, but there is a permissions node for it. If it can't be read by the user, they can't navigate to the printer's overview page. So we should hide the button then.

Contributes to issue CURA-9220.
 2022-07-26 16:56:19 +02:00
Ghostkeeper
e9f9730364
Don't show context menu button if it is empty 
It will likely be empty for guest accounts on networks where the administrator is the only one with rights to access other people's prints.

Contributes to issue CURA-9220.
 2022-07-26 16:36:38 +02:00
Ghostkeeper
5eb340e3f0
Check permissions before showing abort/pause/delete context buttons 
The user needs permissions to do these things, so don't show them if the user can't use them.

Contributes to issue CURA-9220.
 2022-07-25 17:34:34 +02:00
Ghostkeeper
99d93fa58a
Check if the user can change the queue before showing option 
If the user can't change the queue of other prints, then it can't move prints to the top.

Contributes to issue CURA-9220.
 2022-07-25 17:07:52 +02:00
Ghostkeeper
bef10b8b35
Hide print queue if the user can't read the print queue 
If there are no permissions, this would result in an error and a supposedly empty queue. That's incorrect. It should make it more clear that the user has no permissions to view the queue, while appearing that it is the normal workflow (it is for that user). So hide the queue entirely, just like with the UM2+C.

Contributes to issue CURA-9220.
 2022-07-25 16:57:47 +02:00
Ghostkeeper
9e1940dd4b
Move default behaviour up in inheritance hierarchy 
This way, any new printer types we define will automatically get these properties that are used by the monitor stage anyway.

Contributes to issue CURA-9220.
 2022-07-25 16:55:05 +02:00
Ghostkeeper
b4c4371929
Add properties of whether the queue can be manipulated 
Not all printers can do that.

Contributes to issue CURA-9220.
 2022-07-25 16:51:13 +02:00
Ghostkeeper
483911dc4a
Fix error of undefined property when using LAN printers 
This property was defined for Cloud printers, but not for Network printers. In QML this then resulted in an error saying that null cannot be assigned to a bool (for the 'visible' property). The visible property then defaulted to its default, true. And so it was always visible, but still had an error.
The error is now solved so that I can also check for other properties in this visible check.

Contributes to issue CURA-9220.
 2022-07-25 16:49:48 +02:00
c.lamboo
0afab9f9e9 Add label-string to translations 2022-07-18 10:40:41 +02:00
Jelle Spijker
1a0ecfd850
Merge branch '5.1' 
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
 2022-07-14 16:30:52 +02:00
Evangelos Trantos
96c4e15c03
Merge pull request #12746 from Ultimaker/CURA-9465_dark_theme_issues 
Fix multiple dark theme issues
 2022-07-14 09:34:58 +02:00