A new function has been added to the MachineManager class to check for core compatibility in the Factor4 machine. This function ensures the selected core is compatible for use with the Factor4 machine and if not, it displays a warning icon with an appropriate message.
CURA-11851
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
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).
We're changing this so that the button doesn't set this by itself. This is necessary so that I can use this TabRowButton also when it's not in a repeater (for the global stack in the profile manager).
Contributes to issue CURA-8686.
The icon was rendered at a too small size, such that it would get a different line width or look-and-feel than the rest. However making it bigger doesn't properly centre it either.
To centre it we also reduced the margin.
Contributes to issue CURA-8202.
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.
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.
Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
theme-ing.
- Extruder Icons do not render correctly.
CURA-8010_new_icons
Menu's didn't always close, and on newer Macs users wouldnt be able to even close the menu, making this a blocker. Will fix this properly before the final, but at least the beta should be usable now.
CURA-8142
This doesn't actually speed up the process, but it does give some indication
that something is going on while the changes are happening
Contributes to #8250
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.
The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.
CURA-7454
