Ghostkeeper
672271d525
Fix running automated tests on Python 3.6
...
This prevents the PyCapsule_GetPointer error.
2019-02-08 09:50:20 +01:00
Ian Paschal
5f0d9fc16a
Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top
2019-02-08 09:41:41 +01:00
Ian Paschal
729f4c9d52
Revert "Fix line length"
...
This reverts commit 19f1a2f2d0
.
2019-02-08 09:40:56 +01:00
Ghostkeeper
506ce2e6e5
Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section'
...
Contributes to issue CURA-5916.
2019-02-08 09:32:56 +01:00
Ian Paschal
19f1a2f2d0
Fix line length
...
Contributes to CL-1237
2019-02-08 09:23:38 +01:00
Diego Prado Gesto
b0cf5f25c6
Merge branch '4.0'
2019-02-07 17:36:44 +01:00
Jaime van Kessel
5c94a8223d
Added button that is shown when instruction_link is set in the profile
...
CURA-5916
2019-02-07 16:08:50 +01:00
Ian Paschal
2b6bab9552
Re-enable firmware check
...
Contributes to CL-1222
2019-02-06 16:42:26 +01:00
Remco Burema
3a94745667
Make sliders reappear in simulation-view. [CURA-6183]
2019-02-06 16:01:01 +01:00
Ian Paschal
fcb52dd1cf
Show cloud flow pop-up if machine is removed from cloud
...
Contributes to CL-1222
2019-02-06 14:26:11 +01:00
Ian Paschal
162fdad4e4
Improve conditions for starting cloud flow
...
Contributes to CL-1222
2019-02-06 13:58:33 +01:00
Simon Edwards
8e569126ff
Use the older but backwards compatible API for moving print jobs in the queue.
...
CL-1237
2019-02-06 12:19:59 +01:00
Ian Paschal
3a4fcb354a
Show cloud connection flow pop-up
...
Contributes to CL-1222
2019-02-06 12:04:15 +01:00
Ian Paschal
b1104124f3
Add address property to ClusterUM3OutputDevice
...
This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings)
Contributes to CL-1222
2019-02-06 12:01:42 +01:00
Ian Paschal
348689eace
Add cloud flow graphics
...
Contributes to CL-1222
2019-02-06 11:58:51 +01:00
Ian Paschal
5c0c176730
Show confirmation pop-up for cloud flow
...
Contributes to CL-1222
2019-02-05 16:52:15 +01:00
Ian Paschal
70c384bd4e
Finish adding cloud flow checks
...
Contributes to CL-1222
2019-02-05 16:51:47 +01:00
Ian Paschal
b29f3d3bd0
Improve comment
...
Contributes to CL-1222
2019-02-05 16:50:50 +01:00
Ian Paschal
c41e81a6b9
Set required firmware version for cloud to 5.2.0
...
Contributes to CL-1222
2019-02-05 16:50:36 +01:00
Ian Paschal
d022672bcf
Add signal to CloudOutputDeviceManager for added cloud device
...
Contributes to CL-1222
2019-02-05 16:49:54 +01:00
Lipu Fei
4ea6e5d0df
Merge remote-tracking branch 'origin/4.0'
2019-02-05 11:40:50 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage
...
Let each stage create its own action panel
2019-02-05 11:16:00 +01:00
Jaime van Kessel
d57d4fd277
Fix text color not being themed
2019-02-05 11:05:33 +01:00
Ian Paschal
9c82cfd6fa
Comment out firmware check for dev purposes
...
Contributes to CL-1222
2019-02-04 16:52:01 +01:00
Ian Paschal
4c1131a7b4
Remove some redundant calls
...
Contributes to CL-1222
2019-02-04 16:11:48 +01:00
Ian Paschal
f2ddb2808f
Add firmware check
...
Contributes to CL-1222
2019-02-04 16:02:38 +01:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property
...
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.
Contributes to issue CURA-6086.
2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage
...
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.
Contributes to issue CURA-6086.
2019-02-04 15:08:59 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0'
2019-02-04 13:06:32 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen
...
This is a new text that we got from marketing.
2019-02-04 13:06:06 +01:00
Ian Paschal
66ed42838f
Stop using depreciated API call
2019-02-04 11:53:24 +01:00
Ian Paschal
2a3a1d6e35
Move cloud flow checks back to UM3OutputDevice
...
Contributes to CL-1222
2019-02-04 11:51:27 +01:00
Ghostkeeper
314070acbc
Merge branch 'griehsler-master'
2019-02-04 08:26:10 +01:00
Ghostkeeper
5592d4fa60
Don't make retraction distance negative
...
Apparently this got changed accidentally because of a merge in an unfortunate time.
2019-02-04 08:25:35 +01:00
Ghostkeeper
3018b1b3d4
Merge branch 'master' of https://github.com/griehsler/Cura into griehsler-master
2019-02-04 08:22:55 +01:00
Ian Paschal
1244e30500
Add cloud-flow-is-possible checking
...
Contributes to CL-1222
2019-02-01 15:50:49 +01:00
Jaime van Kessel
4aaeb8c2d5
Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0
2019-02-01 11:54:35 +01:00
Diego Prado Gesto
f7ffb3ae69
Merge pull request #4825 from Frischid/patch-2
...
Update AutoDetectBaudJob.py
2019-02-01 11:31:02 +01:00
Lipu Fei
efa26c8323
Merge remote-tracking branch 'origin/4.0'
2019-02-01 11:08:33 +01:00
fieldOfView
80c102f9de
Add {travel_speed} as an alias to {speed_travel}...
...
...for all those people who still copy paste legacy start&end gcode snippets into Cura.
2019-02-01 10:45:32 +01:00
Lipu Fei
18cec8dbe8
Fix typing
...
CURA-6153
2019-02-01 10:20:16 +01:00
Remco Burema
435c8deded
Add 'connect_group_name' to 'group_name' rename to version-upgrade. [CURA-6153]
2019-01-31 20:25:21 +01:00
Remco Burema
954fdb20ad
Rename 'connect_group_name' to 'group_name'. [CURA-6153]
2019-01-31 20:21:42 +01:00
Jaime van Kessel
9a3d9dd2c1
Ensure that writeStarted is called when attempting to print via USB
2019-01-31 17:42:20 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states
...
CL-1154 Monitor empty states
2019-01-31 16:44:25 +01:00
Ian Paschal
1cd9ffefcc
Improve no connection message
...
Contributes to CL-1154
2019-01-31 14:51:58 +01:00
Jaime van Kessel
1a037bdb82
Prevent UFP writer from crashing if the base file of a material can not be found
...
Another issue found in the crash reports
2019-01-31 14:48:40 +01:00
Lipu Fei
c73747ad44
Merge remote-tracking branch 'origin/4.0'
2019-01-31 14:22:59 +01:00
Jaime van Kessel
d5e34cc9c9
Prevent crash when activePrinter doesn't have a controller
...
Got the crash from the automatic crash reports
2019-01-31 12:59:29 +01:00
Ian Paschal
7189daec80
Finalize monitor stage empty states
...
Contributes to CL-1154
2019-01-31 10:50:30 +01:00