5685 Commits

Author SHA1 Message Date
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
Jaime van Kessel
656a3dc707 Remove stray print 2022-07-11 16:02:17 +02:00
jspijker
f9d4628b95 Merge branch 'main' into CURA-9365
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/cura-installer.yml
#	.github/workflows/requirements-conan-package.txt
#	resources/definitions/Mark2_for_Ultimaker2.def.json
#	resources/definitions/elegoo_neptune_2.def.json
#	resources/definitions/elegoo_neptune_2D.def.json
2022-07-08 12:37:32 +02:00
joeydelarago
5d5c83ec11
Add missing background color to WorkspaceSummaryDialog.qml
CURA-9402
2022-07-07 15:06:53 +02:00
Jaime van Kessel
bafffa994c Fix toolbar being drawn over monitor page
CURA-9401
2022-07-05 13:43:20 +02:00
Remco Burema
7ae1b2a074
Merge pull request #12635 from Ultimaker/CURA-9270_discard_or_keep_changes_not_updating
Add the "clear" hack to the tableModel for discardOrkeepchanges
2022-07-01 14:44:23 +02:00
Remco Burema
3dc646874d
Merge pull request #12634 from Ultimaker/CURA-9402_fix_background_dark_theme
Fix background dark theme
2022-07-01 14:30:10 +02:00
Remco Burema
ca36b4f2ef Set proper background color for open project dialogs.
part of CURA-9402
2022-07-01 14:22:27 +02:00
Jaime van Kessel
a8a2fd8007 Add the "clear" hack to the tableModel for discardOrkeepchanges
It's the same hack that we already use for the other instances where we use the tableModel.
For some reason it wasn't done here, so we also had the not updating bug

CURA-9270
2022-06-29 13:34:41 +02:00
Casper Lamboo
f4ee4ad05d
Merge pull request #12573 from Ultimaker/CURA-8849_more_intent_fixes
[CURA-8849] more intent fixes
2022-06-29 13:01:09 +02:00
Jaime van Kessel
2335322381 Properly set background for AboutDialog
CURA-9402
2022-06-29 10:57:11 +02:00
Ghostkeeper
03398f3275
Add more extensive descriptions for about page entries
The translators had lots of questions about these. So I'm adding more extensive descriptions for them for any future translators.
2022-06-29 10:31:35 +02:00
j.delarago
7700d01cf3 Fix implicitWidth binding loop.
CURA-8849
2022-06-28 16:39:25 +02:00
j.delarago
8761a476a6 Fix height binding loops
CURA-8849
2022-06-28 16:33:35 +02:00
j.delarago
c118bd4e29 Adjust space between configuration warning and resolution options to closer match design.
CURA-8849
2022-06-22 11:13:50 +02:00
j.delarago
09f2a73cb1 Fix tooltip showing on hover when no tooltipText in provided.
CURA-8849
2022-06-21 16:29:41 +02:00
j.delarago
cde897ff1e Instead of having a seperate tooltip for the checkbox and the text area, the two have been combined into one tooltip.
The reason for this is that hovering the mouse between the checkbox and text was causing some strange behaviour where sometimes the tooltip would not appear.

The effect of the changes in RecommendedSupportSelector.qml are the same as RecommendedAdhesionSelector.qml. It just required a bit of refactoring to have the checkbox and the textlabel in the same component.

CURA-8849
2022-06-21 11:59:03 +02:00
Jaime van Kessel
52ea80f6c9 Fix the font for searchbars being styled correctly
By setting the font.italic to true, we actually reset the entire font.

Fixes #12565
2022-06-21 10:58:53 +02:00
j.delarago
4ee4a781f4 Change flashing yellow warning on resolution combobox to blue flashing lining.
Removed alwaysRunToEnd on animation since we would like the previous animation to stop if a user clicks through multiple intents triggering multiple animations.

CURA-8849
2022-06-20 11:33:28 +02:00
j.delarago
9c16e200e0 Update reset settings icon in print settings to match new color used in recommeded settings
CURA-8849
2022-06-20 10:56:00 +02:00
j.delarago
c6bc3a5cd7 Add tooltip to IconWithText.qml,
Use this to display tooltips for Infill, Support and Adhesion in recommended settings.

CURA-8849
2022-06-20 10:52:31 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
j.delarago
f650579799 PrintQuality icon is slightly too right aligned due to the icon not filling the entire svg.
There is no additional margin on the left that can be removed, so instead I've given it a small negative margin

CURA-8849
2022-06-17 15:02:45 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable
Remove debug print statement

CURA-9321
2022-06-16 15:32:33 +02:00
j.delarago
cc58b362fc Add text wrapping for very long custom profile names.
CURA-8849
2022-06-16 14:19:39 +02:00
j.delarago
0fb2b46677 Intent button was showing when only a single intent is available.
This was caused by visible being overridden.

CURA-8849
2022-06-16 14:05:39 +02:00
j.delarago
1e0236e317 Remove left margins which don't align with the intended design.
CURA-8849
2022-06-16 13:56:46 +02:00
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change.
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
2022-06-16 13:49:30 +02:00