19 Commits

Author SHA1 Message Date
Jack Ha
2ae5334dde Solve merge conflicts 2017-10-02 16:13:32 +02:00
Jack Ha
341b2b3718 CL-228 CL-229 better fallback to printer status labels 2017-10-02 16:02:59 +02:00
Jack Ha
6d861c8a33 CL-228 CL-229 more detailed printer status labels 2017-10-02 15:41:07 +02:00
Jack Ha
321e531b1c CL-457 remove screenScaleFactor because statusText.height already has devicePixelRatio included 2017-10-02 15:03:07 +02:00
Simon Edwards
e1001c1aa4 CL-470 Update the icon SVGs
Subtask of CL-457 Cura plugin: primary visual improvements
2017-10-02 13:53:09 +02:00
Jack Ha
48ad909431 CL-457 removed commented out code 2017-10-02 11:45:09 +02:00
Jack Ha
2264c6c303 CL-457 corrected qml errors 2017-10-02 11:37:08 +02:00
Simon Edwards
3abf25937b CL-470 Add icons to the printer state box on the monitor tab.
Subtask of CL-457 Cura plugin: primary visual improvements
2017-10-01 13:30:44 +02:00
Simon Edwards
5865d52000 CL-474 Fix the image used for the camera icon
Subtask of CL-457 Cura plugin: primary visual improvements
2017-10-01 12:01:08 +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
cee8a687da Show the printer status as 'printing' in the case that a running print job isn't under control of Cura Connect 2017-09-30 11:06:31 +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
Jack Ha
b7dd756427 CL-506 changed Aborted to Print aborted and added it to all translations on the top 2017-09-29 11:21:15 +02:00
Ghostkeeper
4932cc1e85
Revert string changes that can easily be reverted
These strings can be re-used from other places.

Contributes to issue CL-506.
2017-09-29 11:03:33 +02:00
fieldOfView
940a8a44c8 Apply screenScaleFactor to Cura Connect UI
Any pixel size specified in QML should not either use UM.Theme.getSize(), or use screenScaleFactor to make sure the pixel size is as intended on OSX, Windows and Linux regardless of display DPI.

Contributes to CURA-4376
2017-09-28 17:36:35 +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
01ff608a09 Change "Required action" to "Action required"
CL-118
2017-09-28 11:40:48 +02:00
Simon Edwards
4ca8bc5a9e CL-118 Add support and text for disabled printers and print jobs which require config changes. 2017-09-28 11:25:34 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
CURA-4376
2017-09-27 10:29:48 +02:00