Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!
CURA-8943
Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon.
CURA-8688
We often used shorthands for stack / instance / definition, but this made it
harder for people that are very familiar with the code to understand what is
going on.
Contributes to #11455
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.
Contributes to issue CURA-8684.
Conflicts:
plugins/ImageReader/ConfigUI.qml
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
plugins/PerObjectSettingsTool/SettingPickDialog.qml
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
resources/qml/Preferences/GeneralPage.qml
resources/qml/Preferences/Materials/MaterialsPage.qml
resources/qml/Preferences/Materials/MaterialsView.qml
resources/qml/Preferences/ProfilesPage.qml
These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
This enables mouse-selectable for
- The image reader dialog
- Layer view text field (in simulation view)
- The TextField with unit component (for instace used to set the scale
of models)
- Rename dialog(s)
- Currency text field
- The settings filter text field
CURA-8684
I can't update the buttons (not part of this ticket) so I kept those Controls1.
The ScrollView is no longer necessary, just a ListView now with customised scroll bar.
Contributes to issue CURA-8686.
If the user had specialised settings fixing the number of walls or skin layers to an integer number, this fixed value would get copied over from the extruder settings, causing infill meshes to have walls by default.
This is unintuitive. We want infill meshes to behave like it's only infill by default. So remove all of those overrides so that only infill gets printed there, by default.
The user may still change the number of walls or skin layers or their parent settings. But by default it should now behave like infill within infill, regardless of the user's setting overrides.
Fixes issue CURA-8393 and fixes#9815.
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.
Contributes to issue CURA-8342.
Revert "Revert "Fix merge conflict""
This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.
Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""
This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.
Revert "Revert "Fix typo in icon name""
This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.
Revert "Revert "Add list for deprecated icons""
This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.
Revert "Revert "Add Function icon""
This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.
Revert "Revert "Switch out inherit icon""
This reverts commit 26afff609381e2004d194c280f504b6226859bd3.
Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""
This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.
Revert "Fix incorrect icons"
This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
