GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 08:57:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,795 Commits 290 Branches 260 Tags
Commit Graph

712 Commits

Author SHA1 Message Date
Diego Prado Gesto
4949f39c34 Add translatable strings to empty and unknown material 
Contributes to CL-1160.
 2018-12-11 12:10:32 +01:00
Daniel Schiavini
4fddf1b7c7 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 11:56:43 +01:00
Daniel Schiavini
d54fc4182b STAR-322: Fixing style errors 2018-12-11 11:56:36 +01:00
Diego Prado Gesto
70b0d16fa4 Fix typo 
Missing parenthesis.

Contributes to CL-1160.
 2018-12-11 11:53:26 +01:00
Diego Prado Gesto
2b2e8ebb31 Add some safety checks when checking for the guid of the material 
Don't crash if the guid doesn't exist.

Contributes to CL-1160.
 2018-12-11 11:37:01 +01:00
ChrisTerBeke
816c6bd4ec Fixes after merging UI changes 2018-12-11 11:12:36 +01:00
Daniel Schiavini
7668801564 STAR-322: Adding documentation and fixing model types 2018-12-11 11:12:32 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Ian Paschal
0f357e1078 Replace fix for 'None' materials 
This was fixed in 4.0 and accidentally got reverted when merging another branch in.

Contributes to CL-1160
 2018-12-11 10:51:05 +01:00
Daniel Schiavini
bfd236dae4 STAR-322: Testing cloud printing 2018-12-10 16:11:43 +01:00
Daniel Schiavini
d482924ea2 STAR-322: First tests for cloud output device 2018-12-10 14:43:02 +01:00
Ian Paschal
df4e5c40df Rename ClusterMonitorItem 
Contributes to CL-1152
 2018-12-10 12:19:52 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab 
Contributes to CL-1152
 2018-12-10 11:36:51 +01:00
Daniel Schiavini
134f97d5f1 STAR-322: Finishing the output device manager tests 2018-12-10 11:30:02 +01:00
Daniel Schiavini
63c5b77959 STAR-322: Fixing finished jobs 2018-12-07 16:43:53 +01:00
Daniel Schiavini
5b963de2ea STAR-322: Checking if response changed before updating cluster 2018-12-07 13:19:45 +01:00
Daniel Schiavini
2b8358fda8 STAR-322: Improvements to date calculation and signalling 2018-12-07 12:39:37 +01:00
Daniel Schiavini
4f82a2759a STAR-322: Improving configuration models interface 2018-12-07 12:04:02 +01:00
Daniel Schiavini
a1c252d3a2 Revert "Revert "fix merge conflict"" 
This reverts commit 4bffa6d90f2e6e9784c7e5508b61e00a92ecb74f.
 2018-12-07 10:25:46 +01:00
Daniel Schiavini
4bffa6d90f Revert "fix merge conflict" 
This reverts commit ec03b012a77a766e45a43a224bbb76cd32d0915a, reversing
changes made to 2af33738d17f95c87dcb8c826b0940576e4359c3.
 2018-12-07 10:22:32 +01:00
ChrisTerBeke
3ebefa4f8a Add more TODO comments to clarify 2018-12-06 16:59:09 +01:00
ChrisTerBeke
ec03b012a7 fix merge conflict 2018-12-06 16:39:58 +01:00
Marijn Deé
2af33738d1 Don't look at the timer 2018-12-06 16:32:00 +01:00
Marijn Deé
373c953dbf Showing print queue, works with multiple printers in cluster, Add TODO 2018-12-06 16:25:04 +01:00
Marijn Deé
05ca0b372a Updated TODO, printjobs are not displayed in the monitor page because 
data returned from cura connect api contains None's instead of printer
uuid's
 2018-12-06 14:04:12 +01:00
Marijn Deé
eb3777ed9f Cleaner login and update cluster flow, start update cluster timer 
at startup when the user is already logged in
 2018-12-06 10:40:06 +01:00
ChrisTerBeke
94f31378a6 Add a TODO 2018-12-05 17:24:47 +01:00
ChrisTerBeke
ce07e31bbf Implement active printer for cloud device to get monitor page functionality working 2018-12-05 17:21:46 +01:00
ChrisTerBeke
66690dfef7 Add testing todo 2018-12-05 17:06:22 +01:00
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
117cf10a2c STAR-322: Removing devices when logging off 2018-12-05 16:26:20 +01:00
Daniel Schiavini
657e763318 STAR-322: Using findChanges method to simplify code 2018-12-05 16:15:51 +01:00
Daniel Schiavini
7e76913736 STAR-322: Fixing printer matching by network key 2018-12-05 16:02:38 +01:00
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
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
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