ChrisTerBeke
cd67100097
Comment out some currently broken code
2018-12-05 15:40:45 +01:00
Daniel Schiavini
9f4b047ee1
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-05 14:08:46 +01:00
Daniel Schiavini
b693b9d98f
STAR-322: Extracting models to be able for converting themselves
2018-12-05 14:08:40 +01:00
ChrisTerBeke
7d7dd6bdde
First idea for pairing local and remote clusters
2018-12-05 14:02:53 +01:00
Diego Prado Gesto
07d58c3aef
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-12-05 13:56:21 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0
2018-12-05 13:29:06 +01:00
Diego Prado Gesto
909b0f3f7e
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-12-05 13:10:42 +01:00
Diego Prado Gesto
537929893f
Merge branch 'master' into ui_rework_4_0
2018-12-05 13:10:14 +01:00
Ian Paschal
e8a933331c
Clean-up printer status label
...
Contributes to CL-1153
2018-12-05 12:14:18 +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
b57f6c5c6a
Do no stop when no clusters are found, we still might need to remove some
2018-12-04 22:58:50 +01:00
ChrisTerBeke
d0513e40e1
Remove crappy implementation
2018-12-04 22:21:36 +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
Daniel Schiavini
8ea4edf67e
STAR-322: Fixing job uploads
2018-12-04 17:37:58 +01:00
Lipu Fei
4ff5e43a28
Handle Empty and Unknown material cases
...
CURA-5982
2018-12-04 17:24:51 +01:00
Lipu Fei
fb3c1fc11d
Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material
2018-12-04 17:15:26 +01:00
Lipu Fei
a13fb4a81e
Merge remote-tracking branch 'origin/master' into ui_rework_4_0
2018-12-04 17:12:24 +01:00
Daniel Schiavini
27dc17f993
STAR-322: Extracting translations
2018-12-04 16:49:26 +01:00
Marijn Deé
3a733bb0a3
Check before removing a printer
2018-12-04 16:35:48 +01:00
Marijn Deé
b32d6812db
We don't need a Signal with QTimer
2018-12-04 16:20:27 +01:00
Daniel Schiavini
54744b46a7
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 16:15:19 +01:00
Daniel Schiavini
9046b39b43
STAR-322: Creating a Cloud API client to handle the interaction
2018-12-04 16:14:08 +01:00
Marijn Deé
a9273ec2b5
Use QTimer instead of threading.Timer
2018-12-04 15:20:24 +01:00
Ian Paschal
014a138fda
Remove semi-colon
...
Contributes to CL-1153
2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671
Simplify preview icon logic
...
Contributes to CL-1153
2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8
Always return a string for preview icon
...
Contributes to CL-1153
2018-12-04 15:10:31 +01:00
ChrisTerBeke
a79cfcbe47
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 14:22:17 +01:00
ChrisTerBeke
e98f3bff38
Implement test version of showing cloud connected printers in list
2018-12-04 14:09:20 +01:00
Marijn Deé
5d77209cfb
Be more efficient in updating the print jobs
2018-12-04 13:57:41 +01:00
ChrisTerBeke
97535ffa24
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 13:23:38 +01:00
ChrisTerBeke
8e3e0c149e
fixes
2018-12-04 13:23:31 +01:00
Marijn Deé
02963eb9bf
Use a timer for the periodic update of the remote clusters and printjobs
2018-12-04 13:19:12 +01:00
Marijn Deé
99bdb9c93f
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 13:06:33 +01:00
Marijn Deé
894c69685a
Periodically update the remote clusters and printjobs
2018-12-04 13:06:27 +01:00
ChrisTerBeke
97607419cf
Start with some fakes for monitor page
2018-12-04 12:14:21 +01:00
Ian Paschal
96b9c7f3ea
Fix multi-argument i18n string
...
Contributes to CL-1153
2018-12-04 11:40:56 +01:00
Ian Paschal
249a90199b
Improve printer status handling
...
Contributes to CL-1153
2018-12-04 11:08:01 +01:00
Ian Paschal
ab245bbff6
Make "finishes at" single translatable string
...
Contributes to CL-1153
2018-12-04 10:23:26 +01:00
ChrisTerBeke
12b3f0088d
Add content type to file upload
2018-12-04 10:07:43 +01:00
ChrisTerBeke
1bcabc6f42
Fix is_online logic
2018-12-03 23:44:52 +01:00
ChrisTerBeke
b50e942768
Describe TODO for association by hostname, only connect when online
2018-12-03 23:42:41 +01:00
ChrisTerBeke
c40d76f9ee
Fix formatting according to Cura code style
2018-12-03 23:13:24 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring
2018-12-03 22:12:18 +01:00
ChrisTerBeke
08e1b4691b
Remove TODO
2018-12-03 20:19:16 +01:00
ChrisTerBeke
8d6f109092
Set priority to 2
2018-12-03 20:11:53 +01:00
ChrisTerBeke
0852d2ebef
add one more TODO
2018-12-03 17:42:39 +01:00
ChrisTerBeke
d91efc656a
Add some more todo's for UI messages
2018-12-03 17:38:31 +01:00
