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
36e49ee6bb
Make activeMachineIsGroup more robust
2019-01-11 16:08:46 +01:00
ChrisTerBeke
b78ac0664f
Fix return types from review
2019-01-11 16:07:08 +01:00
ChrisTerBeke
2e3398e349
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-11 15:10:44 +01:00
Jaime van Kessel
3ecdd91223
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-11 14:49:06 +01:00
Jaime van Kessel
cbeadb2343
Set the font of the time estimation to medium bold
...
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.
CURA-6097
2019-01-11 14:47:59 +01:00
Diego Prado Gesto
eaf4fefe00
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-11 14:46:47 +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
Jaime van Kessel
2dead87593
Ensure that the installed & canUpdate properties get set correctly
...
CURA-6053
2019-01-11 14:43:56 +01:00
Jaime van Kessel
d4621ec504
Ensure that if no CuraCloudApiRoot is set that the default is used
...
CURA-6005
2019-01-11 13:20:14 +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
Jaime van Kessel
ff79e91686
Move the additional components for the save button out of the action panel
...
CURA-6097
2019-01-10 16:32:43 +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
Jaime van Kessel
614b1000fd
Added missing material compatibility chart link
...
CURA-6090
2019-01-10 15:36:36 +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
Remco Burema
03bed3462c
SliceInfo doesn't need to be aware of brim for prime tower only. [CURA-5864]
2019-01-10 15:26:37 +01:00
ChrisTerBeke
56f0a341bc
Fix merge conflicts
2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin
...
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
2019-01-10 14:58:00 +01:00
Remco Burema
a042de128b
Tag CuraCloudAPIVersion-string-value as expression instead of literal. [CURA-6005]
2019-01-10 14:16:20 +01:00
Diego Prado Gesto
03b4121d22
Fix broken shortcut for slice or stop slicing.
2019-01-10 13:59:22 +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
Remco Burema
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade
...
Add version upgrade for 4.0
2019-01-09 17:42:17 +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
8813f10331
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-09 13:34:11 +01:00
Jaime van Kessel
366d2c8114
Prevent crash for firmware updater if the activePrinter is not set
2019-01-09 12:56:49 +01:00
Jaime van Kessel
d928e0979d
Handle attempting to remove a favorite material that was already removed
2019-01-09 12:54:33 +01:00
Jaime van Kessel
e718bed151
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-09 12:51:53 +01:00
Jaime van Kessel
862c76a2ea
Check if the optimised layer data is stored before attempting to delete it
2019-01-09 12:51:20 +01:00
ChrisTerBeke
edf64bef85
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-09 10:45:49 +01:00
Lipu Fei
580a69f11e
Add CuraCloudAccountAPIRoot to CuraVersion.py.in
...
CURA-6005
2019-01-09 09:27:34 +01:00
Lipu Fei
520b34ab89
Use getPluginPath()
...
CURA-6005
2019-01-09 08:41:15 +01:00
Simon Edwards
0de84dad13
Merge pull request #5138 from Ultimaker/CL-1157_skeleton_loading_monitor_tab
...
CL-1157 Add skeleton loading to the monitor tab
2019-01-08 16:23:16 +01:00
