Commit graph

807 commits

Author SHA1 Message Date
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
2019-01-11 14:44:49 +01:00
Ian Paschal
8831ba04e1 Fix missing extruder number 2019-01-09 17:05:10 +01:00
Ian Paschal
97e17d9fb8 Remove debug behavior
Contributes to CL-1157
2019-01-08 15:17:42 +01:00
Ian Paschal
8f37b65ffe Add skeleton loading to print job queue
Contributes to CL-1157
2019-01-08 15:15:21 +01:00
Ian Paschal
e81742d296 Add skeleton loading to printer cards
Contributes to CL-1157
2019-01-08 14:27:54 +01:00
Ian Paschal
4dbab88792 Add dummy printer for loading 2019-01-07 13:56:04 +01:00
Ian Paschal
18545e18ce Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab 2019-01-07 13:38:23 +01:00
Jaime van Kessel
4c1f68a447 Ensure that the connectiontype of a connected printer is set correctly
CURA-6011
2019-01-04 15:24:01 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text
CURA-6003
2019-01-03 15:34:41 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Lipu Fei
ee72284616 Use appropriate log level
CURA-6035
2019-01-03 08:32:42 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material
CURA-6033
2018-12-31 11:01:30 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +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
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob
CURA-6035
2018-12-20 10:45:40 +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
Ian Paschal
e62ce0e4ca Make printer carousel more flexible/robust
Contributes to CL-1157
2018-12-19 13:18:53 +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
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Ian Paschal
142ac56d78 Add keyboard navigation for printer carousel 2018-12-19 11:26:38 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
[4.0] Every output device should define its connection type
2018-12-18 13:23:02 +01:00
Ian Paschal
627c647fbc Center navigation dots
Contributes to CL-1151
2018-12-18 13:17:25 +01:00
Jaime van Kessel
d4bb50886f Merge branch 'CURA-6011_connection_types' of github.com:Ultimaker/Cura into CURA-6011_connection_types 2018-12-18 09:40:20 +01:00
Jaime van Kessel
84a7f2e5a2 Fix review comments
CURA-6011
2018-12-18 09:40:08 +01:00
Ian Paschal
aed0bb27f2
Merge pull request #4995 from Ultimaker/CL-1151_add_monitor_carousel
CL-1152 Add monitor carousel
2018-12-17 17:05:50 +01:00
Ian Paschal
5c697ab5be Make hints clickable
Contributes to CL-1151
2018-12-17 16:58:51 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
Increment API version to 6
2018-12-17 15:43:09 +01:00
Ian Paschal
cb6e4ff2d1 Organize MonitorStage.qml better 2018-12-17 14:05:28 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions
CURA-6019
2018-12-17 13:03:21 +01:00
Ian Paschal
6178f9ddf6 Improve code style and line lengths 2018-12-17 11:49:09 +01:00
Ian Paschal
ff1a0e30f6 Code style & comments 2018-12-17 10:42:41 +01:00
Ian Paschal
77deabf6d4 Code style 2018-12-17 09:43:24 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
2018-12-14 17:29:02 +01:00
Jaime van Kessel
b8a4d8e80d Remove the cluster connection type
CURA-6011
2018-12-14 17:14:56 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model
CURA-6011
2018-12-14 17:10:58 +01:00
Ian Paschal
331cd730f1 Improve visual hint that side cards are not in focus
Contributes to CL-1151
2018-12-14 16:56:20 +01:00
Ian Paschal
e877b47e22 Disable printer cards which are not in focus
Contributes to CL-1151
2018-12-14 16:55:48 +01:00
Ian Paschal
6747fe3550 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:31:47 +01:00
Ian Paschal
30168103b7 Update MonitorStage.qml 2018-12-14 15:47:36 +01:00
Ian Paschal
3bd5d141ab Add easing and make animation less snappy and awesome
Contributes to CL-1151
2018-12-14 15:39:17 +01:00
Ian Paschal
2f6a274c0e Small style improvements
Contributes to CL-1151
2018-12-14 15:27:55 +01:00
Ian Paschal
b2ea597543 Fix button color
Contributes to CL-1151
2018-12-14 15:10:34 +01:00
Ian Paschal
5d0da580b9 Fix border colors 2018-12-14 15:04:22 +01:00
Ghostkeeper
2e835bf48d
Merge branch '4.0' 2018-12-14 15:02:30 +01:00
Ian Paschal
7fc5742b7f Add monitor carousel
Contributes to CL-1151
2018-12-14 15:01:40 +01:00
Lipu Fei
aba3b6dd8e Rename setKey() and add docs
CURA-6011
2018-12-14 10:55:36 +01:00
Lipu Fei
6bf39a32a9 Rename Enum names to camal cases
CURA-6011
2018-12-14 09:56:10 +01:00