Commit graph

18723 commits

Author SHA1 Message Date
Ghostkeeper
2277a3d316
Prevent syncing with invalid configurations
Contributes to issue CURA-6033.
2018-12-21 16:43:45 +01:00
Ghostkeeper
a720cca5b6
Fix background colour for dark theme
The default colour for Rectangle is white. So this Rectangle, not defining a colour, became white. Instead we should use an Item, which cannot have a background colour and thus becomes transparent, making the background colour the same as the button below, which was intended. It's also slightly faster to render.

Contributes to issue CURA-6033.
2018-12-21 16:40:24 +01:00
Ghostkeeper
5e98544541
Don't change the model depending on isValidMaterial
That would cause a circular dependency in a way.

Contributes to issue CURA-6033.
2018-12-21 16:33:16 +01:00
Ghostkeeper
e8ea742cf6
Retain binding with isValidMaterial on hover
So that if a material becomes valid, it updates this property.

Contributes to issue CURA-6033.
2018-12-21 16:27:38 +01:00
ChrisTerBeke
912652654b Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 15:28:56 +01:00
Jaime van Kessel
4ab79f963a Remove deprecated functions 2018-12-21 15:10:14 +01:00
Jaime van Kessel
33c97fcf4a Updated typing 2018-12-21 15:09:09 +01:00
Marijn Dee
12a4a5e9f5 Fixing the rest of the automatic test failures 2018-12-21 15:06:02 +01:00
alekseisasin
facf1428d6
Merge pull request #5020 from Ultimaker/CURA-6004_missing_tooltips
Cura 6004 missing tooltips
2018-12-21 14:57:06 +01:00
Jaime van Kessel
432b0837ce Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-21 14:48:50 +01:00
Aleksei S
c8994102da Use short for each javascript function
CURA-6033
2018-12-21 14:44:25 +01:00
Jaime van Kessel
766fc2293e Fix visibility for machine icon in dark theme 2018-12-21 14:35:41 +01:00
Aleksei S
01783e7f68 Check material name instead of material brand
CURA-6033
2018-12-21 13:54:01 +01:00
ChrisTerBeke
64f5c4f263 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 13:33:16 +01:00
Ghostkeeper
d880194c8c
Merge branch '4.0' 2018-12-21 11:59:41 +01:00
Ghostkeeper
07f0433751
Correct link to manual
They changed this on the website, breaking all previous releases of Cura in the process.
2018-12-21 11:59:12 +01:00
Jaime van Kessel
59b7e62c01 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-21 11:54:33 +01:00
Jaime van Kessel
7269065cca Only clear the stored optimized layer data if the slice started 2018-12-21 11:54:11 +01:00
Ghostkeeper
8308e48c2d
Merge branch '4.0' 2018-12-21 11:51:04 +01:00
Ghostkeeper
a5500b028f
Use HTTPS for Help links
The Ultimaker website doesn't even accept anything else any more.
2018-12-21 11:50:46 +01:00
Jaime van Kessel
b0cba98ec4 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-21 11:20:33 +01:00
Jaime van Kessel
81e356ea1b Switch out the containersModel for the more specific printersModel 2018-12-21 11:20:09 +01:00
ChrisTerBeke
a86f253bf3 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 10:58:13 +01:00
Ghostkeeper
75fbdf2c94
Expand error message for cases when extruders are disabled
It is also unable to slice models that are on extruders that are disabled.
2018-12-21 10:40:37 +01:00
Marijn Dee
131211e604 Fixed the unit tests 2018-12-21 09:42:28 +01:00
Ghostkeeper
e51b5993d3
Don't create system tray icon in headless mode 2018-12-20 21:56:27 +01:00
Aleksei S
81a6531f47 Fix range slider label position in LayerSlider.qml. 2018-12-20 20:37:48 +01:00
Aleksei S
9430c421eb Code refactor
CURA-6033
2018-12-20 18:19:59 +01:00
Aleksei S
7cfb29e337 If a connected printer has a selected material which is unknown
for Cura then show a message for  downloading it from Marketplace
CURA-6033
2018-12-20 18:12:40 +01:00
ChrisTerBeke
5403f5241b Fix not registering cloud output device for every machine 2018-12-20 17:21:07 +01:00
Marijn Dee
9d27c29c8c Fixed indentation and relative import, tests still fail though 2018-12-20 17:04:17 +01:00
Jaime van Kessel
0965d909c0 Remove the show property from the tooltip
This was a bit of a weird setup, so i removed it. This way the tooltip can be used
in the same way as the regular tooltip (by simply setting the visibility)

CURA-6004
2018-12-20 16:41:26 +01:00
Marijn Dee
403010aa90 Mirrored the changes made to the models in Commons 2018-12-20 16:32:00 +01:00
Jaime van Kessel
3f599bd06f Ensure that the tooltip text is translated
CURA-6004
2018-12-20 16:31:57 +01:00
ChrisTerBeke
3f82cd4916 Add missing new-line 2018-12-20 15:55:04 +01:00
ChrisTerBeke
bfd1debb8f Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 15:49:00 +01:00
ChrisTerBeke
119d3e9974 Fix printer selector sections 2018-12-20 15:47:48 +01:00
ChrisTerBeke
1012eb7553 Assure bool 2018-12-20 14:48:56 +01:00
Ghostkeeper
5bf260f524
Don't break binding of is_favorite upon clicking star
We shouldn't override it here because doing that causes the binding to break. Just remove the favourite and let the model update itself, thus removing the star.

Contributes to issue CURA-6032.
2018-12-20 14:40:37 +01:00
Ghostkeeper
f3a0b44d5e
Simplify is_favorite condition
No stupid ternary operators necessary.

Contributes to issue CURA-6032.
2018-12-20 14:40:29 +01:00
ChrisTerBeke
bbddbcde9a cleanup 2018-12-20 14:29:39 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob
CURA-6035
2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob
CURA-6035
2018-12-20 14:20:34 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing
CURA-6044
2018-12-20 14:01:12 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
ChrisTerBeke
0edeb11a78 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 13:14:24 +01:00
Jaime van Kessel
36efa171c6 Add a bit more logging to the authorization service 2018-12-20 11:31:01 +01:00
Jaime van Kessel
881e98c642 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-20 11:09:32 +01:00
Jaime van Kessel
dc473dc78d Add missing typing for setting visibility preset model 2018-12-20 11:09:02 +01:00