18863 Commits

Author SHA1 Message Date
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
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob
CURA-6035
2018-12-20 10:45:40 +01:00
Lipu Fei
d93e19d530 Add getAllMaterialGroups()
CURA-6035
2018-12-20 10:45:05 +01:00
Remco Burema
481438d419 Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0 2018-12-20 09:54:21 +01:00
Remco Burema
a9f4b70b5c Emit 'number of extruders changed' signal after add machine. [CURA-6045] 2018-12-20 09:53:58 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Remco Burema
9dbc642967 SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035] 2018-12-19 17:34:31 +01:00
ChrisTerBeke
f5150a7c89 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 16:24:31 +01:00
Aleksei S
d891d30ab8 The Cura logo in left top corner is not displayed properly.
CURA-6044
2018-12-19 15:51:32 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment
CURA-6004
2018-12-19 14:24:02 +01:00
ChrisTerBeke
21cde5535a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 14:15:19 +01:00
ChrisTerBeke
beb68213f4 Remove much logging or use debug level, fix cloud icon not appearing right away 2018-12-19 14:14:44 +01:00
Jaime van Kessel
d33cb6dfe9 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-19 14:09:32 +01:00
Jaime van Kessel
f2719ef582 Fix identation for postProcessing plugin settings
CURA-6043
2018-12-19 14:09:07 +01:00
Ghostkeeper
c0835f3a2f
Code style
Just something I boyscouted while working on something else.
2018-12-19 14:02:17 +01:00
Ghostkeeper
a5134001e9
Sort unique printer types
So that they appear in a consistent order everywhere.
2018-12-19 14:02:08 +01:00
Jaime van Kessel
9e867f8077 Fix the codestyle and cleanup the QML a bit
CURA-6043
2018-12-19 13:53:34 +01:00
Jaime van Kessel
08c736f770 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-19 13:31:06 +01:00
Jaime van Kessel
9acaf9abd7 Disable dropping of files into cura when monitor stage is active.
CURA-6038
2018-12-19 13:30:25 +01:00
Ian Paschal
e62ce0e4ca Make printer carousel more flexible/robust
Contributes to CL-1157
2018-12-19 13:18:53 +01:00
Diego Prado Gesto
773190bee1 Fix code style
Add space between binary operator.

Contributes to CURA-6005.
2018-12-19 12:53:41 +01:00
Diego Prado Gesto
acabd06542 Change the large_nonbold to large in one remaining component
Contributes to CURA-6025.
2018-12-19 12:32:18 +01:00