3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
17187 commits 313 branches 275 tags 718 MiB
Commit graph

17187 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
ChrisTerBeke
02efc9e1a9 Fix cloud status icon size 2018-12-04 16:54:36 +01:00
Daniel Schiavini
27dc17f993 STAR-322: Extracting translations 2018-12-04 16:49:26 +01:00
ChrisTerBeke
075fa813d6 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:48:09 +01:00
ChrisTerBeke
9df49a1232 Add the actual icon contents 2018-12-04 16:39:46 +01:00
Marijn Deé
997811720c Merge remote-tracking branch 'origin/STAR-322_cloud-connection' into STAR-322_cloud-connection 2018-12-04 16:36:01 +01:00
Marijn Deé
3a733bb0a3 Check before removing a printer 2018-12-04 16:35:48 +01:00
ChrisTerBeke
907ade6266 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:35:18 +01:00
ChrisTerBeke
0887817f7d use special icon for cloud connected 2018-12-04 16:35:09 +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
Jaime van Kessel
fd6a8d7642 Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-04 15:47:27 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic 
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
 2018-12-04 15:46:13 +01:00
Simon Edwards
39c282fabe
Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor 
CL-1153 printer states in monitor
 2018-12-04 15:30:12 +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
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +01:00
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1 
CURA-5943
 2018-12-04 15:03:45 +01:00
Lipu Fei
02e7f90473 Fix module importing in USBPrinting 
CURA-5943
 2018-12-04 15:02:52 +01:00
Jaime van Kessel
5b4fad3c08 When toggling auto-slice, force a re-slice 
CURA-5997
 2018-12-04 14:54:15 +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
7de947f5fa use correct label text 2018-12-04 14:15:19 +01:00
ChrisTerBeke
e98f3bff38 Implement test version of showing cloud connected printers in list 2018-12-04 14:09:20 +01:00
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