Marijn Deé
fd4d1113b9
use right plural in variable name
2018-11-27 15:42:26 +01:00
Marijn Deé
172e003e1b
Removed the inital call to clusters
2018-11-27 14:53:23 +01:00
Marijn Deé
fb019ba987
In CloudOutputDeviceManager start a thread to periodically check for changes in the connected clusters
2018-11-27 14:48:47 +01:00
ChrisTerBeke
2d7588903c
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 15:55:34 +01:00
ChrisTerBeke
e4d8fb36ab
Add more typing as per request from @sedwards2009
2018-11-26 15:53:04 +01:00
ChrisTerBeke
da5683c876
add typing to models
2018-11-26 15:30:30 +01:00
ChrisTerBeke
aaf0f69820
Fix some more relative imports
2018-11-26 15:10:36 +01:00
ChrisTerBeke
42ccabc7b6
Fix relative imports for plugin
2018-11-26 15:09:56 +01:00
ChrisTerBeke
a9fedb4f66
Restore NetworkedPrinterOutputDevice for now
2018-11-26 15:05:53 +01:00
ChrisTerBeke
39f92ced90
Comment out test
2018-11-26 15:02:52 +01:00
ChrisTerBeke
269d596f5d
Fix typing for cluster list
2018-11-26 14:54:24 +01:00
ChrisTerBeke
856276d8b7
Cleanup plugin imports
2018-11-26 14:53:08 +01:00
ChrisTerBeke
6a43d10982
Use BaseModel for CloudCluster, some fixes
2018-11-26 14:51:24 +01:00
Marijn Deé
579522857a
Fix the code-style test
2018-11-26 14:42:50 +01:00
ChrisTerBeke
7654f1c71c
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 14:30:50 +01:00
Marijn Deé
a382b77eaa
Added validation to the models
2018-11-26 14:30:17 +01:00
ChrisTerBeke
89e88a73bb
Temporary patch for when printer has one or more materials not installed
2018-11-26 14:11:20 +01:00
ChrisTerBeke
45159f7a80
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 14:09:13 +01:00
ChrisTerBeke
68a90ec510
Use simple models instead of namedtuples
...
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
2018-11-26 14:08:21 +01:00
ChrisTerBeke
014b1d6e4e
test
2018-11-26 13:45:37 +01:00
ChrisTerBeke
21c81603b4
Use application singleton instead of locally cached application
2018-11-26 13:33:14 +01:00
ChrisTerBeke
620ba8f21d
Merge branch 'master' into cloud-output-device
2018-11-26 11:17:39 +01:00
Marijn Deé
908628e2aa
Added a model to represent a cluster
2018-11-26 10:47:53 +01:00
Marijn Deé
d8232caec0
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 10:14:34 +01:00
Marijn Deé
59510487fa
Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin
2018-11-26 09:50:40 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist
...
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
2018-11-26 09:40:14 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location
...
This crashes Cura on start-up for some people.
2018-11-26 09:32:59 +01:00
Ghostkeeper
8f9d6bee62
Document dependency on fdm_materials
...
Without it, Cura simply won't start if you had a printer loaded with material profiles.
Fixes #4460 .
2018-11-26 08:30:24 +01:00
ChrisTerBeke
1adf1096a3
Merge branch 'master' into cloud-output-device
2018-11-23 14:17:26 +01:00
ChrisTerBeke
cf27a211df
Remove unused TYPE_CHECKING import
2018-11-23 14:15:40 +01:00
ChrisTerBeke
ef5ca6f5a9
Remove unused typing import
2018-11-23 14:15:21 +01:00
ChrisTerBeke
3e100775df
Fix instantiating CloudOutputDeviceManager
2018-11-23 14:14:35 +01:00
ChrisTerBeke
2fc5061c41
Fix some PR comments, cleanup imports
2018-11-23 14:11:43 +01:00
ChrisTerBeke
8ee39c0489
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-23 14:08:55 +01:00
ChrisTerBeke
e3894c291c
Merge branch 'tests-for-um3networkplugin' of https://github.com/Ultimaker/Cura into tests-for-um3networkplugin
2018-11-23 11:27:41 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
...
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
alekseisasin
45076d9ca6
Merge pull request #4859 from Ultimaker/CURA-5878_gcode_file_association
...
CURA-5878 Update desktop and mimeinfo to add gcode mime type
2018-11-23 10:37:10 +01:00
Marijn Deé
76542a82d5
Removed the asserts on internals
2018-11-23 10:33:57 +01:00
Marijn Deé
294527f7fe
Review changes
2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de
Used duoble quotes iso single quotes
2018-11-23 09:20:19 +01:00
Jaime van Kessel
7ecad41625
Merge pull request #4843 from Ultimaker/fix-oauth2-client
...
Switch Ultimaker Account OAuth2 client
2018-11-22 16:38:10 +01:00
Lipu Fei
06cb628699
Update desktop and mimeinfo to add gcode mime type
...
CURA-5878
2018-11-22 15:47:12 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles
...
CL-1148 Re-styling monitor queue tiles
2018-11-22 15:08:42 +01:00
Ian Paschal
963b8aa974
Fix QML warnings
...
Contributes to CL-1148
2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9
Use array for extruder configurations
...
Contributes to CL-1148
2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f
Silence binding loop
...
Contributes to CL-1148
2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94
Remove unnecessary "else"
...
Contributes to CL-1148
2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407
Use bool for expanded or collapsed state
...
Contributes to CL-1148
2018-11-22 13:11:59 +01:00
alekseisasin
b091e3a52c
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none
...
Fix version upgrade returning none
2018-11-22 11:44:36 +01:00
Aleksei S
088b2f6f28
Added an extra import module, did not pass coding style test
...
CURA-5936
2018-11-22 11:36:32 +01:00
