9382 Commits

Author SHA1 Message Date
Jaime van Kessel
5ff07b00d0
Fix case where both a "normal" and an "abstract" ouput device could be active
CURA-8463
2022-08-31 10:27:52 +02:00
Jaime van Kessel
dd5981d85e
Only remove abstract output device if it's actually added
CURA-8463
2022-08-31 10:09:47 +02:00
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
Jaime van Kessel
feadbf04da
Fix status request for Ultimaker 2+ Connect
CURA-8463
2022-08-30 16:42:15 +02:00
Jaime van Kessel
e2ba110cf7
Ensure that all material configs are added to the list
CURA-8463
2022-08-30 16:33:29 +02:00
Jaime van Kessel
6fed6b824c
Added stub for AbstractCloudOutputDevice
It doesn't actually allow you to send a print, but it does ask some info from the API

CURA-8463
2022-08-30 15:53:47 +02:00
c.lamboo
c7f8fe8feb Don't add is_online to .3mf files
from eccb
2022-08-30 13:38:19 +02:00
Jaime van Kessel
38e4ca1e0f
Updated documentation link
CURA-8463
2022-08-30 13:30:42 +02:00
Jaime van Kessel
65a0a2f67b
Update formatting of CloudAPIClient
CURA-8463
2022-08-30 13:23:01 +02:00
Jaime van Kessel
143f796ba6
Use get instead of direct []
The next line (checking if the result is None) doesn't make sense otherwise

CURA-8463
2022-08-30 13:13:32 +02:00
Jaime van Kessel
587d71bb57
Fix typo
CURA-8463
2022-08-30 13:11:42 +02:00
Jaime van Kessel
6d947963a4
Remove stray whitespace
CURA-8463
2022-08-30 13:11:17 +02:00
c.lamboo
cf99114de8 Only display message for abstract printers
CURA-9422
2022-08-30 13:10:03 +02:00
Jaime van Kessel
b689a84bcb
Add explicit typing 2022-08-30 13:09:53 +02:00
Jaime van Kessel
718d3790e2
Clean up iterating over cluster list
CURA-8463
2022-08-30 13:07:19 +02:00
Jaime van Kessel
7eabbd7b5c
Convert _updateOnlinePrinters to static
CURA-8463
2022-08-30 11:52:13 +02:00
Jaime van Kessel
f4c4b52d9b
Update typing to reflect new message that is being used
CURA-8463
2022-08-30 11:49:09 +02:00
Jaime van Kessel
ce3ab62c91
Move RemovedprintersMessage to it's own class
The OutputDeviceManager is just too bloated to properly make sense of.
So I'm trying to move as much code out of it so I can start to make sense of it

CURA-8463
2022-08-30 11:45:30 +02:00
Jaime van Kessel
45e7d15c80
Add documentation for _onDiscoveredDeviceRemoved 2022-08-30 11:36:47 +02:00
Jaime van Kessel
7f9984cd16
Also move remainder of NewPrinterDetected logic to it's own class
This should make the CloudOutputDeviceManager a bit more readable

CURA-8463
2022-08-30 11:33:20 +02:00
Jaime van Kessel
a429a93e94
Move new printers detected message to it's own class
CURA-8463
2022-08-30 11:26:09 +02:00
Jaime van Kessel
8e9056df71
Rename function to better reflect what it does
CURA-8463
2022-08-30 11:11:00 +02:00
Jaime van Kessel
d35441603b
Rename variables so it's easier to understand what is what
CURA-8463
2022-08-30 11:06:09 +02:00
Jaime van Kessel
30bc0d04bf
Add more typing & documentation
Even more boyscouting. This code seems to be far too complex for what it should be...

CURA-8463
2022-08-30 11:04:15 +02:00
Jaime van Kessel
21b8f083f2
Ensure that UI actually updates when adding remote printers
More boyscouting. The documentation that it had before was actually false...
CURA-8463
2022-08-30 11:03:04 +02:00
Jaime van Kessel
24f85bae06
Use new style string formating
Moar boyscouting

CURA-8463
2022-08-30 10:52:21 +02:00
Jaime van Kessel
ed33596357
Rename device to global_stack
Device was used in the rest of this class for the output device, not
for a machine. This was a bit confusing

CURA-8463
2022-08-30 10:46:10 +02:00
Jaime van Kessel
f8ebf98df3
Update typing hints to new style
More boyscouting as I try to understand this code
CURA-8463
2022-08-30 10:43:53 +02:00
Jaime van Kessel
4ac8229c33
Clean up codestyle violations
Boyscouting! CURA-8463
2022-08-30 10:28:22 +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
Jaime van Kessel
36d3a92fc0
Fix gramar mistake in documentation
CURA-8463
2022-08-26 13:27:58 +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