Commit graph

6121 commits

Author SHA1 Message Date
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Jaime van Kessel
0fbfe9e6c9 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-13 15:42:21 +01:00
Jaime van Kessel
986581c18a Improve logging if extruder cant be found while creating extruder stack 2019-03-13 14:18:25 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
f7f5123fea WIP: Fix highlighting of selected network printer 2019-03-13 11:03:23 +01:00
Lipu Fei
60f6d881a3 WIP: Fixes and add cloud logic to cloud welcome page 2019-03-13 10:37:41 +01:00
Ian Paschal
6392ab8d05 Handle "" and None as hot-end and material IDs
Contributes to CL-1282
2019-03-11 16:30:04 +01:00
Lipu Fei
cc35eb0195 WIP: Add gotoPage 2019-03-11 15:34:53 +01:00
Lipu Fei
0c94ded93d WIP: Refactor and fix network printer list 2019-03-11 14:57:02 +01:00
Ghostkeeper
2b8a2d0c20
Reduce print output during happy path of automated tests
It should really just not print anything except what pytest prints, so you can easily see what tests have failed and what have not.
2019-03-11 11:10:09 +01:00
Jaime van Kessel
e9d4eb741a Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:52:14 +01:00
Jaime van Kessel
50999a075e Fix stupid mistake (signals need an emit, not a direct call)
CURA-6278
2019-03-11 10:46:41 +01:00
Jaime van Kessel
0616601250 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:39:23 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Ghostkeeper
3c779b58de
Specialise _isMetadataValid for Cura to check setting_version
Because we need to reject loading metadata for containers whose setting_version is incorrect.

Contributes to issue CURA-6270.
2019-03-08 13:34:16 +01:00
Remco Burema
7a7e710b2a Support for manual device addition for plugins (WIP). [CURA-6294] 2019-03-06 17:50:40 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Lipu Fei
a55808b24a WIP: Rename files 2019-03-06 15:15:21 +01:00
Remco Burema
48cc9b3c1d Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-06 14:08:41 +01:00
Remco Burema
5f335b4401 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-06 14:07:44 +01:00
Remco Burema
3c0583bef0 [AddPrinterByIp] Finish GUI as a facade first for review. [CURA-6057] 2019-03-06 14:05:42 +01:00
Lipu Fei
ffb8aed4c3 Merge CURA-6179 2019-03-06 11:32:52 +01:00
Lipu Fei
9968a79863 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-06 11:29:56 +01:00
Ghostkeeper
cf2fcc57ee
Merge branch 'CURA-6237_fix_remove_materials' into 4.0 2019-03-06 09:44:08 +01:00
Diego Prado Gesto
982f7085b3 Merge branch 'master' into feature_model_list 2019-03-05 10:36:05 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Diego Prado Gesto
2ac2299c09 Merge branch 'master' into feature_model_list 2019-03-03 21:22:06 +01:00
Diego Prado Gesto
7b030a8235 Move the objectsList to the bottom
Now it appears as a panel that you can expand/collapse. For now the background is transparent waiting for the designs to be clear.
2019-03-03 20:10:14 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel
also when the variant container has changed.

Contributes to CURA-6227.
2019-03-01 14:54:42 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
2019-03-01 10:53:55 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
2019-02-28 16:17:34 +01:00
Jaime van Kessel
38a9206898 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-28 16:01:40 +01:00
Jaime van Kessel
a8128556f3 Don't drop refresh token if request failed 2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f Prevent crash if the connection was lost for auth token 2019-02-28 12:58:41 +01:00
Jaime van Kessel
1c7e047a38 Added tests for adding & removing discovered devices
CURA-6179
2019-02-28 09:47:25 +01:00
Lipu Fei
6ebfaff61e WIP: Fixes and add cloud page 2019-02-28 08:33:28 +01:00
Lipu Fei
9c66921538 WIP: dos2unix new files 2019-02-28 08:07:44 +01:00
Lipu Fei
92730a09a2 WIP: Add data collections page 2019-02-28 07:48:05 +01:00
Lipu Fei
72866683e6 WIP: Add Whats new page 2019-02-27 16:00:45 +01:00
Lipu Fei
14fdf68871 WIP: Add User Agreement page and fixes 2019-02-27 15:28:39 +01:00
Lipu Fei
ac012e8f09 WIP: Add Welcome Page and use CTRL+Alt+D to trigger 2019-02-27 12:45:28 +01:00
Jaime van Kessel
17fdc86e50 Fix typing
CURA-6179
2019-02-27 11:59:50 +01:00
Ghostkeeper
1c6cce316a
Merge branch '4.0' 2019-02-27 11:47:47 +01:00
Jaime van Kessel
21c6bba1ce Add the discovered printer functionality
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).

This means we can select one of those printers and directly add it (thus no longer needing that step)

CURA-6179
2019-02-27 11:05:54 +01:00