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
81fbc525e4
Rename ConfigurationModel to PrinterConfigurationModel
2019-03-20 09:52:35 +01:00
Lipu Fei
e555f7da68
Move ConfigurationModel into cura.UI module
2019-03-20 09:51:06 +01:00
Lipu Fei
69eb381f10
Move MaterialOutputModel into cura.UI module
2019-03-20 09:47:44 +01:00
Lipu Fei
2d78c2d7fc
Move ExtruderOutputModel into cura.UI module
2019-03-20 09:45:26 +01:00
Lipu Fei
49c87a1e1d
Move ExtruderConfigurationModel into cura.UI module
2019-03-20 09:44:15 +01:00
Lipu Fei
6a8db55112
Move PrinterOutputModel into cura.UI module
2019-03-20 09:43:10 +01:00
Lipu Fei
2b39d6422c
Move PrinterOutputDevice into cura.PrinterOutput module
2019-03-20 09:43:09 +01:00
Lipu Fei
e30104ff7f
Move PrintJobOutputModel into cura.UI module
2019-03-20 09:27:23 +01:00
Remco Burema
740dd095cc
(Add-by-IP) Incorporated review comments. [CURA-6294]
2019-03-19 13:45:56 +01:00
Jaime van Kessel
c1ed8ba9d0
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-03-18 14:56:49 +01:00
Jaime van Kessel
61e031bf1a
Fix format for two of the translated messages.
...
The format needs to be done on the result of whatever the translate spits out instead of
the string that is passed to the translate.
2019-03-18 13:45:31 +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
b3621bae84
WIP: Disable unknown printer type buttons
2019-03-14 11:18:39 +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
Jaime van Kessel
0fbfe9e6c9
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-03-13 15:42:21 +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
Ghostkeeper
1d25f52df6
Merge branch '4.0'
2019-03-06 15:23:55 +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
f483eb431f
Make IP address optional
...
Contribues to CL-1266
2019-03-05 09:30:51 +01:00
Ian Paschal
04a2caf781
Add internal IP to CloudClusterResponse
...
Contributes to CL-1266
2019-03-04 16:29:23 +01:00
Ian Paschal
63bf95cc9e
More robust check for network key
...
Contributes to CL-1266
2019-03-04 16:26:20 +01:00
Ian Paschal
35a9a0a058
Check for IP addresses used as network keys
...
Contributes to CL-1266
2019-03-04 15:52:00 +01:00
Ian Paschal
88fc7d0fba
Don't try to get the plugin path when there's no plugin registry
...
i.e. in tests
Contributes to CL-1274
2019-03-04 14:27:35 +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
c8580cf417
Prevent circular dependencies
...
Contributes to CL-1274
2019-03-04 11:27:52 +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
Ghostkeeper
650204dae7
Merge branch '4.0'
2019-02-21 09:09:19 +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
