5054 Commits

Author SHA1 Message Date
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable
CURA-6057
2019-03-29 10:43:47 +01:00
Remco Burema
1cebf145f5 Make User-Agreement work with new 'WizadPanel'. [CURA-6057] 2019-03-29 09:23:10 +01:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
109631d023 Update doc for updateHasMaterialsMetadata() 2019-03-28 15:13:41 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
f4d0e39788 Pass application 2019-03-28 14:43:37 +01:00
Lipu Fei
3ad79a5888 Fix divided by 0 problem 2019-03-28 14:34:18 +01:00
Lipu Fei
82471a0e39 Add doc for MachineSettingsManager 2019-03-28 14:31:33 +01:00
Lipu Fei
397add861f Correct logging level 2019-03-28 14:29:37 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Lipu Fei
b28fdc2b0b Use camelcase for pyqtProperty names 2019-03-28 14:22:27 +01:00
Jaime van Kessel
84aa7fd007 Fix mypy type errors
CURA-6057
2019-03-27 17:40:33 +01:00
Lipu Fei
58507303fa Duplicate qualities should have unique names
CURA-6426
2019-03-27 14:08:06 +01:00
Lipu Fei
6dbae6f088 Show machine actions page optionally 2019-03-27 09:34:48 +01:00
Lipu Fei
56a3b2dfa7 Fix merge conflicts 2019-03-26 16:33:13 +01:00
Lipu Fei
1dd48c5728 Show welcome page if no printer 2019-03-26 16:21:07 +01:00
Lipu Fei
1c39d0c015 Fix merge conflicts 2019-03-26 15:55:58 +01:00
Lipu Fei
6843fb1ffb Load change log from file for on-boarding page 2019-03-26 15:49:40 +01:00
Ghostkeeper
f6dd3f922d
Merge branch 'shorter_ops_logs' 2019-03-26 15:34:26 +01:00
Lipu Fei
a6d05aa3bb Fix misc issues 2019-03-26 11:47:09 +01:00
Lipu Fei
af9f9fc857 Fix merge conflicts 2019-03-26 11:46:35 +01:00
Lipu Fei
418ad73a63 Move page index logic into WelcomePagesModel 2019-03-26 11:34:44 +01:00
Lipu Fei
92d95a1c00 Move page index logic into WelcomePagesModel 2019-03-26 10:34:38 +01:00
Ghostkeeper
ff99c4e45f
Don't include group nodes in AABB
In fact, don't include any node that would just have a position rather than actual data.
The rest of the code is robust anyway against there being no AABB.

Contributes to issue CURA-6416.
2019-03-26 10:00:10 +01:00
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00
Lipu Fei
4a171eebf6 Move models around again
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
2019-03-26 08:29:22 +01:00
Remco Burema
794d13969a Shorter log messages for operations. 2019-03-22 12:06:04 +01:00
Lipu Fei
e632b508eb Rename to AddNetworkOrLocalPrinterContent 2019-03-22 10:43:01 +01:00
Lipu Fei
ab06264950 Rename to AddNetworkOrLocalPrinterContent 2019-03-22 10:28:17 +01:00
Lipu Fei
80dff49b8a Fix merge conflicts 2019-03-22 10:00:57 +01:00
Lipu Fei
d3ea506167 Add docs for createMachineFromDiscoveredPrinter 2019-03-22 09:47:13 +01:00
Lipu Fei
9265a0de4a Fix typing 2019-03-22 09:41:12 +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
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
9e92a186ec Fix code styles 2019-03-21 09:06:41 +01:00
Lipu Fei
f2d7f93101 Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding_machine_action 2019-03-21 08:35:06 +01:00
Lipu Fei
7e176e0f2c Fix merge conflicts 2019-03-21 08:34:07 +01:00
Remco Burema
1f2fea14ce Little refactors (apply review comments). [CURA-6294] 2019-03-20 16:08:50 +01:00
Lipu Fei
5d45dba8f3 Fix DiscoveredMachineModel test 2019-03-20 16:00:39 +01:00
Lipu Fei
a17642a5a1 Merge WIP_onboarding_by_ip 2019-03-20 13:42:15 +01:00
Lipu Fei
615241a416 Fix module renaming 2019-03-20 13:39:08 +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
ccc4ba0bde Simplify code in WelcomePagesModel 2019-03-20 11:09:09 +01:00
Lipu Fei
da351da611 Update comments for associateActiveMachineWithPrinterDevice() 2019-03-20 10:48:04 +01:00
Lipu Fei
105a07fc16 Rename vars and add typing in DiscoveredPrintersModel 2019-03-20 10:42:43 +01:00
Lipu Fei
e623c807ce Rename SectionName to DiscoverySource in GlobalStacksModel 2019-03-20 10:39:23 +01:00