Commit graph

1275 commits

Author SHA1 Message Date
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting"
This reverts commit bec7b6546d, reversing
changes made to 7094b222b1.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
2019-05-23 13:40:11 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug
CL-1329 fix monitor progress bar bug
2019-05-21 17:27:53 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional
Contributes to CL-1259
2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button
CL-1259 hide useless override button
2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml
Contributes to CL-1259
2019-05-20 15:47:19 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML
Contributes to CL-1259
2019-05-20 15:46:07 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional
Contributes to CL-1259
2019-05-20 15:12:08 +02:00
Ian Paschal
3b7b554f1a Update MonitorPrintJobProgressBar.qml
Contributes to CL-1329
2019-05-20 12:18:55 +02:00
Ian Paschal
c9588d173f Add monitor column to theme
Contributes to CL-1329
2019-05-20 12:18:38 +02:00
Ian Paschal
6dc43f9ed1 Hide override button if it can't be overridden
Contributes to CL-1259
2019-05-20 10:59:51 +02:00
Ian Paschal
3cf2e19692 Put override logic in Python instead of QML
Contributes to CL-1259
2019-05-20 10:59:34 +02:00
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Simon Edwards
bec7b6546d
Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting
CL-1331 Extending the Cura API for the Network Printing Plugin
2019-05-15 11:11:49 +02:00
Ian Paschal
5774813704 Use class properties
Contributes to CL-1331
2019-05-15 10:09:50 +02:00
Ian Paschal
c7f6351903 Add typings
Contributes to CL-1331
2019-05-15 10:09:27 +02:00
ChrisTerBeke
913fac0094
Should be non-human readable string 2019-05-14 21:18:00 +02:00
ChrisTerBeke
b1920b05e9
Remove hacky code that is now not needed anymore 2019-05-14 21:13:29 +02:00
ChrisTerBeke
56c1da2580
printer_type has a default value so cannot be Optional 2019-05-14 21:01:34 +02:00
ChrisTerBeke
70c679859a
Use default value for printer type, allow printer_type field from cloud 2019-05-14 20:56:28 +02:00
Ian Paschal
c4ca133b40 Update UM3OutputDevicePlugin.py
Contributes to CL-1331
2019-05-13 15:39:29 +02:00
Ian Paschal
8b25816b1b Fix typo and white space
Contributes to CL-1331
2019-05-13 14:44:39 +02:00
Ian Paschal
d391ec4e6b Comments
Contributes to CL-1331
2019-05-09 16:41:01 +02:00
Ian Paschal
f7ef24819d Remove unused code
I'm not sure why loadConfigurationFromPrinter is not used... but it's not.

Contributes to CL-1331
2019-05-09 16:23:12 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML
Contributes to CL-1331
2019-05-09 16:19:59 +02:00
Ian Paschal
26ab359a93 Add more endpoints to machines API
- getCurrentMachine
- setCurrentMachineGroupName
- updateCurrentMachineConfiguration

Also shortened `global_container_stack` to `global_stack` since every stack is a container stack.

Contributes to CL-1331
2019-05-09 16:01:44 +02:00
Ian Paschal
20a9b65ea5 Use API endpoint for machine association
Contributes to CL-1331 and CL-1323
2019-05-09 14:54:24 +02:00
Simon Edwards
d70acc793f Hide the Override button if it is not an option
CL-1259
2019-05-09 13:23:29 +02:00
Lipu Fei
1d4ab98ddc Fix binding loop
CURA-6483
2019-05-02 08:25:29 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts
CURA-6483
2019-05-02 07:45:43 +02:00
Lipu Fei
3578482ea5 Fix connect via network dialog
CURA-6483

 - Do not add printers that have already been discovered
 - Add IP address validation check
2019-04-30 15:26:04 +02:00
Diego Prado Gesto
7249bd3c50 Remove two lines entered by mistake
Keep it the same as in the base branch.
2019-04-30 11:33:19 +02:00
Diego Prado Gesto
f62d19aa60 Fix rendering issues in macOS when connecting to secondary screen
It used to happen before, but just adding native rendering fixes the issue.
2019-04-30 11:24:01 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request
CURA-6483
2019-04-25 11:55:49 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel
CURA-6483
2019-04-25 08:44:55 +02:00
Ian Paschal
213a8fa6f3 Don't use compatible machien families for pills
Contriutes to CL-1055
2019-04-23 14:40:03 +02:00
Ian Paschal
6f762c676e Set the printer type on printer configuration
No idea why we didn't already do this
Contributes to CL-1055
2019-04-23 14:38:07 +02:00
ChrisTerBeke
3b0cfc270f Fix unit test for device name 2019-04-18 14:43:53 +02:00
ChrisTerBeke
76d0b5f198 Ensure printers length is larger than 0 before accessing index 2019-04-18 14:26:38 +02:00
ChrisTerBeke
0028ec6746 Ensure all property values are of type bytes 2019-04-18 14:22:05 +02:00
ChrisTerBeke
5bb56e06a4 Merge branch 'master' into cloud-cluster-discovery-mvp 2019-04-18 13:55:56 +02:00
Lipu Fei
98c4b7508f Fix typing 2019-04-18 06:32:52 +00:00
ChrisTerBeke
3cbd8a94a9
Add minimal support for discovering cloud printers outside of LAN 2019-04-18 00:19:12 +02:00
Ghostkeeper
cd89f7345a
Merge branch 'WIP_gitlab_ci' 2019-04-17 16:30:32 +02:00
Ian Paschal
17a5816b88 Fix typing
Contributes to CL-1325
2019-04-11 10:12:27 +02:00
Ian Paschal
61c38c5ec0 Pass output device (or not) to cloud check method
Contributes to CL-1325
2019-04-10 15:43:44 +02:00
Jaime van Kessel
c2b901ae47 Merge branch 'CURA-6057_fix_onboarding' of github.com:Ultimaker/Cura 2019-04-09 16:34:36 +02:00
Ian Paschal
2a7df3cedd Fix untranslated string
Contributes to CL-1302
2019-04-08 13:45:09 +02:00