Lipu Fei
5074cf69dd
Fix typing
...
CURA-6435
2019-04-05 09:57:58 +02:00
Jaime van Kessel
932a5c8fc9
Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura
2019-04-04 14:38:18 +02:00
Lipu Fei
ffce5b8d58
FixassociateActiveMachineWithPrinterDevice()
...
CURA-6057
2019-04-03 12:10:09 +02:00
Lipu Fei
d34b3b8585
Move associate um network printer function into UM3OutputDevicePlugin
2019-03-28 15:24:42 +01:00
Ian Paschal
2233543780
Only set "do not show cloud message" metadata if active machine is the added cloud cluster
...
Contributes to CL-1267
2019-03-22 14:53:55 +01:00
Lipu Fei
ec0b197b6e
Fix merge conflicts
2019-03-22 14:28:23 +01:00
Remco Burema
b25df557d3
Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding
2019-03-22 13:20:43 +01:00
Lipu Fei
80dff49b8a
Fix merge conflicts
2019-03-22 10:00:57 +01:00
Lipu Fei
f90fd8aee8
Add typing
2019-03-22 09:50:32 +01:00
Lipu Fei
b1620f1912
Fix typing
2019-03-22 09:49:40 +01:00
Remco Burema
8250c91fc4
Make remove manual device (also) work (as failure-state of add manual device). [CURA-6294]
2019-03-21 18:45:57 +01:00
Lipu Fei
11252ce0f7
Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action
2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320
Fix merge conflicts with master
2019-03-21 14:59:53 +01:00
Remco Burema
139edbb0b7
Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip
...
'WIP-onboarding-by-ip' into 'parent' branch
2019-03-21 09:52:39 +01:00
Lipu Fei
aa1ad9a93d
Fix merge conflicts
2019-03-21 09:31:24 +01:00
Lipu Fei
85a3b54111
Merge WIP_onboarding
2019-03-21 09:21:56 +01:00
Lipu Fei
cf5fd1c355
Fix typing
2019-03-21 09:13:00 +01:00
Lipu Fei
a17642a5a1
Merge WIP_onboarding_by_ip
2019-03-20 13:42:15 +01:00
Remco Burema
ad6603bab8
Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip
2019-03-20 13:33:19 +01:00
Lipu Fei
c3c9c53f13
Merge WIP_onboarding
2019-03-20 11:28:30 +01:00
Lipu Fei
2b39d6422c
Move PrinterOutputDevice into cura.PrinterOutput module
2019-03-20 09:43:09 +01:00
Remco Burema
740dd095cc
(Add-by-IP) Incorporated review comments. [CURA-6294]
2019-03-19 13:45:56 +01:00
Ghostkeeper
3e9ed0fbfa
Add translation hint for untranslatable Ultimaker Cloud brand
...
So that the translators next time hopefully won't translate this.
Contributes to issue CURA-6257.
2019-03-18 10:36:23 +01:00
Remco Burema
2693eecd33
(Add-by-IP/onboard) Cleanup and use discovered-printer instead of machine-manager. [CURA-6294]
2019-03-14 13:33:24 +01:00
Remco Burema
61821e6378
Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip
2019-03-14 11:40:44 +01:00
Lipu Fei
2b0e9ea439
WIP: Fix refresh and naming
2019-03-14 08:56:31 +01:00
Remco Burema
b12b6892ca
Add-by-IP onboarding: Create (and set active) new device. [CURA-6294]
2019-03-13 17:36:03 +01:00
Remco Burema
bb17ab14da
(WIP) Connect manual-device-added signals to AddPrinterByIP-page. [CURA-6294]
2019-03-13 15:46:02 +01:00
Lipu Fei
e5b51c8edf
WIP: Implement refreshConnections()
2019-03-13 15:34:18 +01:00
Lipu Fei
de9f6f47bd
WIP: Implement add machine from network device
2019-03-13 12:04:52 +01:00
Lipu Fei
6b2642ee9a
Merge remote-tracking branch 'origin/master' into WIP_onboarding
2019-03-11 09:05:43 +01:00
Lipu Fei
940a833e73
WIP: Add printers via network
2019-03-08 13:43:58 +01:00
Remco Burema
6d34a2abd0
Start to connect/handle new signals for manual device addition. [CURA-6294]
2019-03-08 13:08:44 +01:00
Remco Burema
7a7e710b2a
Support for manual device addition for plugins (WIP). [CURA-6294]
2019-03-06 17:50:40 +01:00
Ian Paschal
9c3f67a9ed
Code style
...
Contributes to CL-1272
2019-03-06 12:26:38 +01:00
Ian Paschal
99fe8ec7aa
Improve cloud flow pop up logic
...
Contributes to CL-CL-1272
2019-03-06 10:56:31 +01:00
Ian Paschal
a74717ca3c
Get plugin path like most other plugins do
...
Contributes to CL-1274
2019-03-04 12:42:48 +01:00
Ian Paschal
3889570697
K.I.S.S.
...
Contributes to CL-1274
2019-03-04 12:04:34 +01:00
Ian Paschal
a1e0ddd9df
Don't hardcode plugin directory
...
Contributes to CL-1274
2019-03-04 10:19:33 +01:00
Ian
cac8c85489
Don't use __file__
...
Contributes to CL-1274
2019-03-01 10:46:41 +01:00
Ian
cf9a1c0248
Sort UM imports alphabetically for easy scanning
...
Contributes to CL-1274
2019-03-01 10:46:27 +01:00
Jaime van Kessel
21c6bba1ce
Add the discovered printer functionality
...
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).
This means we can select one of those printers and directly add it (thus no longer needing that step)
CURA-6179
2019-02-27 11:05:54 +01:00
Simon Edwards
60547b4265
Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states
...
CL-1247 Improve cloud disabled states
2019-02-20 13:17:11 +01:00
Simon Edwards
43b1c86920
Use QUrl.fromLocalFile() to create the file:// URLs for the images
2019-02-20 09:31:51 +01:00
Simon Edwards
3ad916b565
Fix the path to the pop up images in the monitor tab.
2019-02-19 17:07:09 +01:00
Ian Paschal
0ef014a542
Don't show "Review Connection" unless you're on the LAN
...
Contributes to CL-1247
2019-02-19 12:24:04 +01:00
Ian Paschal
05b5dfa05f
Improve "don't ask me again" checkbox
...
Contributes to CL-1222
2019-02-19 10:13:05 +01:00
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
Ian Paschal
25cfd4f496
Avoid double negatives in cloud flow metadata
...
Contributes to CL-1222
2019-02-13 14:21:23 +01:00
