Commit graph

5698 commits

Author SHA1 Message Date
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up
CL-1222 Cloud flow pop up
2019-02-08 13:26:03 +01:00
Ian Paschal
0dfcaadc49 Typecheck improvements
Contributes to CL-1222
2019-02-08 13:13:26 +01:00
Ian Paschal
53e07eadd3 Allow for optional typing
Contributes to CL-1222
2019-02-08 13:03:10 +01:00
Ian Paschal
2d77792988 Add some typings
Contributes to CL-1222
2019-02-08 12:54:10 +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
Ian Paschal
19f1a2f2d0 Fix line length
Contributes to CL-1237
2019-02-08 09:23:38 +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
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
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
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
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
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
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options
Cura 6115 improve message options
2019-01-30 17:54:47 +01:00
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +01:00
Ian Paschal
3dcb6b9c37
Merge pull request #5235 from Ultimaker/fix_configured_connection_types
Fix configured connection types
2019-01-28 15:46:39 +01:00
Jaime van Kessel
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types.
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
2019-01-28 14:29:41 +01:00
Simon Edwards
72b98285b1
Merge pull request #5216 from Ultimaker/CL-1188_hide_print_job_on_unavailable_printer
CL-1188 hide print job on unavailable printer
2019-01-28 11:08:21 +01:00
Ian Paschal
b9584b05ee More documentation
Contributes to CL-1154
2019-01-25 12:41:36 +01:00
Ian Paschal
3b8281dc5b Add some comments
Contributes to CL-1154
2019-01-25 12:39:27 +01:00