5714 Commits

Author SHA1 Message Date
c.lamboo
2440730e23 Fix bug in monitor page
In commit b7fd75b2dd202f2516f9188e342eccc8a15ae6ab the component with id `printerTypeSelectorRow` was removed. As the `tabBar` element was anchored to this component the monitor page was broken. Fixed by anchoring to the component that was previously above `printerTypeSelectorRow`.

CURA-9665
2022-09-21 11:23:05 +02:00
Jaime van Kessel
1dc42cb69a
Fix refresh of ChoosePrinterDialog not working
CURA-9278
2022-09-16 14:39:36 +02:00
Jaime van Kessel
017560480a
Ensure that alignment is as set in the design
CURA-9278
2022-09-16 14:34:36 +02:00
Jaime van Kessel
614ab8ee7a
Increase size of print button for selector card
CURA-9278
2022-09-16 14:30:06 +02:00
Jaime van Kessel
681d33de81
Fix spacing between extruders in selector card
CURA-9278
2022-09-16 14:29:34 +02:00
Jaime van Kessel
b7fd75b2dd
Remove broken UI element
Seems to have been broken since the move to 5.x...
2022-09-16 13:54:56 +02:00
Jaime van Kessel
8e41a03c58
Grab focus when the dialog is hidden
This ensures that all components in the loader lose the focus and thus trigger an update

CURA-9523
2022-09-15 17:28:48 +02:00
Casper Lamboo
96bc5ed602
Simplify string notation
CURA-9278
2022-09-12 14:20:28 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer.
CURA-9278
2022-09-09 11:05:05 +02:00
Remco Burema
d955a05d55 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-08 13:37:02 +02:00
Remco Burema
04cd76cb3b Get extruder configs to frontend.
When choosing the printer, all possible (single) extruder configs need to be shown for that printer.

CURA-9278
2022-09-08 13:36:42 +02:00
Jaime van Kessel
242f8264da
Merge pull request #11573 from fieldOfView/feature_tray_icon_preference
Add a preference to make tray icon optional
2022-09-08 13:01:04 +02:00
Remco Burema
5866560540 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 23:33:45 +02:00
Joey de l'Arago
9c1e624b43 typo
CURA-9278
2022-09-05 17:58:33 +02:00
Joey de l'Arago
7f98ef70f0 Add printer cards
CURA-9278
2022-09-05 17:38:21 +02:00
c.lamboo
b6a461bd08 Revert "Prevent abstract machines from being deleted in the config menu"
This reverts commit 27fc11b8404ed84a9b95b2fdddab239d2cd3c93b.
2022-09-05 17:32:23 +02:00
Joey de l'Arago
d3ee9c4c24 Fix extruderIcon sizing
CURA-9278
2022-09-05 15:32:05 +02:00
Remco Burema
a56a21cf93 W.I.P.: Press print on abstract cloud printer. User should see dialog.
Start of implementation. When printing on an abstract printer, a user should see a dialog with the matching concrete cloud printers to pick from to actually print. Names are not final. Very much a work in progress. Very not finished also.

start of implementation for CURA-9278
2022-09-02 17:49:39 +02:00
c.lamboo
27fc11b840 Prevent abstract machines from being deleted in the config menu
CURA-9277
2022-09-02 16:26:17 +02:00
c.lamboo
8bb2671a28 Don't show abstract machines in configuration page
So they cannot be removed through the preferences

CURA-9289
2022-09-02 16:26:17 +02:00
c.lamboo
c73b980a3d Merge branch 'main' into CURA-9422_abstract_cloud_monitor_redux
# Conflicts:
#	resources/qml/PrinterSelector/MachineListButton.qml
2022-08-31 16:05:00 +02:00
Remco Burema
a713b1e9e9
Merge pull request #13165 from Ultimaker/CURA-8463_cloud_configuration
Show all configurations in "abstract" printer from cloud
2022-08-31 14:50:13 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like).
done as part of CURA-9422
2022-08-31 14:15:05 +02:00
joeydelarago
19835844bf Change listType -> componentType. Makes it a bit more clear that this variable decides which component should be used for the model.
CURA-9514
2022-08-31 10:50:20 +02:00
joeydelarago
2ff0aed171 Remove height binding loop.
CURA-9514
2022-08-31 10:26:23 +02:00
c.lamboo
60b12b9247 Use list model to display show hide buttons
CURA-9514
2022-08-31 07:58:05 +02:00
c.lamboo
ac732e9604 Add button to hide/show connected printers
CURA-9514
2022-08-30 23:15:54 +02:00
Jaime van Kessel
d842013a76
Simplify onCompleted call in qml
CURA-8463
2022-08-26 13:31:48 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-26 10:45:45 +02:00
Joey de l'Arago
2013ad6baf
Update resources/qml/PrinterSelector/MachineListButton.qml
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-08-24 14:22:17 +02:00
joeydelarago
721f63b0d1 Give machine selector minimum width so it displays correctly on smaller screens.
CURA-9514
2022-08-24 10:06:03 +02:00
joeydelarago
db0b668739 Adjust button size according to width
CURA-9514
2022-08-23 16:17:36 +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
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
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
fd8d6498ee When changing to an intent with infillDensity > 100 in recommended settings the RecommendedInfillDensitySelector would set infillDensity=100.
This is because the onValueChanged function checks if the slider has a different value from the settings and updates the settings if it does. The slider has a max value of 100, so when setting the sliders value to 1000 the slider would update to have a value of 100. This would then update the setting to value to 100.

The fix is as follows. When updating the slider value > 100 just ignore the first onValueChanged. Following onValueChanged, which are triggered by the user sliding the slider, will still trigger.

CURA-9488
2022-08-10 16:45:16 +02:00
Remco Burema
5b851e4630 Click on checkbox only for checkbox-setting.
People accidentally set (checkbox) settings when mis-clicking slightly when scrolling through the settings.

CURA-9530
2022-08-05 13:33:50 +02:00
Jelle Spijker
7b768ca810
Merge pull request #12866 from Ultimaker/CURA-9220_hide_if_no_permission
Hide cloud interaction buttons if the user has no permissions to them
2022-08-01 12:41:11 +02:00
Ghostkeeper
d27ed71518
Increase maximum integer length to 12 characters
This may cause overflows if the integer type is 32-bit, but we tend to use 64-bit anyway. And 9,999,999 was already an overflow too.

Fixes #12859.
2022-07-29 10:30:25 +02:00
Ghostkeeper
f849df6ba3
Remove old df_access additional right
It is replaced by the new permissions system. The rights are more specific than 'digital factory access, yes or no'. It's now about whether you can read/write printers/projects/print jobs/etc and can differ whether it is your own project/job/etc or someone else's.

Contributes to issue CURA-9220.
2022-07-26 17:49:55 +02:00
Ghostkeeper
7287644324
Add specific permission requirements to application switcher
These functions require special permissions in the account now. Just checking for digital factory access is no longer enough.

Contributes to issue CURA-9220.
2022-07-26 17:46:26 +02:00
Ghostkeeper
9d820b8d02
Redirect to USB workflow if user account doesn't have permissions
If the user is not allowed to write profiles to the printers, then they'd get errors when trying to sync. Instead we'll redirect them to the USB workflow.
This also works for users that have accounts but don't have the printers in the cloud. The original requirements suggest that the entire sync button must be hidden for this case. But to allow those people to still sync via USB I'm opting for this solution instead.

Contributes to issue CURA-9220.
2022-07-26 17:21:08 +02:00
c.lamboo
efce84284e Update translation strings
The profile name in the translation string was hard coded to be prepended before the actual string. Put this in the translation string as some languages may change the position of this part of the sentence.
2022-07-15 10:29:56 +02:00
Jelle Spijker
c37285f9c0 Merge branch '5.1' 2022-07-15 10:14:17 +02:00
c.lamboo
35fce917c6 Use UM.Window in the material sync dialog and the preference pages
CURA-9428
2022-07-15 07:25:54 +02:00
Jelle Spijker
1a0ecfd850
Merge branch '5.1'
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
2022-07-14 16:30:52 +02:00
Jaime van Kessel
32121c7adc Add background color for rename dialogs
CURA-9465
2022-07-11 16:21:10 +02:00
Jaime van Kessel
6536b37525 Set background color for machine actions
Otherwise the background is always white, which makes it unusuable for darktheme

CURA-9465
2022-07-11 16:19:26 +02:00