GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,687 Commits 290 Branches 260 Tags
Commit Graph

1132 Commits

Author SHA1 Message Date
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Ian Paschal
a5761cb56b Use new property names for cloud connection detection 2019-02-20 14:08:13 +01:00
Simon Edwards
60547b4265
Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states 
CL-1247 Improve cloud disabled states
 2019-02-20 13:17:11 +01:00
Simon Edwards
43b1c86920 Use QUrl.fromLocalFile() to create the file:// URLs for the images 2019-02-20 09:31:51 +01:00
Simon Edwards
3ad916b565 Fix the path to the pop up images in the monitor tab. 2019-02-19 17:07:09 +01:00
Simon Edwards
ebc3537537
Merge pull request #5325 from Ultimaker/CL-1222_improve_cloud_flow_toggle 
Improve "don't ask me again" checkbox
 2019-02-19 15:31:38 +01:00
Ian Paschal
7b3420653e Actually, just hide manage queue on cloud 
Contributes to CL-1247
 2019-02-19 12:27:41 +01:00
Ian Paschal
0ef014a542 Don't show "Review Connection" unless you're on the LAN 
Contributes to CL-1247
 2019-02-19 12:24:04 +01:00
Ian Paschal
b6b7f8cfce Disable queue link when connected to cloud 
Contributes to CL-1247
 2019-02-19 12:23:48 +01:00
Ian Paschal
e23dd2dd6b Grey-out buttons when using cloud connection 
Contributes to CL-1247
(includes some boyscoutin')
 2019-02-19 12:23:33 +01:00
Ian Paschal
05b5dfa05f Improve "don't ask me again" checkbox 
Contributes to CL-1222
 2019-02-19 10:13:05 +01:00
Lipu Fei
64150cc7cf Merge remote-tracking branch 'origin/4.0' 2019-02-18 13:52:27 +01:00
ChrisTerBeke
f25fefdbcb Add expected mesh back to test 2019-02-15 17:24:03 +01:00
ChrisTerBeke
11cf409d71 Fix codestyle 2019-02-15 17:07:45 +01:00
ChrisTerBeke
3f11cb911d Add filesize back to expected result 2019-02-15 17:06:32 +01:00
ChrisTerBeke
897c932e80 Fix test for cloud output device ufp uploading 2019-02-15 17:03:38 +01:00
ChrisTerBeke
119c868650 Add a test for the device properties 2019-02-15 16:52:11 +01:00
ChrisTerBeke
e80eccaea3 Manually create printer properties for cloud output device 2019-02-15 16:46:47 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Ian Paschal
0a945b8ba5 Code style 
Contributes to CL-1250
 2019-02-15 10:18:47 +01:00
Ian Paschal
f7d86667ed Simplify code a bit 
Contributes to CL-1250
 2019-02-15 10:14:14 +01:00
Ian Paschal
4feb53fdf4 Revert "Expect to always have a build plate" 
This reverts commit 0be6c9e6d37dad83b7c447bffd439a6a2b2bb1e4.
 2019-02-15 10:12:19 +01:00
Ian Paschal
0be6c9e6d3 Expect to always have a build plate 
Contributes to CL-1250
 2019-02-15 10:10:39 +01:00
Ian Paschal
5d294a7ff5 Handle self.build_plate = None 
Contributes to CL-1250
 2019-02-15 10:04:39 +01:00
Ian Paschal
72ce40deba Update buildplate with other props 
Contributes to CL-1250
 2019-02-15 09:36:38 +01:00
Ian Paschal
af565aff55 Clarify if using key or human-readable name 
This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name.

Contributes to CL-1250
 2019-02-14 11:49:43 +01:00
Ian Paschal
0275de7f77 Make sure to set the build plate so it's not empty 
Contributes to CL-1250
 2019-02-14 11:46:41 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
Ian Paschal
e39e09a692 Fix incorrect method name 
Contributes to CL-1165
 2019-02-13 15:21:09 +01:00
Simon Edwards
8f37421c11
Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Ensure pop-up is not shown if cloud connection is already configured
 2019-02-13 14:30:40 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
25cfd4f496 Avoid double negatives in cloud flow metadata 
Contributes to CL-1222
 2019-02-13 14:21:23 +01:00
Jaime van Kessel
f35ad5cf83 Merge branch 'CURA-5977_test_definition_container' of github.com:Ultimaker/Cura 2019-02-13 14:02:09 +01:00
Simon Edwards
d08b8d813d Generate the correct path for the svg on Windows. 
CL-1222
 2019-02-13 12:24:59 +01:00
Ian Paschal
cf4bcf81e7 Make pop up permanent 
Contributes to CL-1222
 2019-02-13 11:49:53 +01:00
Ian Paschal
d74f4f36bd Improve cloud flow checks 
Contributes to CL-1222
 2019-02-13 11:30:31 +01:00
Ian Paschal
8fecf7fb39 Don't crash when clicking don't show again 
Contributes to CL-1222
 2019-02-13 11:04:51 +01:00
Ian Paschal
c15e49876a Revert "Use parseBool instead of "is True" and "is False"" 
This reverts commit aa454ea357b8a64405601b37e1a0ec5f230a34c5.
 2019-02-13 11:00:11 +01:00
Ian Paschal
aa2acac244 Fix typo 
Contributes to CL-1222
 2019-02-13 10:52:37 +01:00
Ian Paschal
70fc363048 Fix cloud pop up paths 
Contributes to CL-1222
 2019-02-13 10:49:53 +01:00
Ian Paschal
aa454ea357 Use parseBool instead of "is True" and "is False" 
Contributes to CL-1222
 2019-02-12 12:18:29 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Ian Paschal
0e913044de Ensure pop-up is not shown if cloud connection is already configured 
Contributes to CL-1222
 2019-02-11 10:21:54 +01:00
Ghostkeeper
d2e1c47029
Use spaces instead of tabs 
Yeah, or remove extraneous tabs at the end of a line.
 2019-02-11 08:53:42 +01:00
ChrisTerBeke
9d6bd4b29a
Check access token before using it 2019-02-08 21:03:59 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0' 2019-02-08 14:23:36 +01:00
Ian Paschal
8807243108
Merge pull request #5286 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop-up (Finalize copy)
 2019-02-08 14:09:53 +01:00
Ian Paschal
937dce591d Finalize copy 
Contributes to CL-1222
 2019-02-08 13:53:02 +01:00
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop up
 2019-02-08 13:26:03 +01:00
Ian Paschal
0dfcaadc49 Typecheck improvements 
Contributes to CL-1222
 2019-02-08 13:13:26 +01:00