17205 Commits

Author SHA1 Message Date
Marijn Deé
7c60b2de93 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 13:57:53 +01:00
Marijn Deé
5d77209cfb Be more efficient in updating the print jobs 2018-12-04 13:57:41 +01:00
ChrisTerBeke
82d2696739 Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-04 13:35:21 +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
Lipu Fei
0d086008ae Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 11:38:47 +01:00
ChrisTerBeke
65d6791077 Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-04 11:18:29 +01:00
Ian Paschal
249a90199b Improve printer status handling
Contributes to CL-1153
2018-12-04 11:08:01 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index
CURA-5981
2018-12-04 10:55:01 +01:00
Ian Paschal
ab245bbff6 Make "finishes at" single translatable string
Contributes to CL-1153
2018-12-04 10:23:26 +01:00
Ian Paschal
0363c1257c Improve exposed progress prop
Contributes to CL-1153
2018-12-04 10:18:09 +01:00
ChrisTerBeke
12b3f0088d Add content type to file upload 2018-12-04 10:07:43 +01:00
Diego Prado Gesto
57a852a15a Don't show the background if there are less than 2 extruders to show in the Toolbar
It caused a very tiny rectangle if the printer has only 1 extruder.

Contributes to CURA-5984.
2018-12-04 09:19:08 +01:00
Diego Prado Gesto
c1f5c00a7e Forgot to add the icon 2018-12-04 09:18:45 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs
Adjust the padding in the preview shortcut.
2018-12-04 09:12:57 +01:00
Ghostkeeper
6af1e72ea3
Show progress bar while autoslice is preparing
Previously it would say 'preparing to slice'. Now it just says 'auto slicing' but with an indeterminate progress bar. Only the indeterminate progress bar just appears empty right now...

Contributes to issue CURA-5997.
2018-12-04 07:51:48 +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
Ghostkeeper
f320000ce5
Change default profile of Aurora and Alfawise printers
Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
2018-12-03 17:23:44 +01:00
ChrisTerBeke
90ec3f6cf9 Add TODO for progress messages 2018-12-03 17:22:21 +01:00
ChrisTerBeke
5db6bd9a9b Send content type to API when uploading print job 2018-12-03 17:09:04 +01:00
Daniel Schiavini
2b8c9c17bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-03 16:39:24 +01:00
Daniel Schiavini
186c2cf3f5 START-322: Python 3.5 compatibility 2018-12-03 16:35:51 +01:00
ChrisTerBeke
ddf958d39a Fix typing in CloudOutputDevice 2018-12-03 16:23:44 +01:00
ChrisTerBeke
24b75d781e Fix merge conflict 2018-12-03 15:58:25 +01:00
Daniel Schiavini
f8f6670cae STAR-322: Letting models convert sub-models 2018-12-03 15:06:01 +01:00
Ian Paschal
95400282b9 Simplify logic slightly
Contributes to CL-1153
2018-12-03 14:44:15 +01:00
Ian Paschal
cced42a55b Handle idle, unavailable, and unreachable states
Contributes to CL-1153
2018-12-03 14:41:45 +01:00
Daniel Schiavini
fc26ccd6fa STAR-332: Some improvements to get the job in connect 2018-12-03 14:41:36 +01:00
Ian Paschal
c9ed044205 Improve printer status and progress bar
Contributes to CL-1153
2018-12-03 14:41:22 +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
3d80e28174 Add some typings
Contributes to CL-1153
2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python
Contributes to CL-1153
2018-12-03 12:15:25 +01:00
Daniel Schiavini
8066074a2f STAR-332: Fixing warnings 2018-12-03 11:02:49 +01:00
Lipu Fei
c688f0ea88
Merge pull request #4864 from Ultimaker/CURA-5943_ui_usb_printing
Cura 5943 ui usb printing
2018-12-03 10:42:58 +01:00
Diego Prado Gesto
e73a91e746 Merge branch 'master' into ui_rework_4_0 2018-12-02 12:11:12 +01:00
Jaime van Kessel
6ab2ce7690 Decrease padding between time & material specification headers 2018-11-30 16:44:55 +01:00
Jaime van Kessel
36a86adc0f Remove spammy log 2018-11-30 16:08:19 +01:00
Marijn Deé
8b42b84618 Made a start with uploading jobs to the printer 2018-11-30 16:07:20 +01:00