Commit graph

1715 commits

Author SHA1 Message Date
Daniel Schiavini
7785555a94 Remove mock changes used locally 2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
ChrisTerBeke
f478653c37 Uncomment code that was needed for testing 2019-01-14 14:56:14 +01:00
ChrisTerBeke
7bf319dfd1 Better fix for circular dependency 2019-01-14 14:17:36 +01:00
ChrisTerBeke
cd19eec98a Remove weird argument for timer 2019-01-14 11:06:16 +01:00
ChrisTerBeke
402097f4d0 Fix imports 2019-01-14 10:57:50 +01:00
ChrisTerBeke
1e2a8aa23e revert to prevent circular dependency 2019-01-14 10:52:50 +01:00
ChrisTerBeke
13d390a7d9 Fix imports in tests, some cleanup 2019-01-14 10:43:32 +01:00
ChrisTerBeke
81abc84741 Fix typing of CloudOutputDevice in controller 2019-01-14 10:41:10 +01:00
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a Solve some review comments 2019-01-11 16:14:55 +01:00
ChrisTerBeke
2e3398e349 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-11 15:10:44 +01:00
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
616d5a1f43 Update MonitorPrintJobCard.qml
Contributes to CL-1165
2019-01-11 10:43:50 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models
Star-347: Update Cura Connect models
2019-01-10 17:46:26 +01:00
Ian Paschal
8d76bd8678 Small clean-up of log warnings
Contributes to CL-1165
2019-01-10 16:04:57 +01:00
Ian Paschal
3377ed0e6e Remove some unused code
Contributes to CL-1165
2019-01-10 15:55:25 +01:00
Ian Paschal
612b0d0165 Reset pop-up orientation if it moved
Contributes to CL-1165
2019-01-10 15:54:58 +01:00
ChrisTerBeke
36191fbe0f Fix typevar typing issue 2019-01-10 15:36:12 +01:00
Ian Paschal
292d04f3ea Remove transitions which caused graphical glitches
Contributes to CL-1165
2019-01-10 15:27:31 +01:00
Ian Paschal
9c711cc8aa Pop-up flips directions
Contributes to CL-1165
2019-01-10 15:27:04 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
ChrisTerBeke
764769f4bb Merge branch '4.0' into STAR-322_cloud-connection 2019-01-10 09:48:48 +01:00
Ian Paschal
0622c5cb8b Rename MonitorPrinterContextMenu to MonitorContextMenu 2019-01-10 09:22:27 +01:00
Ian Paschal
8831ba04e1 Fix missing extruder number 2019-01-09 17:05:10 +01:00
Ian Paschal
669f6d8f0c Fix available space bug
Contributes to CL-1165
2019-01-09 17:04:51 +01:00
Ian Paschal
548882e398 Use new context menu
Contributes to CL-1165
2019-01-09 17:04:33 +01:00
Ian Paschal
cdc24081a5 Create MonitorPrinterContextMenu.qml
Contributes to CL-1165
2019-01-09 17:03:56 +01:00
Ian Paschal
5a15ffc090 Create MonitorContextMenuButton.qml
Contributes to CL-1165
2019-01-09 17:03:41 +01:00
Ian Paschal
5a78eb0541 Temporarily disable context menu and camera button
Contributes to CL-1165
2019-01-09 16:32:26 +01:00
Ian Paschal
4248deeb76 Line-length fixes 2019-01-09 16:31:49 +01:00
Ian Paschal
f6c754c57f Remove PropertyAnimation test 2019-01-09 16:31:26 +01:00
Ian Paschal
4ce244362c Make camera button grey if disabled
Contributes to CL-1165
2019-01-09 16:30:39 +01:00
Ian Paschal
920b7b6706 Create MonitorInfoBlurb.qml
Contributes to CL-1165
2019-01-09 16:30:11 +01:00
Ian Paschal
e7b60a5290 Create GenericPopUp.qml
Contributes to CL-1165
2019-01-09 16:29:57 +01:00
ChrisTerBeke
edf64bef85 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-09 10:45:49 +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
ChrisTerBeke
b8da720c1d Move translations in-line 2019-01-08 13:10:42 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
ChrisTerBeke
7c7bca31c7 Fix renamed property connectionType 2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +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