29930 Commits

Author SHA1 Message Date
joeydelarago
db0b668739 Adjust button size according to width
CURA-9514
2022-08-23 16:17:36 +02:00
joeydelarago
90f53bbdc1 Adjust large button size
CURA-9514
2022-08-23 16:01:30 +02:00
joeydelarago
790c373b38 Show icon for offline printers
CURA-9514
2022-08-23 15:57:40 +02:00
joeydelarago
e541890c07 Fix drop down not dynamically resizing width
CURA-9514
2022-08-23 15:56:50 +02:00
joeydelarago
035fb27ab0 Code style
CURA-9514
2022-08-23 15:44:42 +02:00
joeydelarago
93e2bef303 Group printers by section (Connected Printers/Other Printers)
Cleanup redundant code.

CURA-9514
2022-08-23 15:44:16 +02:00
joeydelarago
b18080c332 Rename AbstractStacksModel.py -> MachineListModel.py since this model includes both abstract machine stacks and regular machines
Add machineCount for displaying the number of machines of a type.

MachineSelectorButton is in use in other places, swapped it out for a new Component MachineListButton.

CURA-9514
2022-08-23 14:29:05 +02:00
joeydelarago
bedb76d516 Update comment
CURA-9514
2022-08-23 13:11:17 +02:00
joeydelarago
7ffa770fb4 Searching container registry returns ContainerStacks.
Made typing more generic to work with an ContainerStack to compensate.

Made AbstractMachine getMachines a classmethod so it can be called with ContainerStacks.

CURA-9514
2022-08-23 10:35:00 +02:00
joeydelarago
d1ae3136aa Merge branch 'main' into CURA-9514_collapsable_printers_list 2022-08-23 10:07:27 +02:00
Jelle Spijker
896cfb2a7e
Merge pull request #12989 from digitalfrost/090822b
CuraContainerStack.py: improve TypeIndexMap
2022-08-23 09:57:05 +02:00
joeydelarago
8d709e6fbe Merge remote-tracking branch 'origin/main' 2022-08-22 17:09:08 +02:00
joeydelarago
21878058eb Fix prerelease string assignment 2022-08-22 17:08:55 +02:00
Jelle Spijker
d262d71b5d
Merge pull request #13089 from Ultimaker/CURA-9277_cloud_printer_types
Cura 9277 cloud printer types
2022-08-22 17:03:58 +02:00
joeydelarago
e073adfa9e Fix conditional in recipe versioning to use proper syntax 2022-08-22 17:02:53 +02:00
Casper Lamboo
2dbb9ac32f
Merge pull request #13040 from Ultimaker/CURA-9272_semver_postfix
[CURA-9272] Semver postfix
2022-08-22 16:43:36 +02:00
joeydelarago
c80dd62169 Fix circular import.
CURA-9277
2022-08-22 16:34:18 +02:00
joeydelarago
3413caab62 Set latest.json location back to ultimaker website.
CURA-9272
2022-08-22 16:29:08 +02:00
joeydelarago
c016c23d10 Create model from abstract machine list
CURA-9514
2022-08-22 16:26:02 +02:00
c.lamboo
5884aa3311 Add comment about circular import
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-22 15:03:48 +02:00
c.lamboo
f6bf7050fb Revert "Move cura-import to top of the file"
This reverts commit 5082e64f0c1d60e4820a3ba35fd3ca82c8be3051.
2022-08-22 15:01:51 +02:00
c.lamboo
5082e64f0c Move cura-import to top of the file
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-22 14:58:32 +02:00
jspijker
54e9dbf827 Show device name of failed machine creation in log
CURA-9277 Detect and Load Specific printers and Cloud Printer Types
2022-08-22 14:57:37 +02:00
Casper Lamboo
35502e45fa
Apply suggestions from code review
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-08-22 14:48:04 +02:00
Casper Lamboo
12f3581337
Assign result of createAbstractMachine to a variable
With prepended underscore to highlight the result of the function is not being used.

CURA-9277
2022-08-22 14:44:45 +02:00
Casper Lamboo
5761b3f27b
Typing
CUR-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-08-22 14:35:07 +02:00
Casper Lamboo
77a179be76
Code style
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
2022-08-22 14:32:59 +02:00
joeydelarago
d83673a972 Use ConnectionType enum
Move import statement

CURA-9277
2022-08-22 14:25:17 +02:00
j.spijker@ultimaker.com
32c30faf6a Use the latest SIP
Contributes to CURA-8788
2022-08-22 11:58:37 +02:00
c.lamboo
61ce8dff7d Add the abstract stack to the Resources
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-22 11:58:05 +02:00
c.lamboo
c4be0e298c Add mime type to AbstractMachine
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-22 11:57:18 +02:00
Casper Lamboo
3ef77df3fd
Merge pull request #12651 from Ultimaker/CURA-9357_hide_middle_line_threshold_settings
[CURA-9357] Remove some very difficult to explain (even to experts) settings.
2022-08-22 11:54:20 +02:00
joeydelarago
544ac33537 Add resource type for abstract machine so they can be saved.
CURA-9277
2022-08-22 10:33:47 +02:00
joeydelarago
1f701c267a Merge branch 'main' into CURA-9272_semver_postfix 2022-08-22 09:04:03 +02:00
c.lamboo
963110a9c6 Remove Fix me
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-19 16:41:02 +02:00
c.lamboo
f22d446fa4 Implement getMachines function
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-19 16:35:13 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-19 16:35:00 +02:00
Joey de l'Arago
6f6c2df28a
Update requirements-conan-package.txt 2022-08-19 14:45:42 +02:00
c.lamboo
761bf3b8fa Fix creating abstract machines on account sync
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-19 14:44:19 +02:00
joeydelarago
b82f1f4a8c Add new Abstract machine stack type. This represents a type of printers (ultimaker_s3 etc).
These are created whenever a cloud printer of a new printer type is added.

CURA-9277

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
2022-08-19 13:53:43 +02:00
Joey de l'Arago
0e99a0029d
Update minimum conan version 2022-08-19 12:52:40 +02:00
Casper Lamboo
bf6422825b
Merge pull request #12999 from Ultimaker/CURA-9488_infill_density_displayed_wrong
[CURA-9488] Fix infill density being set incorrectly when changing intent
2022-08-17 12:52:30 +02:00
joeydelarago
4667373cb4 Fix recipes not being uploaded to community conan repository. These booleans were strings because of a github runners bug, but that bug is fixed now so these changes are being reverted. 2022-08-15 17:17:40 +02:00
joeydelarago
5900cac9c8 Default the prerelease number to 1 when it is not set in the github tags.
CURA-9272
2022-08-15 16:00:14 +02:00
joeydelarago
a20e7bf8d9 Add cura latest.json url to template so it can be set from the conanfile.
CURA-9272
2022-08-15 15:59:08 +02:00
joeydelarago
57d739a848 Move source of truth for latest.json url into ApplicationMetadata.py and out of the Uranium repository.
CURA-9272
2022-08-15 15:43:37 +02:00
j.spijker@ultimaker.com
830adcea1b Fix not internal builds
Contributes to CURA-9528
2022-08-12 18:00:16 +02:00
j.spijker@ultimaker.com
1d4ee4dd96 Fix not internal builds
Contributes to CURA-9528
2022-08-12 17:47:28 +02:00
j.spijker@ultimaker.com
37077a7823 Fix not internal builds
Contributes to CURA-9528
2022-08-12 17:08:25 +02:00
j.spijker@ultimaker.com
d92fd3d1e3 Make internal resources requirements
Contributes to CURA-9528
2022-08-12 16:38:17 +02:00