Commit graph

365 commits

Author SHA1 Message Date
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName()
CURA-6449
2019-04-29 13:28:18 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string
CURA-6449
2019-04-25 13:14:28 +02:00
Lipu Fei
b22073e170 Add timeout for manual IP requests
CURA-6483
2019-04-25 11:54:32 +02:00
Lipu Fei
9868dee474 Fix typing
CURA-6483
2019-04-25 08:57:57 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel
CURA-6483
2019-04-25 08:44:55 +02:00
Lipu Fei
47f9741d9d Sort network printer names in list
CURA-6449
2019-04-17 13:35:40 +02:00
Lipu Fei
ce5682aa74 Check type by ID in isUnknownMachineType()
CURA-6449
2019-04-17 09:32:34 +02:00
Lipu Fei
d9018220b5
Merge branch 'master' into CURA-6449_fix_non_host_printers 2019-04-15 11:37:02 +02:00
Remco Burema
367a12557f Filter placeholders-devices: but use parseBool instead. [CURA-6057] 2019-04-12 13:14:35 +02:00
Remco Burema
c5f4b30264 Don't show 'discovered' machines that are placeholders. [CURA-6057] 2019-04-12 13:01:39 +02:00
Lipu Fei
6383c77473 Fix section text
CURA-6449
2019-04-12 12:25:38 +02:00
Lipu Fei
26205fbdce Remove translation for Unknown printer type
CURA-6449
2019-04-12 12:23:24 +02:00
Lipu Fei
588dd6cd78 Disable printers that are not host of a group
CURA-6449

 - Group printers into hosts and non-hosts and of unknown type.
 - Show available/connectable printers first in the list.
 - Show sections for connectable and non-connectable printers.
2019-04-11 11:33:01 +02:00
Lipu Fei
1207533046 Fix local printer selection update
CURA-6057
2019-04-03 15:14:06 +02:00
Ghostkeeper
d8f89d8330
Fix sorting printers by name
Because DiscoveredPrinter.name contains the MAC addresses of the printers. NetworkedPrinterOutputDevice.name contains the discovered name as communicated by ZeroConf. We already use that property from QML to display in the list.

Contributes to issue CURA-6057.
2019-03-29 13:41:46 +01:00
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
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
397add861f Correct logging level 2019-03-28 14:29:37 +01:00
Lipu Fei
b28fdc2b0b Use camelcase for pyqtProperty names 2019-03-28 14:22:27 +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
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
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Jaime van Kessel
8518aba3a5 Adds tests for QualityManager 2019-03-15 14:51:35 +01:00
Jaime van Kessel
1138baa26f Added extra tests for materialManager 2019-03-15 13:57:22 +01:00
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
f7f5123fea WIP: Fix highlighting of selected network printer 2019-03-13 11:03:23 +01:00
Lipu Fei
60f6d881a3 WIP: Fixes and add cloud logic to cloud welcome page 2019-03-13 10:37:41 +01:00
Lipu Fei
0c94ded93d WIP: Refactor and fix network printer list 2019-03-11 14:57:02 +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
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
2019-03-01 10:53:55 +01:00
Lipu Fei
7291026bec Fix material container removal
CURA-6237
2019-02-22 15:13:53 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating.
This allows the QMl to stop the updating when it's not even visible
2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating.
This allows the QMl to stop the updating when it's not even visible
2019-02-21 20:47:38 +01:00
Jaime van Kessel
7754b8a447 Only instantiate setting menus when it's visible
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
2019-02-21 20:20:01 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
fc11286c6c Also ensure that the QualtiyProfilesModel is on a changeTimer on create 2019-02-21 18:38:51 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Jaime van Kessel
b61bf3df4d Only emit signal if the properties actually changed 2019-02-19 17:46:29 +01:00