Commit graph

21 commits

Author SHA1 Message Date
ChrisTerBeke
5e15858cae more mocks for monitor page, fix showing current print job in monitor page, add todo 2018-12-05 17:05:21 +01:00
Daniel Schiavini
7e76913736 STAR-322: Fixing printer matching by network key 2018-12-05 16:02:38 +01:00
Daniel Schiavini
b693b9d98f STAR-322: Extracting models to be able for converting themselves 2018-12-05 14:08:40 +01:00
Daniel Schiavini
163226f940 STAR-322: Using composition rather than inheritance 2018-12-05 12:02:04 +01:00
Daniel Schiavini
d99e2d1533 STAR-322: Extracting file handler methods 2018-12-05 11:21:17 +01:00
Daniel Schiavini
3c5e74a72c Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-05 10:44:53 +01:00
Daniel Schiavini
01e443049f STAR-322: Creating a subclass for connect devices 2018-12-05 10:37:58 +01:00
ChrisTerBeke
467d347008
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection
* ui_rework_4_0:
  Ensure that reset always correctly gets set to basic
  Remove semi-colon
  Simplify preview icon logic
  Always return a string for preview icon
  Update USBPrinting version to 1.0.1
  Fix module importing in USBPrinting
  When toggling auto-slice, force a re-slice
  Fix multi-argument i18n string
  Improve printer status handling
  Make "finishes at" single translatable string
  Improve exposed progress prop
  Simplify logic slightly
  Handle idle, unavailable, and unreachable states
  Improve printer status and progress bar
  Improve date rendering
  Add some typings
  Move isActive and timeRemaining logic from QML to Python
2018-12-04 21:30:24 +01:00
ChrisTerBeke
24b75d781e Fix merge conflict 2018-12-03 15:58:25 +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
ChrisTerBeke
89e88a73bb Temporary patch for when printer has one or more materials not installed 2018-11-26 14:11:20 +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
Renamed from plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py (Browse further)