Lipu Fei
fb3c1fc11d
Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material
2018-12-04 17:15:26 +01:00
Ian Paschal
a28cae0a43
Improve date rendering
...
- Use "Mon Dec 3 at 12:39" if 7 days or more away.
- Use "Mon at 12:39" if within 7 days but more than one away.
- Use "tomorrow at 12:39" if one day away.
- Use "today at 12:39" if today.
Contributes to CL-1153
2018-12-03 12:18:33 +01:00
Ian Paschal
370fa0fd14
Remove old sidebar
...
Contributes to CL-1150
2018-11-28 10:46:22 +01:00
Lipu Fei
edf8460619
Return empty material model for empty material
...
CURA-5982
2018-11-27 10:35:19 +01:00
Lipu Fei
88f3325972
Add typing for _createMaterialOutputModel()
...
CURA-5887
2018-11-05 13:11:58 +01:00
Lipu Fei
fa693aef2b
Fix material shown in print jobs
...
CURA-5887
- Use MaterialManager to get materials
- For a GUID with mulitple matches, show the read-only materials first
if any. Otherwise, show non-read-only materials.
2018-11-05 11:48:19 +01:00
Lipu Fei
02681a5700
Change camera URL to non-optional QUrl
...
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
2018-10-29 13:25:23 +01:00
fieldOfView
e0d6bac37d
Fix remaining references to NetworkCamera and OutputDevice.activeCamera
2018-10-29 11:18:54 +01:00
fieldOfView
c187b6a25c
Replace NetworkCamera with NetworkMJPGImage
2018-10-29 11:18:39 +01:00
Ian Paschal
2dcfc049ba
Remove skeleton loading after print jobs received
...
Contributes to CL-1051
2018-10-17 14:28:17 +02:00
Ian Paschal
82cddf07ad
Move ConfigurationChangeModel to plugin
...
Contributes to CL-897
2018-10-01 17:12:05 +02:00
Simon Edwards
b7673a7438
Show Cura Connect alerts in the monitor tab
...
CL-897
2018-09-19 16:53:18 +02:00
Ian Paschal
18e0dacda4
Organize files better
...
First things first... organize!
2018-09-07 14:11:37 +02:00