Lipu Fei
8bb8ae8652
Rename ConnectionType.none to ConnectionType.Unknown
...
CURA-6011
Cannot use None
2018-12-14 10:48:26 +01:00
Lipu Fei
3e1993d876
Rename Enum name to camal cases
...
CURA-6011
2018-12-14 10:11:10 +01:00
Lipu Fei
644944bc41
Remove unused function setConnectionType()
...
CURA-6011
2018-12-14 10:00:21 +01:00
Lipu Fei
0aa49270eb
Remove unused function checkConnectionType()
...
CURA-6011
2018-12-14 09:57:43 +01:00
Lipu Fei
6bf39a32a9
Rename Enum names to camal cases
...
CURA-6011
2018-12-14 09:56:10 +01:00
ChrisTerBeke
e1f95c6ec1
Merge branch 'master' into STAR-322_cloud-connection
2018-12-14 09:24:56 +01:00
Ghostkeeper
3f3cd5e334
Remove broken load of PrepareSidebar.qml
...
This file no longer exists. Loading it gives a warning.
2018-12-13 16:32:49 +01:00
Aleksei S
973970a895
Every print ouput device should define its connection type(usb, network, cluster and etc)
...
CURA-6011
2018-12-13 16:00:12 +01:00
Lipu Fei
d879cab91a
Add all fields for optional extruder in ExtruderModel
...
CURA-6015
2018-12-13 14:12:44 +01:00
Lipu Fei
df0b1c6c77
Fix ExtruderManager creation in MachineManager
...
CURA-6015
2018-12-13 14:12:38 +01:00
Lipu Fei
935f7a2512
Remove unused imports
...
CURA-6015
2018-12-13 14:12:31 +01:00
Lipu Fei
620790ae3d
Reduce the creations of ExtrudersModels
...
CURA-6015
2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578
Remove unused simpleNames flag
...
CURA-6015
2018-12-13 14:12:04 +01:00
Jaime van Kessel
0a6c1a7c14
Fix CLIENT_ID (again)
...
It got messed up in a merge again. Ugh.
2018-12-13 13:12:57 +01:00
ChrisTerBeke
36f5150d94
Fix merge conflict
2018-12-13 11:48:35 +01:00
ChrisTerBeke
f72b58386b
Also use CuraConstants for account API root
2018-12-13 11:46:11 +01:00
ChrisTerBeke
6150bd665a
Merge branch 'master' into STAR-322_cloud-connection
2018-12-12 14:04:59 +01:00
Lipu Fei
b6ea61612e
Fix merge conflicts
2018-12-12 13:26:01 +01:00
alekseisasin
a505adbf40
Merge pull request #4945 from Ultimaker/CURA-6006-login-required
...
[4.0] CURA-6006 login required
2018-12-12 11:31:38 +01:00
Remco Burema
1b2ef91c13
Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0
2018-12-12 10:54:36 +01:00
Lipu Fei
a6663ea0e8
Fix typing issues
...
CURA-6005
2018-12-12 10:51:13 +01:00
Diego Prado Gesto
31331e36d2
Revert "Use the capitalized version of the buildplate name"
...
This reverts commit 11d8831d7a
2018-12-12 10:41:01 +01:00
Diego Prado Gesto
0b6841e5d9
Revert "Use the capitalized version of the buildplate name"
...
This reverts commit 11d8831d7a
2018-12-12 09:20:35 +01:00
Remco Burema
65f1c9a304
Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed
...
Cura 6016 improve ui speed
2018-12-11 17:26:15 +01:00
Remco Burema
b413b4cdb6
Correct a typo in typing. [CURA-6016]
2018-12-11 17:21:14 +01:00
ChrisTerBeke
a766effce8
Fix typing for optional callback for on_progress
2018-12-11 12:43:43 +01:00
Lipu Fei
2275e5c71f
Refactor code to use constants in CuraConstants
...
CURA-6005
2018-12-11 12:13:46 +01:00
Lipu Fei
8e4ad23da1
Add CuraConstants
...
CURA-6005
Put constant values into a separate file CuraConstants.py
2018-12-11 12:12:35 +01:00
Jaime van Kessel
f67ac8d7c4
Update far less agressively for the material models
...
CURA-6016
2018-12-11 10:59:17 +01:00
ChrisTerBeke
79430f9faf
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection
2018-12-11 10:56:38 +01:00
Diego Prado Gesto
f0257e2b79
Merge branch 'master' into ui_rework_4_0
2018-12-11 10:29:46 +01:00
Diego Prado Gesto
77703e1fb8
Catch an exception from numpy that happens when loading some models
2018-12-11 09:58:23 +01:00
Jaime van Kessel
bb1950525a
Limit the amount of times the buildplate rebuild is done
...
CURA-6016
2018-12-11 09:42:34 +01:00
Jaime van Kessel
909f36d28e
Let the settingsMenu use the extruders of the active machine instead of the extruderModel
...
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
2018-12-11 09:24:22 +01:00
Jaime van Kessel
3132b1f689
Update the extruder Model a whole lot less
...
CURA-6016
2018-12-10 16:56:44 +01:00
Jaime van Kessel
1436301d78
Ensure setActiveExtruderIndex only gets called once when switching machines
...
CURA-6016
2018-12-10 16:20:00 +01:00
Diego Prado Gesto
d318bb5c87
Merge branch 'master' into ui_rework_4_0
2018-12-10 15:41:28 +01:00
Diego Prado Gesto
11d8831d7a
Use the capitalized version of the buildplate name
2018-12-10 15:40:18 +01:00
Jaime van Kessel
d495ec18bb
Filter a bit more intelligently on when to check for errors
...
CURA-6016
2018-12-10 15:28:20 +01:00
Diego Prado Gesto
e479772f4d
Merge branch 'master' into ui_rework_4_0
2018-12-10 11:43:24 +01:00
Daniel Schiavini
bfe04a55f9
Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-10 10:45:37 +01:00
Ellecross
3db3203e0d
Merge pull request #4951 from Ultimaker/CURA-5939_crash_dialog
...
Merging this Cura 5939 crash dialog together with Aleksei!
2018-12-10 10:28:00 +01:00
Ghostkeeper
c44b74454f
Revert "No longer make BuildVolume set max bounds."
...
This reverts commit 1467e703ae
2018-12-07 14:22:39 +01:00
Diego Prado Gesto
15f81da95b
Do not show the layer height in the header panel when the profile is not supported
2018-12-07 13:47:58 +01:00
Daniel Schiavini
4f82a2759a
STAR-322: Improving configuration models interface
2018-12-07 12:04:02 +01:00
Jaime van Kessel
ab8a2a9b2b
Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required
2018-12-07 10:51:48 +01:00
Daniel Schiavini
a1c252d3a2
Revert "Revert "fix merge conflict""
...
This reverts commit 4bffa6d90f
2018-12-07 10:25:46 +01:00
Daniel Schiavini
4bffa6d90f
Revert "fix merge conflict"
...
This reverts commit ec03b012a72af33738d1
2018-12-07 10:22:32 +01:00
Jaime van Kessel
2a0954f246
Gracefully handle the conectionError when logging in
2018-12-07 09:35:53 +01:00
ChrisTerBeke
ec03b012a7
fix merge conflict
2018-12-06 16:39:58 +01:00
