GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 04:33:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,299 Commits 289 Branches 260 Tags
Commit Graph

5715 Commits

Author SHA1 Message Date
Ian Paschal
e39e09a692 Fix incorrect method name 
Contributes to CL-1165
 2019-02-13 15:21:09 +01:00
Simon Edwards
8f37421c11
Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Ensure pop-up is not shown if cloud connection is already configured
 2019-02-13 14:30:40 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
25cfd4f496 Avoid double negatives in cloud flow metadata 
Contributes to CL-1222
 2019-02-13 14:21:23 +01:00
Simon Edwards
d08b8d813d Generate the correct path for the svg on Windows. 
CL-1222
 2019-02-13 12:24:59 +01:00
Ian Paschal
cf4bcf81e7 Make pop up permanent 
Contributes to CL-1222
 2019-02-13 11:49:53 +01:00
Ian Paschal
d74f4f36bd Improve cloud flow checks 
Contributes to CL-1222
 2019-02-13 11:30:31 +01:00
Ian Paschal
8fecf7fb39 Don't crash when clicking don't show again 
Contributes to CL-1222
 2019-02-13 11:04:51 +01:00
Ian Paschal
c15e49876a Revert "Use parseBool instead of "is True" and "is False"" 
This reverts commit aa454ea357b8a64405601b37e1a0ec5f230a34c5.
 2019-02-13 11:00:11 +01:00
Ian Paschal
aa2acac244 Fix typo 
Contributes to CL-1222
 2019-02-13 10:52:37 +01:00
Ian Paschal
70fc363048 Fix cloud pop up paths 
Contributes to CL-1222
 2019-02-13 10:49:53 +01:00
Ian Paschal
aa454ea357 Use parseBool instead of "is True" and "is False" 
Contributes to CL-1222
 2019-02-12 12:18:29 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Ian Paschal
0e913044de Ensure pop-up is not shown if cloud connection is already configured 
Contributes to CL-1222
 2019-02-11 10:21:54 +01:00
ChrisTerBeke
9d6bd4b29a
Check access token before using it 2019-02-08 21:03:59 +01:00
Ian Paschal
8807243108
Merge pull request #5286 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop-up (Finalize copy)
 2019-02-08 14:09:53 +01:00
Ian Paschal
937dce591d Finalize copy 
Contributes to CL-1222
 2019-02-08 13:53:02 +01:00
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 19f1a2f2d047f646c227e3fbb0d74f2cb7d57abd.
 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