Commit graph

18327 commits

Author SHA1 Message Date
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
c14aa3686c Add some new colors to theme
Contributes to CL-1247
2019-02-19 12:23:03 +01:00
Ian Paschal
0cfc258b8d
Merge pull request #5316 from Ultimaker/fix-cloud-printer-properties
CL-1255 Manually create printer properties for cloud output device
2019-02-18 13:33:44 +01:00
Jaime van Kessel
222f8e6cdb Prevent crash for backup plugin if there is no internet connection 2019-02-18 10:38:39 +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
Lipu Fei
3e819f56fc Remove debug code
CURA-6225
2019-02-15 15:14:12 +01:00
Lipu Fei
f521fae152 Fix call_on_qt_thread decorator
CURA-6225

Do thread check in the wrapper function, not outside.
2019-02-15 15:11:11 +01:00
Diego Prado Gesto
ace638ec81 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-15 14:37:56 +01:00
Diego Prado Gesto
ef73453874 Fix height in the about dialog to show the logo correctly 2019-02-15 14:36:58 +01:00
Ghostkeeper
f3cab17e20
Revert "Check if on main thread for call_on_qt_thread"
This reverts commit 21099e30cb.
It was causing a segfault when saving UFP files.
2019-02-15 13:45:23 +01:00
Diego Prado Gesto
21bc8d7990 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-15 13:40:08 +01:00
Diego Prado Gesto
2d1d0c2d37 Remove unused image 2019-02-15 13:39:40 +01:00
Lipu Fei
21099e30cb Check if on main thread for call_on_qt_thread
CURA-6225
2019-02-15 12:51:42 +01:00
Ian Paschal
61b84bdcfc
Merge pull request #5305 from Ultimaker/CL-1250_set_cloud_buildplate
CL-1250 set cloud build plate
2019-02-15 10:28:07 +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 0be6c9e6d3.
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
Jaime van Kessel
24bb4f0a4e Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-14 17:22:34 +01:00
Jaime van Kessel
6ff1f49c34 Ensure the layout gets the right width & height for the output devices popup
CURA-6222
2019-02-14 17:21:54 +01:00
Lipu Fei
45af26879f
Merge pull request #5298 from Ultimaker/CURA-6120_arrange_child_nodes_fix
Arrange child-nodes (like blocker) with parents. [CURA-6120]
2019-02-14 16:05:23 +01:00
Jaime van Kessel
dbb8514a6a Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-14 13:45:29 +01:00
Jaime van Kessel
b09538da63 Ensure that the numberOfExtruders property gets updated after configuration sync
CURA-6220
2019-02-14 13:44:43 +01:00
Lipu Fei
0cc882a398
Merge pull request #5304 from Ultimaker/fix_um2_08_profiles
CURA-6215 Remove layer_height from um2+ extruder profiles.
2019-02-14 12:05:49 +01:00
Ian Paschal
10f84184f3 Continued clarification on "name"
Contributes to CL-1250
2019-02-14 11:57:47 +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
Remco Burema
0e329946f8 Small refactor (init set plain instead of with empty list). [CURA-6120] 2019-02-14 11:05:13 +01:00
Jaime van Kessel
c1b53f0a90 Change header color in about window
This makes it work for both light & dark theme
2019-02-14 10:42:25 +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
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 aa454ea357.
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
Remco Burema
a24dc00bc5 Arrange child-nodes (like blocker) with parents. [CURA-6120] 2019-02-12 18:08:17 +01:00
Jaime van Kessel
ebcdcb4987 Remove layer_height from um2+ extruder profiles.
I've also doublechecked if the type of these profiles matches up and updated them where needed.
2019-02-12 14:00:16 +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