16 Commits

Author SHA1 Message Date
Simon Edwards
91c5515d4e Merge pull request #2541 from Ultimaker/CL-228-authorization
CL-228 CL-229 authorization and fixup state display
2017-10-02 17:33:11 +02:00
Simon Edwards
6dade56758 Unapply the @override decorator as it doesn't actually work
CL-228
2017-10-02 17:12:15 +02:00
Simon Edwards
b5b3f47e4d Apply the @override decorator
CL-228
2017-10-02 17:05:39 +02:00
jack
dfe4a76e85 Merge pull request #2543 from Ultimaker/CL-511_abort_crash
CL-511 fix abort crash
2017-10-02 16:51:46 +02:00
Robin den Hertog
a9c732e624 Made sure printers are present before printjobs to avoid referring to unknown printers
CL-523

Signed-off-by: Robin den Hertog <r.denhertog@ultimaker.com>
2017-10-02 16:39:28 +02:00
Simon Edwards
ece9f73a10 Don't actively none/null out the Qt network objects. Let them live longer to avoid "premature object destroy" crashes.
CL-511
2017-10-02 16:32:38 +02:00
Simon Edwards
4439ce1e43 Stop building and sending the POST request if the user has already aborted it all
CL-511
2017-10-02 16:31:32 +02:00
Jack Ha
2ae5334dde Solve merge conflicts 2017-10-02 16:13:32 +02:00
jack
575c3ebebb Merge pull request #2530 from Ultimaker/CL-457_cura_connect_visual
CL-457 cura connect visual
2017-10-02 14:40:13 +02:00
Jack Ha
5a3e427450 CL-228 when adding a Cura Connect printer, do not ask authentication, it is always authenticated 2017-10-02 14:20:41 +02:00
Jack Ha
b7a6a13336 CL-271 correct string and change Unknown printer to Unknown which is already in the catalog 2017-10-02 10:14:34 +02:00
Simon Edwards
553a309d23 CL-473 Print job duration time has the wrong format. Use the Cura format from the Prepare tab.
Subtask of CL-457 Cura plugin: primary visual improvements
2017-09-30 12:59:46 +02:00
Simon Edwards
21af3fb109 Show a notification when a configuration change is needed for your print
CL-271
2017-09-29 17:17:57 +02:00
Simon Edwards
e868b972b5 Implement the print job pause, resume and abort for Cura Connect
CL-455
2017-09-29 13:07:06 +02:00
Simon Edwards
8658053a3b Improved status messages, and the 'printing' counter in the sidebar.
CL-118
2017-09-28 14:37:38 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
CURA-4376
2017-09-27 10:29:48 +02:00